Add nco section to be sourced always.

ufs-community · Jun 18, 2024 · e242490 · e242490
1 parent 253590f
commit e242490
Show file tree

Hide file tree

Showing 63 changed files with 71 additions and 64 deletions.
diff --git a/jobs/JREGIONAL_CHECK_POST_OUTPUT b/jobs/JREGIONAL_CHECK_POST_OUTPUT
@@ -31,7 +31,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user workflow ; do
+for sect in user nco workflow ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 . $USHdir/job_preamble.sh

diff --git a/jobs/JREGIONAL_GET_EXTRN_MDL_FILES b/jobs/JREGIONAL_GET_EXTRN_MDL_FILES
@@ -57,7 +57,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user workflow task_get_extrn_lbcs task_get_extrn_ics ; do
+for sect in user nco workflow task_get_extrn_lbcs task_get_extrn_ics ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 . $USHdir/job_preamble.sh

diff --git a/jobs/JREGIONAL_GET_VERIF_OBS b/jobs/JREGIONAL_GET_VERIF_OBS
@@ -28,7 +28,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user workflow ; do
+for sect in user nco workflow ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 . $USHdir/job_preamble.sh

diff --git a/jobs/JREGIONAL_INTEGRATION_TEST b/jobs/JREGIONAL_INTEGRATION_TEST
@@ -34,7 +34,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user workflow ; do
+for sect in user nco workflow ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 . $USHdir/job_preamble.sh

diff --git a/jobs/JREGIONAL_MAKE_GRID b/jobs/JREGIONAL_MAKE_GRID
@@ -34,7 +34,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user workflow task_make_grid ; do
+for sect in user nco workflow task_make_grid ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 . $USHdir/job_preamble.sh

diff --git a/jobs/JREGIONAL_MAKE_ICS b/jobs/JREGIONAL_MAKE_ICS
@@ -35,7 +35,7 @@
 #
 . $USHdir/source_util_funcs.sh
 set -x
-for sect in user workflow ; do
+for sect in user nco workflow ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 . $USHdir/job_preamble.sh

diff --git a/jobs/JREGIONAL_MAKE_LBCS b/jobs/JREGIONAL_MAKE_LBCS
@@ -32,7 +32,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user workflow ; do
+for sect in user nco workflow ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 . $USHdir/job_preamble.sh

diff --git a/jobs/JREGIONAL_MAKE_OROG b/jobs/JREGIONAL_MAKE_OROG
@@ -30,7 +30,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user workflow task_make_orog ; do
+for sect in user nco workflow task_make_orog ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 . $USHdir/job_preamble.sh

diff --git a/jobs/JREGIONAL_MAKE_SFC_CLIMO b/jobs/JREGIONAL_MAKE_SFC_CLIMO
@@ -33,7 +33,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user workflow task_make_sfc_climo ; do
+for sect in user nco workflow task_make_sfc_climo ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 . $USHdir/job_preamble.sh

diff --git a/jobs/JREGIONAL_PLOT_ALLVARS b/jobs/JREGIONAL_PLOT_ALLVARS
@@ -48,7 +48,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user platform workflow task_plot_allvars task_run_fcst ; do
+for sect in user nco platform workflow task_plot_allvars task_run_fcst ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 . $USHdir/job_preamble.sh
@@ -109,6 +109,11 @@ COMOUT_REF=$(eval echo ${COMOUT_REF})
 #-----------------------------------------------------------------------
 #
 
+if [ -n "${SRW_GRAPHICS_ENV:-}" ] ; then
+ set +u
+ conda activate ${SRW_GRAPHICS_ENV}
+ set -u
+fi
 # plot all variables
 $SCRIPTSdir/exregional_plot_allvars.py \
  --cycle ${CDATE} \

diff --git a/jobs/JREGIONAL_RUN_FCST b/jobs/JREGIONAL_RUN_FCST
@@ -33,7 +33,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user workflow ; do
+for sect in user nco workflow ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 . $USHdir/job_preamble.sh "TRUE"

diff --git a/jobs/JREGIONAL_RUN_MET_GENENSPROD_OR_ENSEMBLESTAT b/jobs/JREGIONAL_RUN_MET_GENENSPROD_OR_ENSEMBLESTAT
@@ -27,7 +27,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user workflow ; do
+for sect in user nco workflow ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 . $USHdir/job_preamble.sh

diff --git a/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX b/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX
@@ -27,7 +27,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user workflow ; do
+for sect in user nco workflow ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 . $USHdir/job_preamble.sh

diff --git a/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSMEAN b/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSMEAN
@@ -28,7 +28,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user workflow ; do
+for sect in user nco workflow ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 . $USHdir/job_preamble.sh

diff --git a/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSPROB b/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSPROB
@@ -28,7 +28,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user workflow ; do
+for sect in user nco workflow ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 . $USHdir/job_preamble.sh

