From 44c93e058abd38b26bb43b5bc1121865d698f39a Mon Sep 17 00:00:00 2001
From: Ryan Forsyth <forsyth2@llnl.gov>
Date: Thu, 12 Dec 2024 16:58:06 -0600
Subject: [PATCH] Update parameters

---
 .../integration/generated/test_min_case_ilamb_chrysalis.cfg | 1 +
 tests/integration/template_min_case_ilamb.cfg               | 1 +
 zppy/e3sm_to_cmip.py                                        | 6 ++++++
 zppy/templates/e3sm_to_cmip.bash                            | 2 +-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg b/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg
index 705c31c8..421551a6 100644
--- a/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg
@@ -42,6 +42,7 @@ years = "1985:2014:30"
 
   [[ land_monthly ]]
   input_files = "elm.h0"
+  mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc"
 
 [ilamb]
 active = True
diff --git a/tests/integration/template_min_case_ilamb.cfg b/tests/integration/template_min_case_ilamb.cfg
index d4ff87a4..3d8c5a1d 100644
--- a/tests/integration/template_min_case_ilamb.cfg
+++ b/tests/integration/template_min_case_ilamb.cfg
@@ -42,6 +42,7 @@ years = "1985:2014:30"
 
   [[ land_monthly ]]
   input_files = "elm.h0"
+  mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc"
 
 [ilamb]
 active = True
diff --git a/zppy/e3sm_to_cmip.py b/zppy/e3sm_to_cmip.py
index d6f24d20..93c0f094 100644
--- a/zppy/e3sm_to_cmip.py
+++ b/zppy/e3sm_to_cmip.py
@@ -13,6 +13,9 @@
     get_years,
     initialize_template,
     make_executable,
+    set_component_and_prc_typ,
+    set_grid,
+    set_mapping_file,
     submit_script,
     write_settings_file,
 )
@@ -31,6 +34,9 @@ def e3sm_to_cmip(config: ConfigObj, script_dir: str, existing_bundles, job_ids_f
     # --- Generate and submit e3sm_to_cmip scripts ---
     for c in tasks:
         dependencies: List[str] = []
+        set_mapping_file(c)
+        set_grid(c)
+        set_component_and_prc_typ(c)
         c["cmor_tables_prefix"] = c["diagnostics_base_path"]
         year_sets: List[Tuple[int, int]] = get_years(c["years"])
         # Loop over year sets
diff --git a/zppy/templates/e3sm_to_cmip.bash b/zppy/templates/e3sm_to_cmip.bash
index 1a0d871d..ad0da9dd 100644
--- a/zppy/templates/e3sm_to_cmip.bash
+++ b/zppy/templates/e3sm_to_cmip.bash
@@ -33,7 +33,7 @@ EOF
   ${dest_cmip}/${tmp_dir} \
   {% if input_files.split(".")[0] == 'clm2' or input_files.split(".")[0] == 'elm' -%}
   --var-list \
-  '{{ cmip_var_lnd }}' \
+  '{{ cmip_var_land }}' \
   --realm \
   lnd \
   {% endif -%}