Example cfg for NERSC

examples/complete_run_nersc.cfg

@@ -0,0 +1,126 @@
+[default]
+case = 20210528.v2rc3e.piControl.ne30pg2_EC30to60E2r2.chrysalis
+environment_commands = "source /global/common/software/e3sm/anaconda_envs/load_latest_e3sm_unified_cori-haswell.sh"
+#input = /global/cscratch1/sd/forsyth/e3sm_unified_test_zppy/20210528.v2rc3e.piControl.ne30pg2_EC30to60E2r2.chrysalis
+input = /global/cscratch1/sd/forsyth/zppy_complete_run_nersc_output/20210528.v2rc3e.piControl.ne30pg2_EC30to60E2r2.chrysalis
+input_subdir = archive/atm/hist
+mapping_file = /global/homes/z/zender/data/maps/map_ne30pg2_to_cmip6_180x360_aave.20200201.nc
+# To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_complete_run.py
+output = /global/cscratch1/sd/forsyth/zppy_complete_run_nersc_output/20210528.v2rc3e.piControl.ne30pg2_EC30to60E2r2.chrysalis
+partition = haswell
+walltime = "02:00:00"
+www = /global/cfs/cdirs/e3sm/www/forsyth/zppy_complete_run_nersc_output
+
+[climo]
+active = True
+years = "51:55:2", "51:55:4",
+
+  [[ atm_monthly_180x360_aave ]]
+  frequency = "monthly"
+
+  [[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
+  frequency = "diurnal_8xdaily"
+  input_files = "eam.h4"
+  vars = "PRECT"
+
+[ts]
+active = True
+frequency = "monthly"
+years = "51:55:2",
+
+  [[ atm_monthly_180x360_aave ]]
+  input_files = "eam.h0"
+
+  [[ atm_daily_180x360_aave ]]
+  frequency = "daily"
+  input_files = "eam.h1"
+  vars = "PRECT"
+
+  [[ atm_monthly_glb ]]
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  mapping_file = "glb"
+  years = "51:61:5",
+
+  [[ land_monthly ]]
+  input_files = "elm.h0"
+  input_subdir = "archive/lnd/hist"
+  vars = "FSH,LAISHA,LAISUN,RH2M"
+
+  [[ rof_monthly ]]
+  extra_vars = 'areatotal2'
+  input_files = "mosart.h0"
+  input_subdir = "archive/rof/hist"
+  mapping_file = ""
+  vars = "RIVER_DISCHARGE_OVER_LAND_LIQ"
+
+[tc_analysis]
+active = True
+scratch = "/global/homes/f/forsyth"
+years = "51:53:2",
+
+[e3sm_diags]
+active = True
+grid = '180x360_aave'
+obs_ts = "/global/cfs/cdirs/e3sm/e3sm_diags/obs_for_e3sm_diags/time-series"
+ref_final_yr = 2014
+ref_start_yr = 1985
+reference_data_path = "/global/cfs/cdirs/e3sm/e3sm_diags/obs_for_e3sm_diags/climatology"
+short_name = 'piControl.ne30pg2_EC30to60E2r2.chrysalis'
+ts_num_years = 2
+years = "51:55:2", "51:55:4",
+
+  [[ atm_monthly_180x360_aave ]]
+  climo_diurnal_frequency = "diurnal_8xdaily"
+  climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave"
+  dc_obs_climo = "/global/cfs/cdirs/e3sm/e3sm_diags/obs_for_e3sm_diags/climatology"
+  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",
+  streamflow_obs_ts = "/global/cfs/cdirs/e3sm/e3sm_diags/obs_for_e3sm_diags/time-series"
+
+  [[ atm_monthly_180x360_aave_tc_analysis ]]
+  # Running as its own subtask because tc_analysis requires jobs to run sequentially, which slows down testing
+  sets = "tc_analysis",
+  tc_obs = "/global/cfs/cdirs/e3sm/e3sm_diags/obs_for_e3sm_diags/tc_analysis"
+  years = "51:53:2",
+
+  [[ atm_monthly_180x360_aave_mvm ]]
+  # Test model-vs-model using the same files as the reference
+  climo_diurnal_frequency = "diurnal_8xdaily"
+  climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave"
+  climo_subsection = "atm_monthly_180x360_aave"
+  diff_title = "Difference"
+  gauges_path = "/global/cfs/cdirs/e3sm/e3sm_diags/obs_for_e3sm_diags/time-series/GSIM/GSIM_catchment_characteristics_all_1km2.csv"
+  ref_final_yr = 52
+  ref_name = "piControl.ne30pg2_EC30to60E2r2.chrysalis"
+  ref_start_yr = 51
+  ref_years = "51-52",
+  reference_data_path = "/global/cscratch1/sd/forsyth/zppy_complete_run_nersc_output/20210528.v2rc3e.piControl.ne30pg2_EC30to60E2r2.chrysalis/post/atm/180x360_aave/clim"
+  reference_data_path_climo_diurnal = "/global/cscratch1/sd/forsyth/zppy_complete_run_nersc_output/20210528.v2rc3e.piControl.ne30pg2_EC30to60E2r2.chrysalis/post/atm/180x360_aave/clim_diurnal_8xdaily"
+  reference_data_path_tc = "/global/cscratch1/sd/forsyth/zppy_complete_run_nersc_output/20210528.v2rc3e.piControl.ne30pg2_EC30to60E2r2.chrysalis/post/atm/tc-analysis_51_52"
+  reference_data_path_ts =  "/global/cscratch1/sd/forsyth/zppy_complete_run_nersc_output/20210528.v2rc3e.piControl.ne30pg2_EC30to60E2r2.chrysalis/post/atm/180x360_aave/ts/monthly"
+  reference_data_path_ts_rof = "/global/cscratch1/sd/forsyth/zppy_complete_run_nersc_output/20210528.v2rc3e.piControl.ne30pg2_EC30to60E2r2.chrysalis/post/rof/native/ts/monthly"
+  run_type = "model_vs_model"
+  short_ref_name = "piControl.ne30pg2_EC30to60E2r2.chrysalis"
+  swap_test_ref = False
+  tag = "model_vs_model"
+  ts_num_years_ref = 2
+  ts_subsection = "atm_monthly_180x360_aave"
+
+[mpas_analysis]
+active = True
+anomalyRefYear = 51
+climo_years ="51-55", "56-61",
+enso_years = "51-55", "56-61",
+mesh = "EC30to60E2r2"
+parallelTaskCount = 6
+ts_years = "51-55", "51-61",
+
+[global_time_series]
+active = True
+climo_years ="51-55", "56-61",
+experiment_name = "20210528.v2rc3e.piControl.ne30pg2_EC30to60E2r2.chrysalis"
+figstr = "piControl.ne30pg2_EC30to60E2r2.chrysalis"
+moc_file=mocTimeSeries_0051-0061.nc
+ts_num_years = 5
+ts_years = "51-55", "51-61",
+years = "51-61",

zppy/templates/e3sm_diags.bash

@@ -96,7 +96,7 @@ create_links_ts()
   for v in ${variables//,/ }
   do
     # Go through the time series files for between year1 and year2, using a step size equal to the number of years per time series file
-    for (( year=${begin_year}; year<=${end_year}; year+={{ ts_num_years }} ))
+    for year in `seq ${begin_year} {{ ts_num_years }} ${end_year}`;
     do
       YYYY=`printf "%04d" ${year}`
       for file in ${ts_dir_source}/${v}_${YYYY}*.nc