Final commit after reviews

raspstephan · Aug 23, 2018 · 361d94a · 361d94a
1 parent d58f3bc
commit 361d94a
Show file tree

Hide file tree

Showing 246 changed files with 1,641 additions and 532 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/LICENSE b/LICENSE
diff --git a/cbrain/README.md b/cbrain/README.md
diff --git a/cbrain/__init__.py b/cbrain/__init__.py
diff --git a/cbrain/data_generator.py b/cbrain/data_generator.py
diff --git a/cbrain/hyai_hybi.pkl b/cbrain/hyai_hybi.pkl
diff --git a/cbrain/imports.py b/cbrain/imports.py
diff --git a/cbrain/losses.py b/cbrain/losses.py
diff --git a/cbrain/model_diagnostics.py b/cbrain/model_diagnostics.py
diff --git a/cbrain/models.py b/cbrain/models.py
diff --git a/cbrain/preprocess_aqua.py b/cbrain/preprocess_aqua.py
diff --git a/cbrain/shuffle_ds.py b/cbrain/shuffle_ds.py
diff --git a/cbrain/utils.py b/cbrain/utils.py
diff --git a/misc/read_aquaplanet_write_adiabatic.m b/misc/read_aquaplanet_write_adiabatic.m
diff --git a/nn_config/A001_fullphy_ess_sample1_base.yml b/nn_config/A001_fullphy_ess_sample1_base.yml
diff --git a/nn_config/A002_fullphy_essv2_nonorm_sample1_max_rs.yml b/nn_config/A002_fullphy_essv2_nonorm_sample1_max_rs.yml
diff --git a/nn_config/A003_fullphy_essv2_nonorm_sample1_max_rs_deep.yml b/nn_config/A003_fullphy_essv2_nonorm_sample1_max_rs_deep.yml
diff --git a/nn_config/B001_purecrm_ess_sample1_base.yml b/nn_config/B001_purecrm_ess_sample1_base.yml
diff --git a/nn_config/B002_purecrm_ess_sample1_deep1.yml b/nn_config/B002_purecrm_ess_sample1_deep1.yml
diff --git a/nn_config/B003_purecrm_ess_sample1_tanh.yml b/nn_config/B003_purecrm_ess_sample1_tanh.yml
diff --git a/nn_config/B004_purecrm_ess_sample1_mse.yml b/nn_config/B004_purecrm_ess_sample1_mse.yml
diff --git a/nn_config/B005_purecrm_ess_sample1_lr1.yml b/nn_config/B005_purecrm_ess_sample1_lr1.yml
diff --git a/nn_config/B006_purecrm_ess_sample1_deep1_tanh.yml b/nn_config/B006_purecrm_ess_sample1_deep1_tanh.yml
diff --git a/nn_config/B007_purecrm_ess_sample1_bs128.yml b/nn_config/B007_purecrm_ess_sample1_bs128.yml
diff --git a/nn_config/B008_purecrm_ess_sample1_bs512.yml b/nn_config/B008_purecrm_ess_sample1_bs512.yml
diff --git a/nn_config/B009_purecrm_ess_sample1_sigmoid.yml b/nn_config/B009_purecrm_ess_sample1_sigmoid.yml
diff --git a/nn_config/B010_purecrm_ess_sample1_leakyrelu.yml b/nn_config/B010_purecrm_ess_sample1_leakyrelu.yml
diff --git a/nn_config/B011_purecrm_ess_sample1_deep2.yml b/nn_config/B011_purecrm_ess_sample1_deep2.yml
diff --git a/nn_config/B012_purecrm_ess_sample1_wide1.yml b/nn_config/B012_purecrm_ess_sample1_wide1.yml
diff --git a/nn_config/B013_purecrm_ess_sample1_mse_var.yml b/nn_config/B013_purecrm_ess_sample1_mse_var.yml
diff --git a/nn_config/B014_purecrm_essv2_sample1_base.yml b/nn_config/B014_purecrm_essv2_sample1_base.yml
diff --git a/nn_config/B015_purecrm_ess_sample1_impr.yml b/nn_config/B015_purecrm_ess_sample1_impr.yml
diff --git a/nn_config/B016_purecrm_ess_sample1_impr_var.yml b/nn_config/B016_purecrm_ess_sample1_impr_var.yml
diff --git a/nn_config/B017_purecrm_essv2_norm-by-var_sample1_base.yml b/nn_config/B017_purecrm_essv2_norm-by-var_sample1_base.yml
diff --git a/nn_config/B018_purecrm_essv2_nonorm_sample1_max_rs.yml b/nn_config/B018_purecrm_essv2_nonorm_sample1_max_rs.yml
diff --git a/nn_config/B019_purecrm_essv2_noadiab_sample1_max_rs.yml b/nn_config/B019_purecrm_essv2_noadiab_sample1_max_rs.yml
diff --git a/nn_config/B020_purecrm_essv2_nonorm_sample1_noise1.yml b/nn_config/B020_purecrm_essv2_nonorm_sample1_noise1.yml
diff --git a/nn_config/B021_purecrm_essv2_nonorm_sample1_dr1.yml b/nn_config/B021_purecrm_essv2_nonorm_sample1_dr1.yml
diff --git a/nn_config/B022_purecrm_essv2_nonorm_sample1_dr2_deep.yml b/nn_config/B022_purecrm_essv2_nonorm_sample1_dr2_deep.yml
diff --git a/nn_config/B023_purecrm_essv2_nonorm_sample1_noise1_deep1.yml b/nn_config/B023_purecrm_essv2_nonorm_sample1_noise1_deep1.yml
diff --git a/nn_config/B024_purecrm_essv2_nonorm_sample1_noise2_deep1.yml b/nn_config/B024_purecrm_essv2_nonorm_sample1_noise2_deep1.yml
diff --git a/nn_config/B025_purecrm_essv2_nonorm_sample1_max_rs_l2.yml b/nn_config/B025_purecrm_essv2_nonorm_sample1_max_rs_l2.yml
diff --git a/nn_config/B026_purecrm_essv2_nonorm_sample1_max_rs_l2v2.yml b/nn_config/B026_purecrm_essv2_nonorm_sample1_max_rs_l2v2.yml
diff --git a/nn_config/B027_purecrm_essv2_nonorm_fullyear_max_rs.yml b/nn_config/B027_purecrm_essv2_nonorm_fullyear_max_rs.yml
diff --git a/nn_config/B028_purecrm_essv2_nonorm_sample1_max_rs_tiny.yml b/nn_config/B028_purecrm_essv2_nonorm_sample1_max_rs_tiny.yml
diff --git a/nn_config/B029_purecrm_essv2_nonorm_sample1_max_rs_deep_l2_tanh.yml b/nn_config/B029_purecrm_essv2_nonorm_sample1_max_rs_deep_l2_tanh.yml
diff --git a/nn_config/B030_purecrm_essv2_nonorm_sample1_max_rs_deep_l2v2_tanh.yml b/nn_config/B030_purecrm_essv2_nonorm_sample1_max_rs_deep_l2v2_tanh.yml
diff --git a/nn_config/B031_purecrm_essv2_nonorm_sample1_max_rs_deep_l2v3_tanh.yml b/nn_config/B031_purecrm_essv2_nonorm_sample1_max_rs_deep_l2v3_tanh.yml
diff --git a/nn_config/C001_tfcomp_sample1_base.yml b/nn_config/C001_tfcomp_sample1_base.yml
diff --git a/nn_config/C002_tfcomp_sample1_deep1.yml b/nn_config/C002_tfcomp_sample1_deep1.yml
diff --git a/nn_config/D001_fbp_sample1_max_rs_deep.yml b/nn_config/D001_fbp_sample1_max_rs_deep.yml
diff --git a/nn_config/D002_fbp_ke_sample1_max_rs_deep.yml b/nn_config/D002_fbp_ke_sample1_max_rs_deep.yml
diff --git a/nn_config/D003_fbp_engy_ess_sample1_max_rs_deep.yml b/nn_config/D003_fbp_engy_ess_sample1_max_rs_deep.yml
diff --git a/nn_config/D004_fbp_engy_ess_fullyear_max_rs_deep.yml b/nn_config/D004_fbp_engy_ess_fullyear_max_rs_deep.yml
diff --git a/nn_config/D005_fbp_engy_ess_fullyear_max_rs_deep_mae.yml b/nn_config/D005_fbp_engy_ess_fullyear_max_rs_deep_mae.yml
diff --git a/nn_config/D006_fbp32_engy_ess_sample1_max_rs_deep.yml b/nn_config/D006_fbp32_engy_ess_sample1_max_rs_deep.yml
diff --git a/nn_config/D007_fbp32_engy_ess_fullyear_max_rs_deep.yml b/nn_config/D007_fbp32_engy_ess_fullyear_max_rs_deep.yml
diff --git a/nn_config/D008_fbp_engy_ess_sample1_max_rs_deep_eq.yml b/nn_config/D008_fbp_engy_ess_sample1_max_rs_deep_eq.yml
diff --git a/nn_config/D009_fbp_engy_ess_fullyear_max_rs_deep_eq.yml b/nn_config/D009_fbp_engy_ess_fullyear_max_rs_deep_eq.yml
diff --git a/nn_config/D010_fbp_engy_ess_sample1_max_rs_deep_eq_l2.yml b/nn_config/D010_fbp_engy_ess_sample1_max_rs_deep_eq_l2.yml
diff --git a/nn_config/D011_fbp_engy_ess_sample1_max_rs_deep_eq_dr.yml b/nn_config/D011_fbp_engy_ess_sample1_max_rs_deep_eq_dr.yml
diff --git a/nn_config/D012_fbp_engy_ess_sample1_max_rs_deep_eq_tanh.yml b/nn_config/D012_fbp_engy_ess_sample1_max_rs_deep_eq_tanh.yml
diff --git a/nn_config/D013_fbp_engy_ess_sample1_max_rs_deep_eq_tanh_l2_dr.yml b/nn_config/D013_fbp_engy_ess_sample1_max_rs_deep_eq_tanh_l2_dr.yml
diff --git a/nn_config/D014_fbp_engy_ess_sample1_bn.yml b/nn_config/D014_fbp_engy_ess_sample1_bn.yml
diff --git a/nn_config/D015_fbp_engy_ess_sample1_dr02.yml b/nn_config/D015_fbp_engy_ess_sample1_dr02.yml
diff --git a/nn_config/D016_fbp_engy_ess_sample1_shallow.yml b/nn_config/D016_fbp_engy_ess_sample1_shallow.yml
diff --git a/nn_config/D017_fbp_engy_ess_sample1_conv1.yml b/nn_config/D017_fbp_engy_ess_sample1_conv1.yml
diff --git a/nn_config/D018_fbp_engy_ess_ref_3m_ref.yml b/nn_config/D018_fbp_engy_ess_ref_3m_ref.yml
diff --git a/nn_config/D019_fbp_engy_ess_ref_6m_ref.yml b/nn_config/D019_fbp_engy_ess_ref_6m_ref.yml
diff --git a/nn_config/D020_fbp_engy_ess_ref_fullyear_ref.yml b/nn_config/D020_fbp_engy_ess_ref_fullyear_ref.yml
diff --git a/nn_config/D021_fbp_engy_ess_ref_sample1_ref.yml b/nn_config/D021_fbp_engy_ess_ref_sample1_ref.yml
diff --git a/nn_config/D022_fbp_engy_ess_ref_4k_sample1_ref.yml b/nn_config/D022_fbp_engy_ess_ref_4k_sample1_ref.yml
diff --git a/nn_config/D023_fbp_engy_ess_ref_fullyear_dr02.yml b/nn_config/D023_fbp_engy_ess_ref_fullyear_dr02.yml
diff --git a/nn_config/D024_fbp_engy_ess_ref_4k_fullyear_ref.yml b/nn_config/D024_fbp_engy_ess_ref_4k_fullyear_ref.yml
diff --git a/nn_config/D025_fbp_engy_ess_ref_fullyear_ref_longtrain.yml b/nn_config/D025_fbp_engy_ess_ref_fullyear_ref_longtrain.yml
diff --git a/nn_config/D026_fbp_engy_ess_ref_fullyear_newdr01.yml b/nn_config/D026_fbp_engy_ess_ref_fullyear_newdr01.yml
diff --git a/nn_config/D027_fbp_engy_ess_sample1_conv1_bn.yml b/nn_config/D027_fbp_engy_ess_sample1_conv1_bn.yml
diff --git a/nn_config/D028_fbp_engy_ess_ref_sample1_bottleneck.yml b/nn_config/D028_fbp_engy_ess_ref_sample1_bottleneck.yml
diff --git a/nn_config/D029_fbp_engy_ess_sample1_conv_tile1.yml b/nn_config/D029_fbp_engy_ess_sample1_conv_tile1.yml
diff --git a/nn_config/D030_fbp_engy_ess_ref_1k_sample1_ref.yml b/nn_config/D030_fbp_engy_ess_ref_1k_sample1_ref.yml
diff --git a/nn_config/D031_fbp_engy_ess_ref_1k_fullyear_ref.yml b/nn_config/D031_fbp_engy_ess_ref_1k_fullyear_ref.yml
diff --git a/nn_config/D032_fbp_engy_ess_4k_fullyear_ref.yml b/nn_config/D032_fbp_engy_ess_4k_fullyear_ref.yml
diff --git a/nn_config/D033_fbp_engy_ess_ref_fullyear_ref_longtrain_gentine.yml b/nn_config/D033_fbp_engy_ess_ref_fullyear_ref_longtrain_gentine.yml
diff --git a/nn_config/D034_fbp_engy_ess_ref_fullyear_ref_longtrain_smaller.yml b/nn_config/D034_fbp_engy_ess_ref_fullyear_ref_longtrain_smaller.yml
diff --git a/nn_config/D035_fbp_engy_ess_ref_fullyear_ref_longtrain_big_fluxes.yml b/nn_config/D035_fbp_engy_ess_ref_fullyear_ref_longtrain_big_fluxes.yml
diff --git a/nn_config/D036_fbp_engy_ess_ref_fullyear_ref_longtrain_small_fluxes.yml b/nn_config/D036_fbp_engy_ess_ref_fullyear_ref_longtrain_small_fluxes.yml
diff --git a/nn_config/D037_fbp_engy_ess_ref_fullyear_ref_longtrain_tiny.yml b/nn_config/D037_fbp_engy_ess_ref_fullyear_ref_longtrain_tiny.yml
diff --git a/nn_config/D038_fbp_engy_ess_ref_fullyear_ref_longtrain_shallow.yml b/nn_config/D038_fbp_engy_ess_ref_fullyear_ref_longtrain_shallow.yml
diff --git a/nn_config/D039_fbp_engy_ess_ref_fullyear_ref_longtrain_small_fluxes2.yml b/nn_config/D039_fbp_engy_ess_ref_fullyear_ref_longtrain_small_fluxes2.yml
@@ -1,5 +1,5 @@
 exp_name: D039_fbp_engy_ess_ref_fullyear_ref_small_fluxes2