diff --git a/jobs/JREGIONAL_RUN_MET_PB2NC_OBS b/jobs/JREGIONAL_RUN_MET_PB2NC_OBS
@@ -28,7 +28,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user workflow ; do
+for sect in user nco workflow ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 . $USHdir/job_preamble.sh

diff --git a/jobs/JREGIONAL_RUN_MET_PCPCOMBINE b/jobs/JREGIONAL_RUN_MET_PCPCOMBINE
@@ -29,7 +29,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user workflow ; do
+for sect in user nco workflow ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 . $USHdir/job_preamble.sh

diff --git a/jobs/JREGIONAL_RUN_POST b/jobs/JREGIONAL_RUN_POST
@@ -47,7 +47,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user platform workflow task_run_post ; do
+for sect in user nco platform workflow task_run_post ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 . $USHdir/job_preamble.sh

diff --git a/jobs/JREGIONAL_RUN_PRDGEN b/jobs/JREGIONAL_RUN_PRDGEN
@@ -41,7 +41,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user platform workflow task_run_post ; do
+for sect in user nco platform workflow task_run_post ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 . $USHdir/job_preamble.sh

diff --git a/jobs/JSRW_AQM_ICS b/jobs/JSRW_AQM_ICS
@@ -31,7 +31,7 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
 #
 export USHdir="${USHsrw}" # should be removed later
 . ${USHsrw}/source_util_funcs.sh
-for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_aqm_ics ; do
+for sect in user nco platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_aqm_ics ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 #

diff --git a/jobs/JSRW_AQM_LBCS b/jobs/JSRW_AQM_LBCS
@@ -31,7 +31,7 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
 #
 export USHdir="${USHsrw}" # should be removed later
 . ${USHsrw}/source_util_funcs.sh
-for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_get_extrn_lbcs \
+for sect in user nco platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_get_extrn_lbcs \
  task_make_orog task_make_lbcs task_aqm_lbcs ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done

diff --git a/jobs/JSRW_BIAS_CORRECTION_O3 b/jobs/JSRW_BIAS_CORRECTION_O3
@@ -30,7 +30,7 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
 #
 export USHdir="${USHsrw}" # should be removed later
 . ${USHsrw}/source_util_funcs.sh
-for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_run_post \
+for sect in user nco platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_run_post \
  task_bias_correction_o3 ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done

diff --git a/jobs/JSRW_BIAS_CORRECTION_PM25 b/jobs/JSRW_BIAS_CORRECTION_PM25
@@ -30,7 +30,7 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
 #
 export USHdir="${USHsrw}" # should be removed later
 . ${USHsrw}/source_util_funcs.sh
-for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_run_post \
+for sect in user nco platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_run_post \
  task_bias_correction_pm25 ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done

diff --git a/jobs/JSRW_FIRE_EMISSION b/jobs/JSRW_FIRE_EMISSION
@@ -30,7 +30,7 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
 #
 export USHdir="${USHsrw}" # should be removed later
 . ${USHsrw}/source_util_funcs.sh
-for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_fire_emission ; do
+for sect in user nco platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_fire_emission ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 #

diff --git a/jobs/JSRW_NEXUS_EMISSION b/jobs/JSRW_NEXUS_EMISSION
@@ -30,7 +30,7 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
 #
 export USHdir="${USHsrw}" # should be removed later
 . ${USHsrw}/source_util_funcs.sh
-for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_nexus_emission ; do
+for sect in user nco platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_nexus_emission ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 #

diff --git a/jobs/JSRW_NEXUS_GFS_SFC b/jobs/JSRW_NEXUS_GFS_SFC
@@ -30,7 +30,7 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
 #
 export USHdir="${USHsrw}" # should be removed later
 . ${USHsrw}/source_util_funcs.sh
-for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_nexus_gfs_sfc ; do
+for sect in user nco platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_nexus_gfs_sfc ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 #

diff --git a/jobs/JSRW_NEXUS_POST_SPLIT b/jobs/JSRW_NEXUS_POST_SPLIT
@@ -30,7 +30,7 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
 #
 export USHdir="${USHsrw}" # should be removed later
 . ${USHsrw}/source_util_funcs.sh
-for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_nexus_post_split ; do
+for sect in user nco platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_nexus_post_split ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 #

diff --git a/jobs/JSRW_POINT_SOURCE b/jobs/JSRW_POINT_SOURCE
@@ -30,7 +30,7 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
 #
 export USHdir="${USHsrw}" # should be removed later
 . ${USHsrw}/source_util_funcs.sh
-for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_point_source \
+for sect in user nco platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_point_source \
  task_run_fcst ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done

diff --git a/jobs/JSRW_POST_STAT_O3 b/jobs/JSRW_POST_STAT_O3
@@ -30,7 +30,7 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
 #
 export USHdir="${USHsrw}" # should be removed later
 . ${USHsrw}/source_util_funcs.sh
