Update NCO invocations (#267)

Author: forsyth2

tests/integration/test_complete_run.cfg

@@ -1,6 +1,6 @@
 [default]
 case = v2.LR.historical_0201
-environment_commands = "source /lcrc/soft/climate/e3sm-unified/load_latest_e3sm_unified_chrysalis.sh"
+environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.7.0rc1_chrysalis.sh"
 input = /lcrc/group/e3sm/$USER/E3SMv2/v2.LR.historical_0201
 input_subdir = archive/atm/hist
 mapping_file = /home/ac.zender/data/maps/map_ne30pg2_to_cmip6_180x360_aave.20200201.nc
@@ -48,6 +48,7 @@ years = "1850:1854:2",
   years = "1850:1860:5",
 
   [[ land_monthly ]]
+  extra_vars = "landfrac"
   frequency = "monthly"
   input_files = "elm.h0"
   input_subdir = "archive/lnd/hist"
@@ -70,6 +71,7 @@ years = "1850:1854:2",
 
 [e3sm_diags]
 active = True
+environment_commands = "source /home/$USER/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_dev_20220614"
 grid = '180x360_aave'
 obs_ts = '/lcrc/group/e3sm/diagnostics/observations/Atm/time-series'
 ref_final_yr = 2014
@@ -85,11 +87,13 @@ years = "1850:1854:2", "1850:1854:4",
   [[ atm_monthly_180x360_aave ]]
   climo_diurnal_frequency = "diurnal_8xdaily"
   climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave"
+  partition = compute
   sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","enso_diags","qbo","diurnal_cycle","annual_cycle_zonal_mean","streamflow", "zonal_mean_2d_stratosphere",
+  walltime = "01:00:00"
 
   [[ atm_monthly_180x360_aave_environment_commands ]]
   # To run this test, replace conda environment with your e3sm_diags dev environment
-  environment_commands="source /home/$USER/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_dev_20220228"
+  environment_commands = "source /home/$USER/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_dev_20220614"
   sets = "qbo",
   ts_subsection = "atm_monthly_180x360_aave"
 

zppy/templates/ts.bash

@@ -65,6 +65,7 @@ cat input.txt | ncclimo \
 -c {{ case }} \
 -v {{ vars }} \
 --mem_mb=0 \
+--split \
 {%- if extra_vars != '' %}
 --var_xtr={{extra_vars}} \
 {%- endif %}
@@ -130,7 +131,7 @@ EOF
   ${dest_cmip}/${tmp_dir} \
   {% if input_files == 'elm.h0' -%}
   --var-list \
-  'mrsos, mrso, mrfso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, tsl, lai, cLitter, cProduct, cSoilFast,cSoilMedium,cSoilSlow fFire, fHarvest, cVeg, nbp, gpp, ra, rh' \
+  'mrsos, mrso, mrfso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, tsl, lai, cLitter, cProduct, cSoilFast, cSoilMedium, cSoilSlow, fFire, fHarvest, cVeg, nbp, gpp, ra, rh' \
   --realm \
   lnd \
   {% endif -%}