Updated scripts and notebooks

djgagne · Mar 13, 2019 · d1447cc · d1447cc
1 parent 100ecd4
commit d1447cc
Show file tree

Hide file tree

Showing 6 changed files with 509 additions and 78 deletions.
diff --git a/create_forecast_scripts.py b/create_forecast_scripts.py
@@ -1,7 +1,7 @@
 import subprocess
 
 def main():
-    config_nums = [100, 101, 102, 103, 202, 203, 500, 501, 502, 503, 602, 603]
+    config_nums = [500, 501, 502, 503, 602, 603]
     config_types = ["climate", "forecast_20"]
     n_procs = [1, 36]
     for t, config_type in enumerate(config_types):

diff --git a/lorenz_gan/submodels.py b/lorenz_gan/submodels.py
@@ -27,9 +27,9 @@ def __init__(self, model_path=None):
         self.y_scaling_values = pd.read_csv(self.y_scaling_file, index_col="Channel")
         self.x_scaling_values = pd.read_csv(self.x_scaling_file, index_col="Channel")
 
-    def predict(self, cond_x, random_x):
+    def predict(self, cond_x, random_x, train_mode=0):
         norm_x = normalize_data(np.expand_dims(cond_x, axis=2), scaling_values=self.x_scaling_values)[0]
-        predictions = unnormalize_data(self.pred_func([norm_x[:, :, 0], random_x, True])[0],
+        predictions = unnormalize_data(self.pred_func([norm_x[:, :, 0], random_x, train_mode])[0],
                                        self.y_scaling_values)[:, :, 0]
         if predictions.shape[1] > 1:
             predictions = predictions.sum(axis=1)

diff --git a/notebooks/lorenz_gan_climate.ipynb b/notebooks/lorenz_gan_climate.ipynb
@@ -1918,7 +1918,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.6"
+   "version": "3.6.4"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/lorenz_gan_eval.ipynb b/notebooks/lorenz_gan_eval.ipynb
@@ -1326,16 +1326,16 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "lorenz_forecast_00050000_00.nc  lorenz_forecast_00050000_10.nc\r\n",
-      "lorenz_forecast_00050000_01.nc  lorenz_forecast_00050000_11.nc\r\n",
-      "lorenz_forecast_00050000_02.nc  lorenz_forecast_00050000_12.nc\r\n",
-      "lorenz_forecast_00050000_03.nc  lorenz_forecast_00050000_13.nc\r\n",
-      "lorenz_forecast_00050000_04.nc  lorenz_forecast_00050000_14.nc\r\n",
-      "lorenz_forecast_00050000_05.nc  lorenz_forecast_00050000_15.nc\r\n",
-      "lorenz_forecast_00050000_06.nc  lorenz_forecast_00050000_16.nc\r\n",
-      "lorenz_forecast_00050000_07.nc  lorenz_forecast_00050000_17.nc\r\n",
-      "lorenz_forecast_00050000_08.nc  lorenz_forecast_00050000_18.nc\r\n",
-      "lorenz_forecast_00050000_09.nc  lorenz_forecast_00050000_19.nc\r\n"
+      "lorenz_forecast_00050000_00.nc  lorenz_forecast_00050000_10.nc\n",
+      "lorenz_forecast_00050000_01.nc  lorenz_forecast_00050000_11.nc\n",
+      "lorenz_forecast_00050000_02.nc  lorenz_forecast_00050000_12.nc\n",
+      "lorenz_forecast_00050000_03.nc  lorenz_forecast_00050000_13.nc\n",
+      "lorenz_forecast_00050000_04.nc  lorenz_forecast_00050000_14.nc\n",
+      "lorenz_forecast_00050000_05.nc  lorenz_forecast_00050000_15.nc\n",
+      "lorenz_forecast_00050000_06.nc  lorenz_forecast_00050000_16.nc\n",
+      "lorenz_forecast_00050000_07.nc  lorenz_forecast_00050000_17.nc\n",
+      "lorenz_forecast_00050000_08.nc  lorenz_forecast_00050000_18.nc\n",
+      "lorenz_forecast_00050000_09.nc  lorenz_forecast_00050000_19.nc\n"
      ]
     }
    ],
@@ -3138,7 +3138,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.5"
+   "version": "3.6.4"
   }
  },
  "nbformat": 4,