diff --git a/jobs/JOBSPROC_AIRNOW_DUMP b/jobs/JOBSPROC_AIRNOW_DUMP index 2cd87cc..d1e6f08 100755 --- a/jobs/JOBSPROC_AIRNOW_DUMP +++ b/jobs/JOBSPROC_AIRNOW_DUMP @@ -208,8 +208,8 @@ for pdy in $PDYm1 $PDYm5; do export COMIN_ROOT=${COMIN_ROOT:-${COMROOT:-""}} if [ "$RUN_ENVIR" = nco ]; then - export COMIN=${COMIN:-$(compath.py ${envir}/${obsNET}/${obsproc_ver}/${model}.${PDY})} - export COMOUT=${COMOUT:-$(compath.py -o ${obsNET}/${obsproc_ver}/${model}.${PDY})} + export COMIN=$(compath.py ${envir}/${obsNET}/${obsproc_ver}/${model}.${pdy}) + export COMOUT=$(compath.py -o ${obsNET}/${obsproc_ver}/${model}.${pdy}) mkdir -m 775 -p $COMOUT else export COMIN=${COMIN:-${COMIN_ROOT:?}/${obsNET}/${obsproc_ver}/${model}.${pdy}} @@ -279,8 +279,8 @@ for tmmark in tm024 tm120; do export COMIN_ROOT=${COMIN_ROOT:-${COMROOT:-""}} if [ "$RUN_ENVIR" = nco ]; then - export COMIN=${COMIN:-$(compath.py ${envir}/${obsNET}/${obsproc_ver}/${model}.${PDY})} - export COMOUT=${COMOUT:-$(compath.py -o ${obsNET}/${obsproc_ver}/${model}.${PDY})} + export COMIN=$(compath.py ${envir}/${obsNET}/${obsproc_ver}/${model}.${PDY}) + export COMOUT=$(compath.py -o ${obsNET}/${obsproc_ver}/${model}.${PDY}) mkdir -m 775 -p $COMOUT else export COMIN=${COMIN:-${COMIN_ROOT:?}/${obsNET}/${obsproc_ver}/${model}.${PDY}} diff --git a/jobs/JOBSPROC_NAM_PREP b/jobs/JOBSPROC_NAM_PREP index 8b30b5b..fe1e253 100755 --- a/jobs/JOBSPROC_NAM_PREP +++ b/jobs/JOBSPROC_NAM_PREP @@ -211,7 +211,7 @@ export COMPONENT=${COMPONENT:-atmos} if [[ "$RUN_ENVIR" == nco ]]; then export COMIN=${COMIN:-$(compath.py ${envir}/${obsNET}/${obsproc_ver}/${RUN}.${PDY})} - export COMINtcvital=${COMINtcvital:-$(compath.py ${envir}/${NET}/${nam_ver}/${RUN}.${PDY})/${cyc}/${COMPONENT}/${RUN}.${cycle}.} + export COMINtcvital=${COMINtcvital:-$(compath.py ${envir}/${NET}/${nam_ver}/${RUN}.${PDY})} export COMOUT=${COMOUT:-$(compath.py -o ${obsNET}/${obsproc_ver}/${RUN}.${PDY})} mkdir -m 775 -p $COMOUT else diff --git a/scripts/exnam_makeprepbufr.sh b/scripts/exnam_makeprepbufr.sh index 088705d..a080ddb 100755 --- a/scripts/exnam_makeprepbufr.sh +++ b/scripts/exnam_makeprepbufr.sh @@ -21,6 +21,7 @@ cat break > $pgmout CHGRP_RSTPROD=${CHGRP_RSTPROD:-YES} export COMSP=${COMSP:-$COMIN/${RUN}.${cycle}.} +export COMSPtcvital=${COMSPtcvital:-$COMINtcvital/${RUN}.${cycle}.} tmhr=`echo $tmmark|cut -c3-4` cdate10=`$NDATE -$tmhr $PDY$cyc` diff --git a/triggers/jairnow_dump.wc2.pbs b/triggers/jairnow_dump.wc2.pbs index 04c2963..3ccf6b9 100755 --- a/triggers/jairnow_dump.wc2.pbs +++ b/triggers/jairnow_dump.wc2.pbs @@ -52,12 +52,15 @@ fi # Load the modules specified in $VERSION_FILE module load grib_util/${grib_util_ver} module load netcdf/${netcdf_ver} -module load bufr_dump/${bufr_dump_ver} module load intel/${intel_ver} module load craype/${craype_ver} module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} +# use local bufr_dump installation +#module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles +module load bufr_dump/${bufr_dump_ver} # Be sure the modules are loaded if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi diff --git a/triggers/jcdas_dump.wc2.pbs b/triggers/jcdas_dump.wc2.pbs index 17d6925..61909c5 100644 --- a/triggers/jcdas_dump.wc2.pbs +++ b/triggers/jcdas_dump.wc2.pbs @@ -57,8 +57,10 @@ module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} # use para installation -module unload bufr_dump #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 +# use local bufr_dump installation +module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles module load bufr_dump/${bufr_dump_ver} diff --git a/triggers/jcdas_dump_post.wc2.pbs b/triggers/jcdas_dump_post.wc2.pbs index 50cd26e..1529da3 100644 --- a/triggers/jcdas_dump_post.wc2.pbs +++ b/triggers/jcdas_dump_post.wc2.pbs @@ -36,8 +36,8 @@ export obsproc_ver_pckg=v1.0.0 export bufr_dump_ver=1.0.0 export obsNET=obsproc -#export HOMEobsproc=${PACKAGEROOTpara}/obsproc.${obsproc_ver_pckg} # NCO para -#export HOMEobsproc=${PACKAGEROOT}/${obsNET}.${obsproc_ver} # NCO prod +#export HOMEobsproc=${PACKAGEROOTpara}/${obsNET}.${obsproc_ver_pckg} # NCO para +#export HOMEobsproc=${PACKAGEROOT}/${obsNET}.${obsproc_ver_pckg} # NCO prod export HOMEobsproc=${userROOT}/install/obsproc-rmprep # local VERSION_FILE=$HOMEobsproc/versions/run.ver @@ -58,8 +58,10 @@ module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} # use para installation -module unload bufr_dump #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 +# use local bufr_dump installation +module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles module load bufr_dump/${bufr_dump_ver} diff --git a/triggers/jcdas_prep1.wc2.pbs b/triggers/jcdas_prep1.wc2.pbs index c75fea3..a68c07e 100644 --- a/triggers/jcdas_prep1.wc2.pbs +++ b/triggers/jcdas_prep1.wc2.pbs @@ -51,15 +51,19 @@ fi #Load the modules module load grib_util/${grib_util_ver} module load netcdf/${netcdf_ver} -module load bufr_dump/${bufr_dump_ver} -# use local prepobs installation -#module use ${userROOT}/install/prepobs/modulefiles -module load prepobs/${prepobs_ver} module load intel/${intel_ver} module load craype/${craype_ver} module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} +# use local bufr_dump installation +#module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles +module load bufr_dump/${bufr_dump_ver} +# use local prepobs installation +#module unload prepobs +#module use ${userROOT}/install/prepobs/modulefiles +module load prepobs/${prepobs_ver} #Check if they exist if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi diff --git a/triggers/jcdas_prep1_post.wc2.pbs b/triggers/jcdas_prep1_post.wc2.pbs index aca3094..7cfc195 100644 --- a/triggers/jcdas_prep1_post.wc2.pbs +++ b/triggers/jcdas_prep1_post.wc2.pbs @@ -50,15 +50,19 @@ fi #Load the modules module load grib_util/${grib_util_ver} module load netcdf/${netcdf_ver} -module load bufr_dump/${bufr_dump_ver} -# use local prepobs installation -#module use ${userROOT}/install/prepobs/modulefiles -module load prepobs/${prepobs_ver} module load intel/${intel_ver} module load craype/${craype_ver} module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} +# use local bufr_dump installation +#module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles +module load bufr_dump/${bufr_dump_ver} +# use local prepobs installation +#module unload prepobs +#module use ${userROOT}/install/prepobs/modulefiles +module load prepobs/${prepobs_ver} #Check if they exist if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi diff --git a/triggers/jcdas_prep2.wc2.pbs b/triggers/jcdas_prep2.wc2.pbs index 8c5c763..7497ef9 100644 --- a/triggers/jcdas_prep2.wc2.pbs +++ b/triggers/jcdas_prep2.wc2.pbs @@ -55,15 +55,19 @@ fi #Load the modules module load grib_util/${grib_util_ver} module load netcdf/${netcdf_ver} -module load bufr_dump/${bufr_dump_ver} -# use local prepobs installation -#module use ${userROOT}/install/prepobs/modulefiles -module load prepobs/${prepobs_ver} module load intel/${intel_ver} module load craype/${craype_ver} module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} +# use local bufr_dump installation +#module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles +module load bufr_dump/${bufr_dump_ver} +# use local prepobs installation +#module unload prepobs +#module use ${userROOT}/install/prepobs/modulefiles +module load prepobs/${prepobs_ver} #Check if they exist if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi diff --git a/triggers/jcdas_prep2_post.wc2.pbs b/triggers/jcdas_prep2_post.wc2.pbs index 7f288a7..7f6dc54 100644 --- a/triggers/jcdas_prep2_post.wc2.pbs +++ b/triggers/jcdas_prep2_post.wc2.pbs @@ -51,15 +51,19 @@ fi #Load the modules module load grib_util/${grib_util_ver} module load netcdf/${netcdf_ver} -module load bufr_dump/${bufr_dump_ver} -# use local prepobs installation -#module use ${userROOT}/install/prepobs/modulefiles -module load prepobs/${prepobs_ver} module load intel/${intel_ver} module load craype/${craype_ver} module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} +# use local bufr_dump installation +#module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles +module load bufr_dump/${bufr_dump_ver} +# use local prepobs installation +#module unload prepobs +#module use ${userROOT}/install/prepobs/modulefiles +module load prepobs/${prepobs_ver} #Check if they exist if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi diff --git a/triggers/jdump_monitor.wc2.pbs b/triggers/jdump_monitor.wc2.pbs index fd16b20..54eee39 100755 --- a/triggers/jdump_monitor.wc2.pbs +++ b/triggers/jdump_monitor.wc2.pbs @@ -55,8 +55,10 @@ module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} # use para installation -module unload bufr_dump #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 +# use local bufr_dump installation +module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles module load bufr_dump/${bufr_dump_ver} diff --git a/triggers/jglobal_dump.wc2.pbs b/triggers/jglobal_dump.wc2.pbs index 755985f..de50aca 100755 --- a/triggers/jglobal_dump.wc2.pbs +++ b/triggers/jglobal_dump.wc2.pbs @@ -59,8 +59,10 @@ module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} # use para installation -module unload bufr_dump #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 +# use local bufr_dump installation +module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles module load bufr_dump/${bufr_dump_ver} diff --git a/triggers/jglobal_dump_post.wc2.pbs b/triggers/jglobal_dump_post.wc2.pbs index 74a0d77..b3e7fe9 100755 --- a/triggers/jglobal_dump_post.wc2.pbs +++ b/triggers/jglobal_dump_post.wc2.pbs @@ -38,8 +38,8 @@ export obsproc_ver=v1.0 export obsproc_ver_pckg=v1.0.0 export bufr_dump_ver=1.0.0 -#export HOMEobsproc=${PACKAGEROOTpara}/obsproc.${obsproc_ver_pckg} # NCO para -#export HOMEobsproc=${PACKAGEROOT}/${obsNET}.${obsproc_ver} # NCO prod +#export HOMEobsproc=${PACKAGEROOTpara}/${obsNET}.${obsproc_ver_pckg} # NCO para +#export HOMEobsproc=${PACKAGEROOT}/${obsNET}.${obsproc_ver_pckg} # NCO prod export HOMEobsproc=${userROOT}/install/obsproc-rmprep # local VERSION_FILE=$HOMEobsproc/versions/run.ver @@ -59,8 +59,10 @@ module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} # use para installation -module unload bufr_dump #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 +# use local bufr_dump installation +module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles module load bufr_dump/${bufr_dump_ver} diff --git a/triggers/jglobal_prep.wc2.pbs b/triggers/jglobal_prep.wc2.pbs index c0e2da0..33d402b 100755 --- a/triggers/jglobal_prep.wc2.pbs +++ b/triggers/jglobal_prep.wc2.pbs @@ -50,15 +50,19 @@ fi #Load the modules module load grib_util/${grib_util_ver} module load netcdf/${netcdf_ver} -module load bufr_dump/${bufr_dump_ver} -# use local prepobs installation -#module use ${userROOT}/install/prepobs/modulefiles -module load prepobs/${prepobs_ver} module load intel/${intel_ver} module load craype/${craype_ver} module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} +# use local bufr_dump installation +#module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles +module load bufr_dump/${bufr_dump_ver} +# use local prepobs installation +#module unload prepobs +#module use ${userROOT}/install/prepobs/modulefiles +module load prepobs/${prepobs_ver} #Check if they exist if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi diff --git a/triggers/jglobal_prep_post.wc2.pbs b/triggers/jglobal_prep_post.wc2.pbs index 9f2e991..da538d1 100755 --- a/triggers/jglobal_prep_post.wc2.pbs +++ b/triggers/jglobal_prep_post.wc2.pbs @@ -50,15 +50,19 @@ fi #Load the modules module load grib_util/${grib_util_ver} module load netcdf/${netcdf_ver} -module load bufr_dump/${bufr_dump_ver} -# use local prepobs installation -#module use ${userROOT}/install/prepobs/modulefiles -module load prepobs/${prepobs_ver} module load intel/${intel_ver} module load craype/${craype_ver} module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} +# use local bufr_dump installation +#module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles +module load bufr_dump/${bufr_dump_ver} +# use local prepobs installation +#module unload prepobs +#module use ${userROOT}/install/prepobs/modulefiles +module load prepobs/${prepobs_ver} #Check if they exist if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi diff --git a/triggers/jmods.wc2.pbs b/triggers/jmods.wc2.pbs index 34e0710..22adc07 100644 --- a/triggers/jmods.wc2.pbs +++ b/triggers/jmods.wc2.pbs @@ -54,8 +54,10 @@ module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} # use para installation -module unload bufr_dump #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 +# use local bufr_dump installation +module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles module use ${userROOT}/install/bufr-dump/modulefiles module load bufr_dump/${bufr_dump_ver} diff --git a/triggers/jnam_dump.wc2.pbs b/triggers/jnam_dump.wc2.pbs index 554b5a5..708b342 100755 --- a/triggers/jnam_dump.wc2.pbs +++ b/triggers/jnam_dump.wc2.pbs @@ -59,8 +59,10 @@ module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} # use para installation -module unload bufr_dump #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 +# use local bufr_dump installation +module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles module load bufr_dump/${bufr_dump_ver} diff --git a/triggers/jnam_dump2.wc2.pbs b/triggers/jnam_dump2.wc2.pbs index f755c16..e4b85e9 100755 --- a/triggers/jnam_dump2.wc2.pbs +++ b/triggers/jnam_dump2.wc2.pbs @@ -59,8 +59,10 @@ module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} # use para installation -module unload bufr_dump #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 +# use local bufr_dump installation +module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles module load bufr_dump/${bufr_dump_ver} diff --git a/triggers/jnam_dump_post.wc2.pbs b/triggers/jnam_dump_post.wc2.pbs index 44a935e..e2287e6 100755 --- a/triggers/jnam_dump_post.wc2.pbs +++ b/triggers/jnam_dump_post.wc2.pbs @@ -59,8 +59,10 @@ module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} # use para installation -module unload bufr_dump #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 +# use local bufr_dump installation +module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles module load bufr_dump/${bufr_dump_ver} diff --git a/triggers/jnam_prep.wc2.pbs b/triggers/jnam_prep.wc2.pbs index 14c819f..5c26231 100755 --- a/triggers/jnam_prep.wc2.pbs +++ b/triggers/jnam_prep.wc2.pbs @@ -55,15 +55,19 @@ fi #Load the modules module load grib_util/${grib_util_ver} module load netcdf/${netcdf_ver} -module load bufr_dump/${bufr_dump_ver} -# use local prepobs installation -#module use ${userROOT}/install/prepobs/modulefiles -module load prepobs/${prepobs_ver} module load intel/${intel_ver} module load craype/${craype_ver} module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} +# use local bufr_dump installation +#module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles +module load bufr_dump/${bufr_dump_ver} +# use local prepobs installation +#module unload prepobs +#module use ${userROOT}/install/prepobs/modulefiles +module load prepobs/${prepobs_ver} #Check if they exist if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi diff --git a/triggers/jnam_prep_post.wc2.pbs b/triggers/jnam_prep_post.wc2.pbs index c5c5a01..2af5959 100755 --- a/triggers/jnam_prep_post.wc2.pbs +++ b/triggers/jnam_prep_post.wc2.pbs @@ -52,15 +52,19 @@ fi #Load the modules module load grib_util/${grib_util_ver} module load netcdf/${netcdf_ver} -module load bufr_dump/${bufr_dump_ver} -# use local prepobs installation -#module use ${userROOT}/install/prepobs/modulefiles -module load prepobs/${prepobs_ver} module load intel/${intel_ver} module load craype/${craype_ver} module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} +# use local bufr_dump installation +#module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles +module load bufr_dump/${bufr_dump_ver} +# use local prepobs installation +#module unload prepobs +#module use ${userROOT}/install/prepobs/modulefiles +module load prepobs/${prepobs_ver} #Check if they exist if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi diff --git a/triggers/jrap_dump.wc2.pbs b/triggers/jrap_dump.wc2.pbs index 8d1d1c3..9b302c6 100755 --- a/triggers/jrap_dump.wc2.pbs +++ b/triggers/jrap_dump.wc2.pbs @@ -65,8 +65,10 @@ module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} # use para installation -module unload bufr_dump #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 +# use local bufr_dump installation +module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles module load bufr_dump/${bufr_dump_ver} diff --git a/triggers/jrap_dump_post.wc2.pbs b/triggers/jrap_dump_post.wc2.pbs index 2beeaf2..ed6326e 100755 --- a/triggers/jrap_dump_post.wc2.pbs +++ b/triggers/jrap_dump_post.wc2.pbs @@ -67,8 +67,10 @@ module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} # use para installation -module unload bufr_dump #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 +# use local bufr_dump installation +module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles module load bufr_dump/${bufr_dump_ver} diff --git a/triggers/jrap_prep.wc2.pbs b/triggers/jrap_prep.wc2.pbs index ee71937..a507c98 100755 --- a/triggers/jrap_prep.wc2.pbs +++ b/triggers/jrap_prep.wc2.pbs @@ -58,15 +58,19 @@ fi #Load the modules module load grib_util/${grib_util_ver} module load netcdf/${netcdf_ver} -module load bufr_dump/${bufr_dump_ver} -# use local prepobs installation -#module use ${userROOT}/install/prepobs/modulefiles -module load prepobs/${prepobs_ver} module load intel/${intel_ver} module load craype/${craype_ver} module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} +# use local bufr_dump installation +#module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles +module load bufr_dump/${bufr_dump_ver} +# use local prepobs installation +#module unload prepobs +#module use ${userROOT}/install/prepobs/modulefiles +module load prepobs/${prepobs_ver} #Check if they exist if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi diff --git a/triggers/jrap_prep_post.wc2.pbs b/triggers/jrap_prep_post.wc2.pbs index 3878ab2..5a9fca1 100755 --- a/triggers/jrap_prep_post.wc2.pbs +++ b/triggers/jrap_prep_post.wc2.pbs @@ -56,15 +56,19 @@ fi #Load the modules module load grib_util/${grib_util_ver} module load netcdf/${netcdf_ver} -module load bufr_dump/${bufr_dump_ver} -# use local prepobs installation -#module use ${userROOT}/install/prepobs/modulefiles -module load prepobs/${prepobs_ver} module load intel/${intel_ver} module load craype/${craype_ver} module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} +# use local bufr_dump installation +#module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles +module load bufr_dump/${bufr_dump_ver} +# use local prepobs installation +#module unload prepobs +#module use ${userROOT}/install/prepobs/modulefiles +module load prepobs/${prepobs_ver} #Check if they exist if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi diff --git a/triggers/jrtma_dump.wc2.pbs b/triggers/jrtma_dump.wc2.pbs index a7fb552..15184ac 100644 --- a/triggers/jrtma_dump.wc2.pbs +++ b/triggers/jrtma_dump.wc2.pbs @@ -62,8 +62,10 @@ module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} # use para installation -module unload bufr_dump #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 +# use local bufr_dump installation +module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles module load bufr_dump/${bufr_dump_ver} diff --git a/triggers/jrtma_dump_post.wc2.pbs b/triggers/jrtma_dump_post.wc2.pbs index bf5ff18..e3fdc68 100644 --- a/triggers/jrtma_dump_post.wc2.pbs +++ b/triggers/jrtma_dump_post.wc2.pbs @@ -59,8 +59,10 @@ module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} # use para installation -module unload bufr_dump #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 +# use local bufr_dump installation +module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles module load bufr_dump/${bufr_dump_ver} diff --git a/triggers/jrtma_prep.wc2.pbs b/triggers/jrtma_prep.wc2.pbs index 7398d26..56617a2 100644 --- a/triggers/jrtma_prep.wc2.pbs +++ b/triggers/jrtma_prep.wc2.pbs @@ -56,15 +56,19 @@ fi #Load the modules module load grib_util/${grib_util_ver} module load netcdf/${netcdf_ver} -module load bufr_dump/${bufr_dump_ver} -# use local prepobs installation -#module use ${userROOT}/install/prepobs/modulefiles -module load prepobs/${prepobs_ver} module load intel/${intel_ver} module load craype/${craype_ver} module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} +# use local bufr_dump installation +#module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles +module load bufr_dump/${bufr_dump_ver} +# use local prepobs installation +#module unload prepobs +#module use ${userROOT}/install/prepobs/modulefiles +module load prepobs/${prepobs_ver} #Check if they exist if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi diff --git a/triggers/jrtma_prep_post.wc2.pbs b/triggers/jrtma_prep_post.wc2.pbs index 3d9dc7c..6075e52 100644 --- a/triggers/jrtma_prep_post.wc2.pbs +++ b/triggers/jrtma_prep_post.wc2.pbs @@ -56,15 +56,19 @@ fi #Load the modules module load grib_util/${grib_util_ver} module load netcdf/${netcdf_ver} -module load bufr_dump/${bufr_dump_ver} -# use local prepobs installation -#module use ${userROOT}/install/prepobs/modulefiles -module load prepobs/${prepobs_ver} module load intel/${intel_ver} module load craype/${craype_ver} module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} +# use local bufr_dump installation +#module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles +module load bufr_dump/${bufr_dump_ver} +# use local prepobs installation +#module unload prepobs +#module use ${userROOT}/install/prepobs/modulefiles +module load prepobs/${prepobs_ver} #Check if they exist if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi diff --git a/triggers/jurma_dump.wc2.pbs b/triggers/jurma_dump.wc2.pbs index 2a3d10f..8ed9f44 100644 --- a/triggers/jurma_dump.wc2.pbs +++ b/triggers/jurma_dump.wc2.pbs @@ -55,8 +55,10 @@ module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} # use para installation -module unload bufr_dump #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 +# use local bufr_dump installation +module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles module load bufr_dump/${bufr_dump_ver} diff --git a/triggers/jurma_dump_post.wc2.pbs b/triggers/jurma_dump_post.wc2.pbs index 8a2c7c8..ee21940 100644 --- a/triggers/jurma_dump_post.wc2.pbs +++ b/triggers/jurma_dump_post.wc2.pbs @@ -21,7 +21,7 @@ set -xu -envir=prod +export envir=prod export cyc=%CC% DESC=%DESC% JTYP=%JTYP% @@ -55,8 +55,10 @@ module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} # use para installation -module unload bufr_dump #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 +# use local bufr_dump installation +module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles module load bufr_dump/${bufr_dump_ver} diff --git a/triggers/jurma_prep.wc2.pbs b/triggers/jurma_prep.wc2.pbs index 46f753c..7293e55 100644 --- a/triggers/jurma_prep.wc2.pbs +++ b/triggers/jurma_prep.wc2.pbs @@ -51,15 +51,19 @@ fi #Load the modules module load grib_util/${grib_util_ver} module load netcdf/${netcdf_ver} -module load bufr_dump/${bufr_dump_ver} -# use local prepobs installation -#module use ${userROOT}/install/prepobs/modulefiles -module load prepobs/${prepobs_ver} module load intel/${intel_ver} module load craype/${craype_ver} module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} +# use local bufr_dump installation +#module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles +module load bufr_dump/${bufr_dump_ver} +# use local prepobs installation +#module unload prepobs +#module use ${userROOT}/install/prepobs/modulefiles +module load prepobs/${prepobs_ver} #Check if they exist if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi diff --git a/triggers/jurma_prep_post.wc2.pbs b/triggers/jurma_prep_post.wc2.pbs index 3c524df..501345f 100644 --- a/triggers/jurma_prep_post.wc2.pbs +++ b/triggers/jurma_prep_post.wc2.pbs @@ -51,15 +51,19 @@ fi #Load the modules module load grib_util/${grib_util_ver} module load netcdf/${netcdf_ver} -module load bufr_dump/${bufr_dump_ver} -# use local prepobs installation -#module use ${userROOT}/install/prepobs/modulefiles -module load prepobs/${prepobs_ver} module load intel/${intel_ver} module load craype/${craype_ver} module load cray-mpich/${cray_mpich_ver} module load cray-pals/${cray_pals_ver} module load cfp/${cfp_ver} +# use local bufr_dump installation +#module unload bufr_dump +#module use ${userROOT}/install/bufr_dump/modulefiles +module load bufr_dump/${bufr_dump_ver} +# use local prepobs installation +#module unload prepobs +#module use ${userROOT}/install/prepobs/modulefiles +module load prepobs/${prepobs_ver} #Check if they exist if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi diff --git a/versions/run.ver b/versions/run.ver index 81b609f..099b17d 100644 --- a/versions/run.ver +++ b/versions/run.ver @@ -5,8 +5,8 @@ export libjpeg_ver=9c export grib_util_ver=1.2.2 export netcdf_ver=4.7.4 -export bufr_dump_ver=1.0.0 -export prepobs_ver=1.0.0 +export bufr_dump_ver=1.0.1 +export prepobs_ver=1.0.1 export intel_ver=19.1.3.304 export craype_ver=2.7.8 @@ -15,11 +15,14 @@ export cray_pals_ver=1.0.12 export cfp_ver=2.0.4 export gfs_ver=v16.2 +export nam_ver=v4.2 export dictionaries_ver=v3.4.0 -export seaice_analysis_ver=v4.5 +export seaice_analysis_ver=v4.5 #engice, seaice.*5min.grb file export cdas_ver=v1.2 export nsst_ver=v1.2 #rtgsst file -export PROCESS_MASTER_SHIP_STNLST=NO +export PROCESS_MASTER_SHIP_STNLST=NO #for monthly gdas count (run on 2nd of Month) export BACK=off +#export SENDSDM=NO # only YES for prod anyways +#export TIME_CHECK=NO # dump_monitor testing