Renaming cloud_spookie diag name to try to fix trip test failure

ExeClim · Mar 9, 2023 · a26b31d · a26b31d
1 parent ce22384
commit a26b31d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/exp/test_cases/socrates_test/socrates_aquaplanet_amip_with_topo_clouds.py b/exp/test_cases/socrates_test/socrates_aquaplanet_amip_with_topo_clouds.py
@@ -77,13 +77,13 @@
 diag.add_field('socrates', 'soc_toa_sw_clear', time_avg=True) 
 diag.add_field('socrates', 'soc_toa_sw_down_clear', time_avg=True) 
 
-diag.add_field('cloud_simple', 'cf', time_avg=True)
-diag.add_field('cloud_simple', 'reff_rad', time_avg=True)
-diag.add_field('cloud_simple', 'frac_liq', time_avg=True)
-diag.add_field('cloud_simple', 'qcl_rad', time_avg=True)
-#diag.add_field('cloud_simple', 'simple_rhcrit', time_avg=True)
-diag.add_field('cloud_simple', 'rh_min', time_avg=True)
-diag.add_field('cloud_simple', 'rh_in_cf', time_avg=True)
+diag.add_field('cloud_spookie', 'cf', time_avg=True)
+diag.add_field('cloud_spookie', 'reff_rad', time_avg=True)
+diag.add_field('cloud_spookie', 'frac_liq', time_avg=True)
+diag.add_field('cloud_spookie', 'qcl_rad', time_avg=True)
+#diag.add_field('cloud_spookie', 'simple_rhcrit', time_avg=True)
+diag.add_field('cloud_spookie', 'rh_min', time_avg=True)
+diag.add_field('cloud_spookie', 'rh_in_cf', time_avg=True)
 diag.add_field('mixed_layer', 'albedo', time_avg=True)
 
 exp.diag_table = diag

diff --git a/exp/test_cases/socrates_test/socrates_aquaplanet_cloud.py b/exp/test_cases/socrates_test/socrates_aquaplanet_cloud.py
@@ -74,13 +74,13 @@
 diag.add_field('socrates', 'soc_toa_sw_clear', time_avg=True) 
 diag.add_field('socrates', 'soc_toa_sw_down_clear', time_avg=True) 
 
-diag.add_field('cloud_simple', 'cf', time_avg=True)
-diag.add_field('cloud_simple', 'reff_rad', time_avg=True)
-diag.add_field('cloud_simple', 'frac_liq', time_avg=True)
-diag.add_field('cloud_simple', 'qcl_rad', time_avg=True)
-#diag.add_field('cloud_simple', 'simple_rhcrit', time_avg=True)
-diag.add_field('cloud_simple', 'rh_min', time_avg=True)
-diag.add_field('cloud_simple', 'rh_in_cf', time_avg=True)
+diag.add_field('cloud_spookie', 'cf', time_avg=True)
+diag.add_field('cloud_spookie', 'reff_rad', time_avg=True)
+diag.add_field('cloud_spookie', 'frac_liq', time_avg=True)
+diag.add_field('cloud_spookie', 'qcl_rad', time_avg=True)
+#diag.add_field('cloud_spookie', 'simple_rhcrit', time_avg=True)
+diag.add_field('cloud_spookie', 'rh_min', time_avg=True)
+diag.add_field('cloud_spookie', 'rh_in_cf', time_avg=True)
 diag.add_field('mixed_layer', 'albedo')
 
 

diff --git a/src/atmos_param/cloud_simple/cloud_spookie.F90 b/src/atmos_param/cloud_simple/cloud_spookie.F90
@@ -60,7 +60,7 @@ module cloud_spookie_mod
   integer :: id_cf, id_reff_rad, id_frac_liq, id_qcl_rad, id_rh_in_cf, &
              id_simple_rhcrit, id_rh_min
 
-  character(len=14), parameter ::   mod_name_cld = "cloud_simple"
+  character(len=14), parameter ::   mod_name_cld = "cloud_spookie"
 
   contains