From 022af3e00be79bff9a28a8ba8a9a25eaed4e2a02 Mon Sep 17 00:00:00 2001
From: Ryan Forsyth <forsyth2@llnl.gov>
Date: Mon, 6 Nov 2023 19:14:51 -0600
Subject: [PATCH] Update

---
 .../generated/test_complete_run_chrysalis.cfg | 38 ++++++++++++++++++-
 tests/integration/template_complete_run.cfg   | 38 ++++++++++++++++++-
 zppy/templates/default.ini                    |  4 +-
 zppy/templates/e3sm_diags.bash                |  3 --
 4 files changed, 76 insertions(+), 7 deletions(-)

diff --git a/tests/integration/generated/test_complete_run_chrysalis.cfg b/tests/integration/generated/test_complete_run_chrysalis.cfg
index e268cad0..c8f42791 100644
--- a/tests/integration/generated/test_complete_run_chrysalis.cfg
+++ b/tests/integration/generated/test_complete_run_chrysalis.cfg
@@ -43,6 +43,13 @@ years = "1850:1854:2",
   input_subdir = "archive/atm/hist"
   vars = "PRECT"
 
+  [[ atm_monthly_glb ]]
+  frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  mapping_file = "glb"
+  years = "1850:1860:5",
+
   [[ land_monthly ]]
   extra_vars = "landfrac"
   frequency = "monthly"
@@ -68,7 +75,6 @@ years = "1850:1854:2",
 [e3sm_diags]
 active = True
 grid = '180x360_aave'
-keep_mvm_case_name_in_fig = True
 ref_final_yr = 2014
 ref_start_yr = 1985
 # TODO: this directory is missing OMI-MLS
@@ -117,3 +123,33 @@ years = "1850:1854:2", "1850:1854:4",
   ts_subsection = "atm_monthly_180x360_aave"
   walltime = "5:00:00"
   years = "1852-1853",
+
+[mpas_analysis]
+active = True
+anomalyRefYear = 1850
+climo_years ="1850-1854", "1855-1860",
+enso_years = "1850-1854", "1855-1860",
+mesh = "EC30to60E2r2"
+parallelTaskCount = 6
+partition = "compute"
+qos = "regular"
+ts_years = "1850-1854", "1850-1860",
+walltime = "00:30:00"
+
+[global_time_series]
+active = True
+climo_years ="1850-1854", "1855-1860",
+experiment_name = "v2.LR.historical_0201"
+figstr = "v2_historical_0201"
+moc_file=mocTimeSeries_1850-1860.nc
+ts_num_years = 5
+ts_years = "1850-1854", "1850-1860",
+walltime = "00:30:00"
+years = "1850-1860",
+
+[ilamb]
+active = True
+grid = '180x360_aave'
+short_name = 'v2.LR.historical_0201'
+ts_num_years = 2
+years = "1850:1854:2",
diff --git a/tests/integration/template_complete_run.cfg b/tests/integration/template_complete_run.cfg
index f7a81f6d..7d870d9e 100644
--- a/tests/integration/template_complete_run.cfg
+++ b/tests/integration/template_complete_run.cfg
@@ -43,6 +43,13 @@ years = "1850:1854:2",
   input_subdir = "archive/atm/hist"
   vars = "PRECT"
 
+  [[ atm_monthly_glb ]]
+  frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  mapping_file = "glb"
+  years = "1850:1860:5",
+
   [[ land_monthly ]]
   extra_vars = "landfrac"
   frequency = "monthly"
@@ -68,7 +75,6 @@ years = "1850:1854:2",
 [e3sm_diags]
 active = True
 grid = '180x360_aave'
-keep_mvm_case_name_in_fig = True
 ref_final_yr = 2014
 ref_start_yr = 1985
 # TODO: this directory is missing OMI-MLS
@@ -117,3 +123,33 @@ years = "1850:1854:2", "1850:1854:4",
   ts_subsection = "atm_monthly_180x360_aave"
   walltime = "#expand diags_walltime#"
   years = "1852-1853",
+
+[mpas_analysis]
+active = True
+anomalyRefYear = 1850
+climo_years ="1850-1854", "1855-1860",
+enso_years = "1850-1854", "1855-1860",
+mesh = "EC30to60E2r2"
+parallelTaskCount = 6
+partition = "#expand partition_long#"
+qos = "#expand qos_long#"
+ts_years = "1850-1854", "1850-1860",
+walltime = "#expand mpas_analysis_walltime#"
+
+[global_time_series]
+active = True
+climo_years ="1850-1854", "1855-1860",
+experiment_name = "v2.LR.historical_0201"
+figstr = "v2_historical_0201"
+moc_file=mocTimeSeries_1850-1860.nc
+ts_num_years = 5
+ts_years = "1850-1854", "1850-1860",
+walltime = "00:30:00"
+years = "1850-1860",
+
+[ilamb]
+active = True
+grid = '180x360_aave'
+short_name = 'v2.LR.historical_0201'
+ts_num_years = 2
+years = "1850:1854:2",
diff --git a/zppy/templates/default.ini b/zppy/templates/default.ini
index 2c8c967a..da4daacf 100644
--- a/zppy/templates/default.ini
+++ b/zppy/templates/default.ini
@@ -124,8 +124,8 @@ dc_obs_climo = string(default="")
 # See https://e3sm-project.github.io/e3sm_diags/_build/html/master/available-parameters.html
 # Required for run_type="model_vs_model"
 diff_title = string(default="Model - Observations")
-# Set this to True if the E3SM Diags model-vs-model output path should include the case name.
-keep_mvm_case_name_in_fig = boolean(default=False)
+# Set this to False if the E3SM Diags model-vs-model output path should exclude the case name.
+keep_mvm_case_name_in_fig = boolean(default=True)
 # See https://e3sm-project.github.io/e3sm_diags/_build/html/master/available-parameters.html
 # Required for run_type="model_vs_model" "streamflow" runs
 gauges_path = string(default="")
diff --git a/zppy/templates/e3sm_diags.bash b/zppy/templates/e3sm_diags.bash
index 6c91ea53..e34a1b48 100644
--- a/zppy/templates/e3sm_diags.bash
+++ b/zppy/templates/e3sm_diags.bash
@@ -204,15 +204,12 @@ create_links_ts_rof ${ts_rof_dir_source} ${ts_rof_dir_ref} ${ref_Y1} ${ref_Y2} 8
 {%- endif %}
 
 {% if run_type == "model_vs_obs" %}
-echo "A"
 ref_name={{ ref_name }}
 {%- endif %}
 {% if (run_type == "model_vs_model") and keep_mvm_case_name_in_fig %}
-echo "B"
 ref_name={{ ref_name }}
 {%- endif %}
 {% if (run_type == "model_vs_model") and not keep_mvm_case_name_in_fig %}
-echo "C"
 ref_name=""
 {%- endif %}