-for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_post_stat_o3 \
+for sect in user nco platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_post_stat_o3 \
  task_run_post ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done

diff --git a/jobs/JSRW_POST_STAT_PM25 b/jobs/JSRW_POST_STAT_PM25
@@ -30,7 +30,7 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
 #
 export USHdir="${USHsrw}" # should be removed later
 . ${USHsrw}/source_util_funcs.sh
-for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_post_stat_pm25 \
+for sect in user nco platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_post_stat_pm25 \
  task_run_post ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done

diff --git a/jobs/JSRW_PRE_POST_STAT b/jobs/JSRW_PRE_POST_STAT
@@ -30,7 +30,7 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
 #
 export USHdir="${USHsrw}" # should be removed later
 . ${USHsrw}/source_util_funcs.sh
-for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_pre_post_stat ; do
+for sect in user nco platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_pre_post_stat ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 #

diff --git a/modulefiles/tasks/hera/plot_allvars.local.lua b/modulefiles/tasks/hera/plot_allvars.local.lua
@@ -1,2 +1,2 @@
 load("conda")
-setenv("SRW_ENV", "srw_graphics")
+setenv("SRW_GRAPHICS_ENV", "srw_graphics")
diff --git a/scripts/exregional_check_post_output.sh b/scripts/exregional_check_post_output.sh
@@ -46,7 +46,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user workflow global verification constants ; do
+for sect in user nco workflow global verification constants task_run_post ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 #

diff --git a/scripts/exregional_get_extrn_mdl_files.sh b/scripts/exregional_get_extrn_mdl_files.sh
@@ -73,7 +73,7 @@
 . $USHdir/source_util_funcs.sh
 
 set -x
-for sect in user platform workflow global task_get_extrn_lbcs \
+for sect in user nco platform workflow global task_get_extrn_lbcs \
  task_get_extrn_ics ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done

diff --git a/scripts/exregional_get_verif_obs.sh b/scripts/exregional_get_verif_obs.sh
@@ -31,7 +31,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user ; do
+for sect in user nco ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 #

diff --git a/scripts/exregional_make_grid.sh b/scripts/exregional_make_grid.sh
@@ -102,7 +102,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user platform workflow constants grid_params task_make_grid ; do
+for sect in user nco platform workflow constants grid_params task_make_grid ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 #

diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh
@@ -86,7 +86,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user platform workflow global cpl_aqm_parm constants task_get_extrn_ics task_make_ics ; do
+for sect in user nco platform workflow global cpl_aqm_parm constants task_get_extrn_ics task_make_ics ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 #

diff --git a/scripts/exregional_make_lbcs.sh b/scripts/exregional_make_lbcs.sh
@@ -87,7 +87,7 @@
 #
 . $USHdir/source_util_funcs.sh
 set -x
-for sect in user platform workflow global cpl_aqm_parm constants task_get_extrn_lbcs task_make_lbcs ; do
+for sect in user nco platform workflow global cpl_aqm_parm constants task_get_extrn_lbcs task_make_lbcs ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 #

diff --git a/scripts/exregional_make_orog.sh b/scripts/exregional_make_orog.sh
@@ -89,7 +89,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user platform workflow constants grid_params task_make_grid task_make_orog task_make_grid ; do
+for sect in user nco platform workflow constants grid_params task_make_grid task_make_orog task_make_grid ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 

diff --git a/scripts/exregional_make_sfc_climo.sh b/scripts/exregional_make_sfc_climo.sh
@@ -55,7 +55,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user platform workflow constants task_make_sfc_climo ; do
+for sect in user nco platform workflow constants task_make_sfc_climo ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 #

diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh
@@ -116,7 +116,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user platform workflow global cpl_aqm_parm constants fixed_files \
+for sect in user nco platform workflow global cpl_aqm_parm constants fixed_files \
  task_get_extrn_lbcs task_run_fcst task_run_post ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
@@ -920,7 +920,7 @@ if [ $(boolify ${WRITE_DOPOST}) = "TRUE" ]; then
  create_symlink_to_file ${post_renamed_fn} ${FID}${symlink_suffix} TRUE
  fi
  # DBN alert
- if [ $SENDDBN = "TRUE" ]; then
+ if [ "$SENDDBN" = "TRUE" ]; then
  $DBNROOT/bin/dbn_alert MODEL rrfs_post ${job} ${COMOUT}/${post_renamed_fn}
  fi
  done

diff --git a/scripts/exregional_run_met_genensprod_or_ensemblestat.sh b/scripts/exregional_run_met_genensprod_or_ensemblestat.sh
@@ -8,7 +8,7 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-for sect in user platform workflow nco global verification cpl_aqm_parm \
+for sect in user nco platform workflow nco global verification cpl_aqm_parm \
  constants fixed_files grid_params \
  task_run_post task_run_vx_ensgrid ; do
  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}