-data_dir: /local/S.Rasp/preprocessed_data/
+data_dir: /scratch/srasp/preprocessed_data/
 train_fn: fbp_engy_ess_ref_train_fullyear_shuffle
 valid_fn: fbp_engy_ess_valid_sample1
 norm_fn: fbp_engy_ess_ref_train_sample1_norm_small_fluxes2.nc

diff --git a/nn_config/D040_fbp_engy_ess_ref_fullyear_ref_longtrain_big_fluxes2.yml b/nn_config/D040_fbp_engy_ess_ref_fullyear_ref_longtrain_big_fluxes2.yml
@@ -1,5 +1,5 @@
-exp_name: D0340_fbp_engy_ess_ref_fullyear_ref_big_fluxes2
-data_dir: /local/S.Rasp/preprocessed_data/
+exp_name: D040_fbp_engy_ess_ref_fullyear_ref_big_fluxes2
+data_dir: /scratch/srasp/preprocessed_data/
 train_fn: fbp_engy_ess_ref_train_fullyear_shuffle
 valid_fn: fbp_engy_ess_valid_sample1
 norm_fn: fbp_engy_ess_ref_train_sample1_norm_big_fluxes2.nc

diff --git a/nn_config/E001_fullphy_fbp_sample1_max_rs_deep.yml b/nn_config/E001_fullphy_fbp_sample1_max_rs_deep.yml
diff --git a/nn_config/E002_fullphy_fbp32_sample1_max_rs_deep.yml b/nn_config/E002_fullphy_fbp32_sample1_max_rs_deep.yml
diff --git a/nn_config/F001_fbp_engy_cons_sample1_max_rs_deep.yml b/nn_config/F001_fbp_engy_cons_sample1_max_rs_deep.yml
diff --git a/nn_config/F002_fbp32_engy_cons_sample1_max_rs_deep.yml b/nn_config/F002_fbp32_engy_cons_sample1_max_rs_deep.yml
diff --git a/nn_config/F003_fbp_engy_cons_APinp_sample1_partial_relu.yml b/nn_config/F003_fbp_engy_cons_APinp_sample1_partial_relu.yml
diff --git a/nn_config/G001_fbp_engy_ess_galen_sample1_max_rs_deep.yml b/nn_config/G001_fbp_engy_ess_galen_sample1_max_rs_deep.yml
diff --git a/nn_config/H001_fbp_engy_ess_snow_sample1_max_rs_deep.yml b/nn_config/H001_fbp_engy_ess_snow_sample1_max_rs_deep.yml
diff --git a/nn_config/N001_fbp_nobeta_engy_ess_fullyear_max_rs_deep.yml b/nn_config/N001_fbp_nobeta_engy_ess_fullyear_max_rs_deep.yml
diff --git a/nn_config/N002_fbp_nobeta_engy_ess_sample1_max_rs_deep.yml b/nn_config/N002_fbp_nobeta_engy_ess_sample1_max_rs_deep.yml
diff --git a/nn_config/P001_128_sample1.yml b/nn_config/P001_128_sample1.yml
diff --git a/nn_config/P002_512_sample1.yml b/nn_config/P002_512_sample1.yml
diff --git a/nn_config/P003_2048_sample1.yml b/nn_config/P003_2048_sample1.yml
diff --git a/nn_config/P004_8192_sample1.yml b/nn_config/P004_8192_sample1.yml
diff --git a/nn_config/P005_90x2_sample1.yml b/nn_config/P005_90x2_sample1.yml
diff --git a/nn_config/P006_256x2_sample1.yml b/nn_config/P006_256x2_sample1.yml
diff --git a/nn_config/P007_600x2_sample1.yml b/nn_config/P007_600x2_sample1.yml
diff --git a/nn_config/P008_1300x2_sample1.yml b/nn_config/P008_1300x2_sample1.yml
diff --git a/nn_config/P009_50x8_sample1.yml b/nn_config/P009_50x8_sample1.yml
diff --git a/nn_config/P010_115x8_sample1.yml b/nn_config/P010_115x8_sample1.yml
diff --git a/nn_config/P011_256x8_sample1.yml b/nn_config/P011_256x8_sample1.yml
diff --git a/nn_config/P012_512x8_sample1.yml b/nn_config/P012_512x8_sample1.yml
diff --git a/nn_config/P013_512x8_sample1_bs512.yml b/nn_config/P013_512x8_sample1_bs512.yml
diff --git a/nn_config/P014_512x8_sample1_bs256.yml b/nn_config/P014_512x8_sample1_bs256.yml
diff --git a/nn_config/P015_512x8_sample1_bs128.yml b/nn_config/P015_512x8_sample1_bs128.yml
diff --git a/nn_config/P016_512x8_10days.yml b/nn_config/P016_512x8_10days.yml
diff --git a/nn_config/P017_512x8_30days.yml b/nn_config/P017_512x8_30days.yml
diff --git a/nn_config/P018_512x8_90days.yml b/nn_config/P018_512x8_90days.yml
diff --git a/nn_config/P019_512x8_180days.yml b/nn_config/P019_512x8_180days.yml
diff --git a/nn_config/P020_512x8_270days.yml b/nn_config/P020_512x8_270days.yml
diff --git a/nn_config/P021_512x8_fullyear.yml b/nn_config/P021_512x8_fullyear.yml
diff --git a/nn_config/lmu_P019_512x8_180days.yml b/nn_config/lmu_P019_512x8_180days.yml
diff --git a/nn_config/lmu_P020_512x8_270days.yml b/nn_config/lmu_P020_512x8_270days.yml
diff --git a/nn_config/lmu_P021_512x8_fullyear.yml b/nn_config/lmu_P021_512x8_fullyear.yml
diff --git a/notebooks/dev/CGAN.ipynb b/notebooks/dev/CGAN.ipynb
diff --git a/notebooks/dev/SST.ipynb b/notebooks/dev/SST.ipynb
diff --git a/notebooks/dev/cbrain-cam-analysis.ipynb b/notebooks/dev/cbrain-cam-analysis.ipynb
diff --git a/notebooks/dev/change-normalization-file.ipynb b/notebooks/dev/change-normalization-file.ipynb
diff --git a/notebooks/dev/check-CBRAIN-CAM-implementation.ipynb b/notebooks/dev/check-CBRAIN-CAM-implementation.ipynb
diff --git a/notebooks/dev/compare-fbp-32col.ipynb b/notebooks/dev/compare-fbp-32col.ipynb
diff --git a/notebooks/dev/correct-constants.ipynb b/notebooks/dev/correct-constants.ipynb
diff --git a/notebooks/dev/debug-engy_cons.ipynb b/notebooks/dev/debug-engy_cons.ipynb
diff --git a/notebooks/dev/debug-review.ipynb b/notebooks/dev/debug-review.ipynb