Testing fixes

E3SM-Project · Feb 26, 2024 · f7ed028 · f7ed028
1 parent 05cd22d
commit f7ed028
Show file tree

Hide file tree

Showing 6 changed files with 97 additions and 11 deletions.
diff --git a/tests/integration/generated/test_bundles_chrysalis.cfg b/tests/integration/generated/test_bundles_chrysalis.cfg
@@ -60,11 +60,12 @@ years = "1850:1854:2",
   years = "1850:1860:5",
 
   [[ land_monthly ]]
+  e3sm_to_cmip_environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_to_cmip_20240223"
   extra_vars = "landfrac"
   frequency = "monthly"
   input_files = "elm.h0"
   input_subdir = "archive/lnd/hist"
-  vars = "FSH,RH2M"
+  vars = "LAISHA,LAISUN"
   ts_fmt = "cmip"
 
   [[ rof_monthly ]]

diff --git a/tests/integration/generated/test_complete_run_chrysalis.cfg b/tests/integration/generated/test_complete_run_chrysalis.cfg
@@ -19,13 +19,22 @@ years = "1850:1854:2", "1850:1854:4",
 
   [[ atm_monthly_180x360_aave ]]
   frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  vars = ""
 
   [[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
   frequency = "diurnal_8xdaily"
   input_files = "eam.h4"
   input_subdir = "archive/atm/hist"
   vars = "PRECT"
 
+  [[ land_monthly_climo ]]
+  frequency = "monthly"
+  input_files = "elm.h0"
+  input_subdir = "archive/lnd/hist"
+  vars = ""
+
 [ts]
 active = True
 e3sm_to_cmip_environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_to_cmip_20240223"
@@ -45,20 +54,29 @@ years = "1850:1854:2",
   vars = "PRECT"
 
   [[ atm_monthly_glb ]]
+  # Note global average won't work for 3D variables.
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
   mapping_file = "glb"
   years = "1850:1860:5",
 
   [[ land_monthly ]]
+  e3sm_to_cmip_environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_to_cmip_20240223"
   extra_vars = "landfrac"
   frequency = "monthly"
   input_files = "elm.h0"
   input_subdir = "archive/lnd/hist"
-  vars = "FSH,RH2M"
+  vars = "LAISHA,LAISUN"
+  #vars = "FSH,RH2M"
   ts_fmt = "cmip"
 
+  [[ land_monthly_glb ]]
+  frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  mapping_file = "glb"
+
   [[ rof_monthly ]]
   extra_vars = 'areatotal2'
   frequency = "monthly"
@@ -115,7 +133,7 @@ years = "1850:1854:2", "1850:1854:4",
   ref_name = "v2.LR.historical_0201"
   ref_start_yr = 1850
   ref_years = "1850-1851",
-  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/v2.LR.historical_0201/post/atm/180x360_aave/clim"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/unique_id/v2.LR.historical_0201/post/atm/180x360_aave/clim"
   run_type = "model_vs_model"
   short_ref_name = "v2.LR.historical_0201"
   swap_test_ref = False
@@ -125,6 +143,25 @@ years = "1850:1854:2", "1850:1854:4",
   walltime = "5:00:00"
   years = "1852-1853",
 
+  [[ lnd_monthly_mvm_lnd ]]
+  # Test model-vs-model using the same files as the reference
+  climo_subsection = "land_monthly_climo"
+  diff_title = "Difference"
+  #grid = 'native'
+  partition = "compute"
+  qos = "regular"
+  ref_final_yr = 1851
+  ref_name = "v2.LR.historical_0201"
+  ref_start_yr = 1850
+  ref_years = "1850-1851",
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/unique_id/v2.LR.historical_0201/post/lnd/180x360_aave/clim"
+  run_type = "model_vs_model"
+  sets = "lat_lon_land",
+  short_ref_name = "same simulation"
+  swap_test_ref = False
+  tag = "model_vs_model"
+  ts_num_years_ref = 2
+
 [mpas_analysis]
 active = True
 anomalyRefYear = 1850
@@ -150,7 +187,11 @@ years = "1850-1860",
 
 [ilamb]
 active = True
-grid = '180x360_aave'
+grids = '180x360_aave'
+nodes = 8
+partition = "compute"
 short_name = 'v2.LR.historical_0201'
 ts_num_years = 2
 years = "1850:1854:2",
+
+  [[ land_monthly ]]
diff --git a/tests/integration/template_bundles.cfg b/tests/integration/template_bundles.cfg
@@ -60,11 +60,12 @@ years = "1850:1854:2",
   years = "1850:1860:5",
 
   [[ land_monthly ]]
+  e3sm_to_cmip_environment_commands = "#expand e3sm_to_cmip_environment_commands#"
   extra_vars = "landfrac"
   frequency = "monthly"
   input_files = "elm.h0"
   input_subdir = "archive/lnd/hist"
-  vars = "FSH,RH2M"
+  vars = "LAISHA,LAISUN"
   ts_fmt = "cmip"
 
   [[ rof_monthly ]]

diff --git a/tests/integration/template_complete_run.cfg b/tests/integration/template_complete_run.cfg
@@ -19,13 +19,22 @@ years = "1850:1854:2", "1850:1854:4",
 
   [[ atm_monthly_180x360_aave ]]
   frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  vars = ""
 
   [[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
   frequency = "diurnal_8xdaily"
   input_files = "eam.h4"
   input_subdir = "archive/atm/hist"
   vars = "PRECT"
 
+  [[ land_monthly_climo ]]
+  frequency = "monthly"
+  input_files = "elm.h0"
+  input_subdir = "archive/lnd/hist"
+  vars = ""
+
 [ts]
 active = True
 e3sm_to_cmip_environment_commands = "#expand e3sm_to_cmip_environment_commands#"
@@ -45,20 +54,29 @@ years = "1850:1854:2",
   vars = "PRECT"
 
   [[ atm_monthly_glb ]]
+  # Note global average won't work for 3D variables.
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
   mapping_file = "glb"
   years = "1850:1860:5",
 
   [[ land_monthly ]]
+  e3sm_to_cmip_environment_commands = "#expand e3sm_to_cmip_environment_commands#"
   extra_vars = "landfrac"
   frequency = "monthly"
   input_files = "elm.h0"
   input_subdir = "archive/lnd/hist"
-  vars = "FSH,RH2M"
+  vars = "LAISHA,LAISUN"
+  #vars = "FSH,RH2M"
   ts_fmt = "cmip"
 
+  [[ land_monthly_glb ]]
+  frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  mapping_file = "glb"
+
   [[ rof_monthly ]]
   extra_vars = 'areatotal2'
   frequency = "monthly"
@@ -115,7 +133,7 @@ years = "1850:1854:2", "1850:1854:4",
   ref_name = "v2.LR.historical_0201"
   ref_start_yr = 1850
   ref_years = "1850-1851",
-  reference_data_path = "#expand user_output#zppy_test_complete_run_output/v2.LR.historical_0201/post/atm/180x360_aave/clim"
+  reference_data_path = "#expand user_output#zppy_test_complete_run_output/#expand unique_id#/v2.LR.historical_0201/post/atm/180x360_aave/clim"
   run_type = "model_vs_model"
   short_ref_name = "v2.LR.historical_0201"
   swap_test_ref = False
@@ -125,6 +143,25 @@ years = "1850:1854:2", "1850:1854:4",
   walltime = "#expand diags_walltime#"
   years = "1852-1853",
 
+  [[ lnd_monthly_mvm_lnd ]]
+  # Test model-vs-model using the same files as the reference
+  climo_subsection = "land_monthly_climo"
+  diff_title = "Difference"
+  #grid = 'native'
+  partition = "#expand partition_long#"
+  qos = "#expand qos_long#"
+  ref_final_yr = 1851
+  ref_name = "v2.LR.historical_0201"
+  ref_start_yr = 1850
+  ref_years = "1850-1851",
+  reference_data_path = "#expand user_output#zppy_test_complete_run_output/#expand unique_id#/v2.LR.historical_0201/post/lnd/180x360_aave/clim"
+  run_type = "model_vs_model"
+  sets = "lat_lon_land",
+  short_ref_name = "same simulation"
+  swap_test_ref = False
+  tag = "model_vs_model"
+  ts_num_years_ref = 2
+
 [mpas_analysis]
 active = True
 anomalyRefYear = 1850
@@ -150,7 +187,11 @@ years = "1850-1860",
 
 [ilamb]
 active = True
-grid = '180x360_aave'
+grids = '180x360_aave'
+nodes = 8
+partition = "#expand partition_long#"
 short_name = 'v2.LR.historical_0201'
 ts_num_years = 2
 years = "1850:1854:2",
+
+  [[ land_monthly ]]
diff --git a/zppy/templates/ilamb.bash b/zppy/templates/ilamb.bash
@@ -46,8 +46,8 @@ cd ${model_root}/${case}
 
 # Create output directory
 # Create local links to input cmip time-series files
-lnd_ts_for_ilamb={{ output }}/post/lnd/180x360_aave/cmip_ts/monthly/
-atm_ts_for_ilamb={{ output }}/post/atm/180x360_aave/cmip_ts/monthly/
+lnd_ts_for_ilamb={{ output }}/post/lnd/180x360_aave/cmip_ts/${Y1}-${Y2}/monthly/
+atm_ts_for_ilamb={{ output }}/post/atm/180x360_aave/cmip_ts/${Y1}-${Y2}/monthly/
 cp -s ${lnd_ts_for_ilamb}/*_*_*_*_*_*_${Y1}??-${Y2}??.nc .
 cp -s ${atm_ts_for_ilamb}/*_*_*_*_*_*_${Y1}??-${Y2}??.nc .
 cd ../..

diff --git a/zppy/templates/ts.bash b/zppy/templates/ts.bash
@@ -142,7 +142,9 @@ EOF
 {
   export cmortables_dir={{ cmor_tables_prefix }}/cmip6-cmor-tables/Tables
   input_dir={{ output }}/post/{{ component }}/{{ grid }}/ts/{{ frequency }}/{{ '%dyr' % (ypf) }}
-  dest_cmip={{ output }}/post/{{ component }}/{{ grid }}/cmip_ts/{{ frequency }}
+  Y1="{{ '%04d' % (yr_start) }}"
+  Y2="{{ '%04d' % (yr_end) }}"
+  dest_cmip={{ output }}/post/{{ component }}/{{ grid }}/cmip_ts/${Y1}-${Y2}/{{ frequency }}
   mkdir -p ${dest_cmip}
   {{ e3sm_to_cmip_environment_commands }}
   srun -N 1 e3sm_to_cmip \