Fix variable names and use newer zi

Author: forsyth2

tests/integration/utils.py

@@ -7,7 +7,7 @@
 from mache import MachineInfo
 from PIL import Image, ImageChops, ImageDraw
 
-UNIQUE_ID = "test_pr697_20250326_try2"
+UNIQUE_ID = "test_pr697_20250326_try3"
 
 # Image checking ##########################################################
 
@@ -175,7 +175,7 @@ def get_chyrsalis_expansions(config):
         "diags_walltime": "5:00:00",
         "environment_commands_test": "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh",
         "expected_dir": "/lcrc/group/e3sm/public_html/zppy_test_resources/",
-        "global_time_series_environment_commands": "",
+        "global_time_series_environment_commands": "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326",
         "mpas_analysis_walltime": "00:30:00",
         "partition_long": "compute",
         "partition_short": "debug",

zppy/templates/ts.bash

@@ -67,7 +67,7 @@ cat input.txt | ncclimo \
 {%- if vars != '' %}
 -v ${vars} \
 {%- else %}
---xcl_var -v PCT_LANDUNIT_tmp,TLAKE_tmp,LAKEICEFRAC_tmp,SOILLIQ_ICE_tmp,W_SCALAR_tmp,T_SCALAR_tmp,SOILICE_ICE_tmp,SOILPSI_tmp,O_SCALAR_tmp,H2OSOI_tmp \
+--xcl_var -v .PCT_LANDUNIT,.TLAKE,.LAKEICEFRAC,.SOILLIQ_ICE,.W_SCALAR,.T_SCALAR,.SOILICE_ICE,.SOILPSI,.O_SCALAR,.H2OSOI \
 {%- endif %}
 --split \
 {%- if extra_vars != '' %}