Merge pull request #187 from esowc/branch-alba

Correct binning definition

Author: albavilanova

functions/functions_general.ipynb

@@ -617,7 +617,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "def binning(ds, lat_res, lon_res):\n",
+    "def regrid(ds, lat_res, lon_res):\n",
     "\n",
     "    \"\"\" Regrid onto a custom defined regular grid\n",
     "\n",

functions/functions_gome.ipynb

@@ -126,7 +126,7 @@
     "        sensor_ds_ABC = xr.concat(sensor_ds_ABC, dim = 'latitude')\n",
     "\n",
     "        # Regrid onto a custom defined regular grid\n",
-    "        sensor_ds_ABC_gridded = binning(sensor_ds_ABC, lat_res, lon_res) \n",
+    "        sensor_ds_ABC_gridded = regrid(sensor_ds_ABC, lat_res, lon_res) \n",
     "\n",
     "        # Add time\n",
     "        time_str = dt.datetime(int(year), int(month), 1)\n",
@@ -291,9 +291,9 @@
     "        sensor_df_AB = sensor_df_AB.mean(axis = 1).to_frame()\n",
     "        sensor_df_AB = sensor_df_AB.rename(columns = {0: 'sensor_column'}).sort_index()\n",
     "\n",
-    "        # Regrid onto a custom defined regular grid\n",
+    "        # Change resolution\n",
     "        sensor_ds_time = sensor_df_AB.to_xarray()\n",
-    "        sensor_ds_time_gridded = binning(sensor_ds_time, lat_res, lon_res) \n",
+    "        sensor_ds_time_gridded = regrid(sensor_ds_time, lat_res, lon_res) \n",
     "        \n",
     "        sensor_ds.append(sensor_ds_time_gridded)\n",
     "\n",
@@ -457,6 +457,7 @@
     "        x = sensor_ds_ABC.longitude.data\n",
     "        z = sensor_ds_ABC[component_nom].data\n",
     "\n",
+    "        # Binning\n",
     "        zi, yi, xi = np.histogram2d(y, x, bins = (180, 360), weights = z, normed = False)\n",
     "        counts, _, _ = np.histogram2d(y, x, bins = (180, 360))\n",
     "        zi = zi / counts\n",
@@ -471,8 +472,8 @@
     "                                             name = 'sensor_column'\n",
     "        )\n",
     "\n",
-    "        # Regrid onto a custom defined regular grid\n",
-    "        sensor_ds_ABC_gridded = binning(sensor_ds_ABC_gridded, lat_res, lon_res) \n",
+    "        # Change resolution\n",
+    "        sensor_ds_ABC_gridded = regrid(sensor_ds_ABC_gridded, lat_res, lon_res) \n",
     "        \n",
     "        # Get datafame with delta time (non-gridded)\n",
     "        delta_time_df = pd.DataFrame()\n",

functions/functions_iasi.ipynb

@@ -150,8 +150,8 @@
     "\n",
     "        sensor_ds_ABC = xr.concat(sensor_ds_ABC, dim = 'latitude')\n",
     "\n",
-    "        # Regrid onto a custom defined regular grid\n",
-    "        sensor_ds_ABC_gridded = binning(sensor_ds_ABC, lat_res, lon_res) \n",
+    "        # Change resolution\n",
+    "        sensor_ds_ABC_gridded = regrid(sensor_ds_ABC, lat_res, lon_res) \n",
     "\n",
     "        # Add time\n",
     "        time_str = dt.datetime(int(year), int(month), 1)\n",
@@ -358,6 +358,7 @@
     "        x = sensor_ds_ABC.longitude.data\n",
     "        z = sensor_ds_ABC.data\n",
     "\n",
+    "        # Binning\n",
     "        zi, yi, xi = np.histogram2d(y, x, bins = (180, 360), weights = z, normed = False)\n",
     "        counts, _, _ = np.histogram2d(y, x, bins = (180, 360))\n",
     "        zi = zi / counts\n",
@@ -372,8 +373,8 @@
     "                                            name = 'sensor_column'\n",
     "        )\n",
     "\n",
-    "        # Regrid onto a custom defined regular grid\n",
-    "        sensor_ds_ABC_gridded = binning(sensor_ds_ABC_gridded, lat_res, lon_res) \n",
+    "        # Change resolution\n",
+    "        sensor_ds_ABC_gridded = regrid(sensor_ds_ABC_gridded, lat_res, lon_res) \n",
     "\n",
     "        # Add units as attribute\n",
     "        sensor_ds_ABC_gridded.attrs['units'] = unit\n",

functions/functions_tropomi.ipynb

@@ -116,9 +116,9 @@
     "        sensor_df_time = sensor_df_time.set_index(['time', 'latitude', 'longitude'])\n",
     "        sensor_df_time = sensor_df_time[~sensor_df_time.index.duplicated()]\n",
     "\n",
-    "        # Regrid onto a custom defined regular grid\n",
+    "        # Change resolution\n",
     "        sensor_ds_time = sensor_df_time.to_xarray()\n",
-    "        sensor_ds_time = binning(sensor_ds_time, lat_res, lon_res) \n",
+    "        sensor_ds_time = regrid(sensor_ds_time, lat_res, lon_res) \n",
     "\n",
     "        sensor_ds.append(sensor_ds_time)\n",
     "            \n",