diff --git a/driver/gdas/run_JGDAS_NCEPPOST.sh b/driver/gdas/run_JGDAS_NCEPPOST.sh index de4618e2f3..ecacffc177 100755 --- a/driver/gdas/run_JGDAS_NCEPPOST.sh +++ b/driver/gdas/run_JGDAS_NCEPPOST.sh @@ -28,8 +28,7 @@ export MP_STDOUTMODE=ordered module load PrgEnv-intel ESMF-intel-haswell/3_1_0rp5 cfp-intel-sandybridge iobuf craype-hugepages2M craype-haswell #module load cfp-intel-sandybridge/1.1.0 module use /gpfs/hps/nco/ops/nwprod/modulefiles -module load prod_envir -#module load prod_util +module load prod_envir/1.1.0 module load prod_util/1.0.4 module load grib_util/1.0.3 diff --git a/driver/gdas/test_emcsfc.sh b/driver/gdas/test_emcsfc.sh index b89e018d8d..5a89e75202 100755 --- a/driver/gdas/test_emcsfc.sh +++ b/driver/gdas/test_emcsfc.sh @@ -28,7 +28,7 @@ export RUN_ENVIR="nco" export DATA="/gpfs/hps/stmp/$LOGNAME/tmpnwprd/${job}" export jlogfile="/gpfs/hps/stmp/$LOGNAME/jlogfile" -module load prod_envir/1.0.1 +module load prod_envir/1.1.0 export envir="prod" export COMROOT="/gpfs/hps/stmp/${LOGNAME}"${COMROOT} diff --git a/driver/gdas/test_gdas_analysis_high.sh b/driver/gdas/test_gdas_analysis_high.sh index 12bc150305..43405355e0 100755 --- a/driver/gdas/test_gdas_analysis_high.sh +++ b/driver/gdas/test_gdas_analysis_high.sh @@ -40,7 +40,7 @@ export DATAROOT=/gpfs/hps/stmp/$LOGNAME/test export gdas_ver=v14.1.0 export global_shared_ver=v14.1.0 export crtm_ver=2.2.4 -export prod_envir_ver=1.0.1 +export prod_envir_ver=1.1.0 export grib_util_ver=1.0.3 export prod_util_ver=1.0.6 export util_shared_ver=1.0.3 diff --git a/driver/gdas/test_gdas_enkf_innovate_obs.sh b/driver/gdas/test_gdas_enkf_innovate_obs.sh index e7b2f28572..3fe4df49cf 100755 --- a/driver/gdas/test_gdas_enkf_innovate_obs.sh +++ b/driver/gdas/test_gdas_enkf_innovate_obs.sh @@ -46,7 +46,7 @@ export DATAROOT=/gpfs/hps/stmp/$LOGNAME/test export gdas_ver=v14.1.0 export global_shared_ver=v14.1.0 export crtm_ver=2.2.4 -export prod_envir_ver=1.0.1 +export prod_envir_ver=1.1.0 export grib_util_ver=1.0.3 export prod_util_ver=1.0.6 export util_shared_ver=1.0.3 diff --git a/driver/gdas/test_gdas_enkf_select_obs.sh b/driver/gdas/test_gdas_enkf_select_obs.sh index 0c2f08dfc7..bef6518207 100755 --- a/driver/gdas/test_gdas_enkf_select_obs.sh +++ b/driver/gdas/test_gdas_enkf_select_obs.sh @@ -39,7 +39,7 @@ export DATAROOT=/gpfs/hps/stmp/$LOGNAME/test export gdas_ver=v14.1.0 export global_shared_ver=v14.1.0 export crtm_ver=2.2.4 -export prod_envir_ver=1.0.1 +export prod_envir_ver=1.1.0 export grib_util_ver=1.0.3 export prod_util_ver=1.0.6 export util_shared_ver=1.0.3 diff --git a/driver/gdas/test_jgdas_tropc_cray.sh b/driver/gdas/test_jgdas_tropc_cray.sh index e37ea5d47b..c24b17a903 100755 --- a/driver/gdas/test_jgdas_tropc_cray.sh +++ b/driver/gdas/test_jgdas_tropc_cray.sh @@ -53,7 +53,6 @@ export COMDATEROOT=/gpfs/hps/ptmp/Qingfu.Liu/com #export COMDATEROOT=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/com #export COMDATEROOT=/gpfs/tp2/nco/ops/com export DATA_DUMPJB=/gpfs/hps/ptmp/Qingfu.Liu/com/111 -#export archsyndir=/gpfs/tp1/nco/ops/com/arch/prod/syndat #export DCOMROOT=/dcom export DCOMROOT=/gpfs/tp1/nco/ops/dcom diff --git a/driver/gdas/test_jgdas_tropcy_qc_reloc_cray.sh b/driver/gdas/test_jgdas_tropcy_qc_reloc_cray.sh index 8a77f1e6c4..e5d85cf149 100755 --- a/driver/gdas/test_jgdas_tropcy_qc_reloc_cray.sh +++ b/driver/gdas/test_jgdas_tropcy_qc_reloc_cray.sh @@ -14,6 +14,7 @@ module use /gpfs/hps/nco/ops/nwprod/modulefiles module load prod_util +module load prod_envir/1.1.0 module unload grib_util module load grib_util/1.0.3 ##module load crtm-intel/2.2.3 @@ -80,7 +81,7 @@ export PDY=20140814 #export COMINgdas=/gpfs/tp1/nco/ops/com/gfs/prod/gdas.${PDY} export COMINgfs=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/com/gfs/$envir/gfs.${PDY} export COMINgdas=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/com/gfs/$envir/gdas.${PDY} -export ARCHSYND=/gpfs/tp1/nco/ops/com/arch/prod/syndat +export ARCHSYND=${COMINsyn:-$(compath.py gfs/prod/syndat)} export HOMENHC=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/guidance/storm-data/ncep #export GETGES_COM=/gpfs/tp1/nco/ops/com export GETGES_COM=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/com diff --git a/driver/gfs/test_emcsfc.sh b/driver/gfs/test_emcsfc.sh index 690045eb38..477b1ddbc7 100755 --- a/driver/gfs/test_emcsfc.sh +++ b/driver/gfs/test_emcsfc.sh @@ -28,7 +28,7 @@ export RUN_ENVIR="nco" export DATA="/gpfs/hps/stmp/$LOGNAME/tmpnwprd/${job}" export jlogfile="/gpfs/hps/stmp/$LOGNAME/jlogfile" -module load prod_envir/1.0.1 +module load prod_envir/1.1.0 export envir="prod" export COMROOT="/gpfs/hps/stmp/${LOGNAME}"${COMROOT} diff --git a/driver/gfs/test_gfs_analysis.sh b/driver/gfs/test_gfs_analysis.sh index 9aa5ab8f23..f7a8693ea3 100755 --- a/driver/gfs/test_gfs_analysis.sh +++ b/driver/gfs/test_gfs_analysis.sh @@ -40,7 +40,7 @@ export DATAROOT=/gpfs/hps/stmp/$LOGNAME/test export gfs_ver=v14.1.0 export global_shared_ver=v14.1.0 export crtm_ver=2.2.4 -export prod_envir_ver=1.0.1 +export prod_envir_ver=1.1.0 export grib_util_ver=1.0.3 export prod_util_ver=1.0.8 export util_shared_ver=1.0.3 diff --git a/driver/gfs/test_jgfs_cyclone_tracker_cray.sh b/driver/gfs/test_jgfs_cyclone_tracker_cray.sh index 61ec26cf04..7ed711f1ba 100755 --- a/driver/gfs/test_jgfs_cyclone_tracker_cray.sh +++ b/driver/gfs/test_jgfs_cyclone_tracker_cray.sh @@ -14,6 +14,7 @@ module use /gpfs/hps/nco/ops/nwprod/modulefiles module load prod_util +module load prod_envir/1.1.0 module unload grib_util module load grib_util/1.0.3 ##module load crtm-intel/2.2.3 @@ -76,7 +77,7 @@ export cycle=t${cyc}z #setpdy.sh #. PDY -export archsyndir=/gpfs/tp1/nco/ops/com/arch/prod/syndat +export archsyndir=${COMINsyn:-$(compath.py gfs/prod/syndat)} export WGRIB2=/gpfs/hps/nco/ops/nwprod/grib_util.v1.0.3/exec/wgrib2 export GRB2INDEX=/gpfs/hps/nco/ops/nwprod/grib_util.v1.0.3/exec/grb2index export GRBINDEX2=/gpfs/hps/nco/ops/nwprod/grib_util.v1.0.3/exec/grb2index @@ -90,8 +91,7 @@ export PDY=20140814 #export COMINgdas=/gpfs/gp2/nco/ops/com/gfs/prod/gdas.${PDY} export COMINgfs=$COMROOT/gfs/$envir/gfs.${PDY} export COMINgdas=$COMROOT/gfs/$envir/gdas.${PDY} -export ARCHSYND=/gpfs/tp1/nco/ops/com/arch/prod/syndat -#export ARCHSYND=/gpfs/tp1/nco/ops/com/arch/prod/syndat +export ARCHSYND=${COMINsyn:-$(compath.py gfs/prod/syndat)} export HOMENHC=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/guidance/storm-data/ncep #export GETGES_COM=/gpfs/gp2/nco/ops/com #export GESROOT=/gpfs/gp2/nco/ops/com diff --git a/driver/gfs/test_jgfs_tropcy_qc_reloc_cray.sh b/driver/gfs/test_jgfs_tropcy_qc_reloc_cray.sh index 9c43a88f64..c836e91125 100755 --- a/driver/gfs/test_jgfs_tropcy_qc_reloc_cray.sh +++ b/driver/gfs/test_jgfs_tropcy_qc_reloc_cray.sh @@ -14,6 +14,7 @@ module use /gpfs/hps/nco/ops/nwprod/modulefiles module load prod_util +module load prod_envir/1.1.0 module unload grib_util module load grib_util/1.0.3 ##module load crtm-intel/2.2.3 @@ -80,7 +81,7 @@ export PDY=20140814 #export COMINgdas=/gpfs/tp1/nco/ops/com/gfs/prod/gdas.${PDY} export COMINgfs=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/com/gfs/$envir/gfs.${PDY} export COMINgdas=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/com/gfs/$envir/gdas.${PDY} -export ARCHSYND=/gpfs/tp1/nco/ops/com/arch/prod/syndat +export ARCHSYND=${COMINsyn:-$(compath.py gfs/prod/syndat)} export HOMENHC=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/guidance/storm-data/ncep #export GETGES_COM=/gpfs/tp1/nco/ops/com export GETGES_COM=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/com diff --git a/driver/product/run_JGDAS_BULLS_NAVY_dell.sh_00 b/driver/product/run_JGDAS_BULLS_NAVY_dell.sh_00 index aa256eaf58..5e2c6b6b28 100755 --- a/driver/product/run_JGDAS_BULLS_NAVY_dell.sh_00 +++ b/driver/product/run_JGDAS_BULLS_NAVY_dell.sh_00 @@ -34,7 +34,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 module list diff --git a/driver/product/run_JGDAS_BULLS_NAVY_dell.sh_12 b/driver/product/run_JGDAS_BULLS_NAVY_dell.sh_12 index 57df71f25b..3eceea288d 100755 --- a/driver/product/run_JGDAS_BULLS_NAVY_dell.sh_12 +++ b/driver/product/run_JGDAS_BULLS_NAVY_dell.sh_12 @@ -34,7 +34,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 module list diff --git a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_00 b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_00 index a46faeacdc..c09280eae0 100755 --- a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_00 +++ b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_00 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_06 b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_06 index 9ec2a213bf..5b68625f9a 100755 --- a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_06 +++ b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_06 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_12 b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_12 index 1c6ec05b31..146e1fda16 100755 --- a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_12 +++ b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_12 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_18 b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_18 index b6adf20034..f15c1bbac6 100755 --- a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_18 +++ b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_18 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGDAS_GEMPAK_dell.sh_00 b/driver/product/run_JGDAS_GEMPAK_dell.sh_00 index 2c1e79b3bf..de486509b0 100755 --- a/driver/product/run_JGDAS_GEMPAK_dell.sh_00 +++ b/driver/product/run_JGDAS_GEMPAK_dell.sh_00 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGDAS_GEMPAK_dell.sh_06 b/driver/product/run_JGDAS_GEMPAK_dell.sh_06 index f151af2458..51214f4a36 100755 --- a/driver/product/run_JGDAS_GEMPAK_dell.sh_06 +++ b/driver/product/run_JGDAS_GEMPAK_dell.sh_06 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGDAS_GEMPAK_dell.sh_12 b/driver/product/run_JGDAS_GEMPAK_dell.sh_12 index 0e3a48c9b0..3c6f262356 100755 --- a/driver/product/run_JGDAS_GEMPAK_dell.sh_12 +++ b/driver/product/run_JGDAS_GEMPAK_dell.sh_12 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGDAS_GEMPAK_dell.sh_18 b/driver/product/run_JGDAS_GEMPAK_dell.sh_18 index 4b875b833c..cdfa634d0e 100755 --- a/driver/product/run_JGDAS_GEMPAK_dell.sh_18 +++ b/driver/product/run_JGDAS_GEMPAK_dell.sh_18 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_00 b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_00 index 4bca270e13..994f61cae6 100755 --- a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_00 +++ b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_00 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 module list diff --git a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_06 b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_06 index e741bd9574..0088059414 100755 --- a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_06 +++ b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_06 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 module list diff --git a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_12 b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_12 index c13d0d1bf0..ba8796a708 100755 --- a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_12 +++ b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_12 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 module list diff --git a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_18 b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_18 index dfab05cc72..0e811206db 100755 --- a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_18 +++ b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_18 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 module list diff --git a/driver/product/run_JGFS_AWIPS_G2_dell.sh_00 b/driver/product/run_JGFS_AWIPS_G2_dell.sh_00 index 14e7a04e30..468a6b3d22 100755 --- a/driver/product/run_JGFS_AWIPS_G2_dell.sh_00 +++ b/driver/product/run_JGFS_AWIPS_G2_dell.sh_00 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 module list diff --git a/driver/product/run_JGFS_AWIPS_G2_dell.sh_06 b/driver/product/run_JGFS_AWIPS_G2_dell.sh_06 index db124f3f59..5ee740cb39 100755 --- a/driver/product/run_JGFS_AWIPS_G2_dell.sh_06 +++ b/driver/product/run_JGFS_AWIPS_G2_dell.sh_06 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 module list diff --git a/driver/product/run_JGFS_AWIPS_G2_dell.sh_12 b/driver/product/run_JGFS_AWIPS_G2_dell.sh_12 index 6d69a2c60d..7398cf380f 100755 --- a/driver/product/run_JGFS_AWIPS_G2_dell.sh_12 +++ b/driver/product/run_JGFS_AWIPS_G2_dell.sh_12 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 module list diff --git a/driver/product/run_JGFS_AWIPS_G2_dell.sh_18 b/driver/product/run_JGFS_AWIPS_G2_dell.sh_18 index b0c51418e3..a553d61095 100755 --- a/driver/product/run_JGFS_AWIPS_G2_dell.sh_18 +++ b/driver/product/run_JGFS_AWIPS_G2_dell.sh_18 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 module list diff --git a/driver/product/run_JGFS_FBWIND_dell.sh_00 b/driver/product/run_JGFS_FBWIND_dell.sh_00 index c193663938..eeeb5c467a 100755 --- a/driver/product/run_JGFS_FBWIND_dell.sh_00 +++ b/driver/product/run_JGFS_FBWIND_dell.sh_00 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 module list diff --git a/driver/product/run_JGFS_FBWIND_dell.sh_06 b/driver/product/run_JGFS_FBWIND_dell.sh_06 index f7cedf6e80..e60bd94976 100755 --- a/driver/product/run_JGFS_FBWIND_dell.sh_06 +++ b/driver/product/run_JGFS_FBWIND_dell.sh_06 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 module list diff --git a/driver/product/run_JGFS_FBWIND_dell.sh_12 b/driver/product/run_JGFS_FBWIND_dell.sh_12 index f49bd9c387..451f88a959 100755 --- a/driver/product/run_JGFS_FBWIND_dell.sh_12 +++ b/driver/product/run_JGFS_FBWIND_dell.sh_12 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 module list diff --git a/driver/product/run_JGFS_FBWIND_dell.sh_18 b/driver/product/run_JGFS_FBWIND_dell.sh_18 index f047ac64df..711ca5488d 100755 --- a/driver/product/run_JGFS_FBWIND_dell.sh_18 +++ b/driver/product/run_JGFS_FBWIND_dell.sh_18 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 module list diff --git a/driver/product/run_JGFS_GEMPAK_META_dell.sh_00 b/driver/product/run_JGFS_GEMPAK_META_dell.sh_00 index 74f53aa436..4bb980e982 100755 --- a/driver/product/run_JGFS_GEMPAK_META_dell.sh_00 +++ b/driver/product/run_JGFS_GEMPAK_META_dell.sh_00 @@ -34,7 +34,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGFS_GEMPAK_META_dell.sh_06 b/driver/product/run_JGFS_GEMPAK_META_dell.sh_06 index 1e5456c210..84ccd3d052 100755 --- a/driver/product/run_JGFS_GEMPAK_META_dell.sh_06 +++ b/driver/product/run_JGFS_GEMPAK_META_dell.sh_06 @@ -34,7 +34,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGFS_GEMPAK_META_dell.sh_12 b/driver/product/run_JGFS_GEMPAK_META_dell.sh_12 index 14fdabd535..41c480874a 100755 --- a/driver/product/run_JGFS_GEMPAK_META_dell.sh_12 +++ b/driver/product/run_JGFS_GEMPAK_META_dell.sh_12 @@ -34,7 +34,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGFS_GEMPAK_META_dell.sh_18 b/driver/product/run_JGFS_GEMPAK_META_dell.sh_18 index f2b1553e7e..b02ebc17aa 100755 --- a/driver/product/run_JGFS_GEMPAK_META_dell.sh_18 +++ b/driver/product/run_JGFS_GEMPAK_META_dell.sh_18 @@ -34,7 +34,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_00 b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_00 index 785e09f30c..6f320d7cf3 100755 --- a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_00 +++ b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_00 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_06 b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_06 index 09ced228bb..cda892dc72 100755 --- a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_06 +++ b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_06 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_12 b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_12 index 40d315203c..3edf66d6a2 100755 --- a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_12 +++ b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_12 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_18 b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_18 index ead98fc978..e6a387c1eb 100755 --- a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_18 +++ b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_18 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGFS_GEMPAK_dell.sh_00 b/driver/product/run_JGFS_GEMPAK_dell.sh_00 index 1b4d796753..6f0ac0c31f 100755 --- a/driver/product/run_JGFS_GEMPAK_dell.sh_00 +++ b/driver/product/run_JGFS_GEMPAK_dell.sh_00 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGFS_GEMPAK_dell.sh_06 b/driver/product/run_JGFS_GEMPAK_dell.sh_06 index 37c3776ff4..418c4494bc 100755 --- a/driver/product/run_JGFS_GEMPAK_dell.sh_06 +++ b/driver/product/run_JGFS_GEMPAK_dell.sh_06 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGFS_GEMPAK_dell.sh_12 b/driver/product/run_JGFS_GEMPAK_dell.sh_12 index 8d8c6f3027..3a18b6670d 100755 --- a/driver/product/run_JGFS_GEMPAK_dell.sh_12 +++ b/driver/product/run_JGFS_GEMPAK_dell.sh_12 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGFS_GEMPAK_dell.sh_18 b/driver/product/run_JGFS_GEMPAK_dell.sh_18 index 296a6b96b1..6bbfab3ff2 100755 --- a/driver/product/run_JGFS_GEMPAK_dell.sh_18 +++ b/driver/product/run_JGFS_GEMPAK_dell.sh_18 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGFS_NCEPPOST b/driver/product/run_JGFS_NCEPPOST index aef94f1c5c..88698d36df 100755 --- a/driver/product/run_JGFS_NCEPPOST +++ b/driver/product/run_JGFS_NCEPPOST @@ -31,8 +31,7 @@ export OMP_NUM_THREADS=$threads module load PrgEnv-intel ESMF-intel-haswell/3_1_0rp5 cfp-intel-sandybridge iobuf craype-hugepages2M craype-haswell #module load cfp-intel-sandybridge/1.1.0 module use /gpfs/hps/nco/ops/nwprod/modulefiles -module load prod_envir -#module load prod_util +module load prod_envir/1.1.0 module load prod_util/1.0.4 module load grib_util/1.0.3 ##module load crtm-intel/2.2.4 diff --git a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_00 b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_00 index ea6dd55cfe..d4b0504e51 100755 --- a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_00 +++ b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_00 @@ -32,7 +32,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_06 b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_06 index 4b41c1254c..1b46cfd16a 100755 --- a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_06 +++ b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_06 @@ -32,7 +32,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_12 b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_12 index 153f1ba28d..779a0e0378 100755 --- a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_12 +++ b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_12 @@ -32,7 +32,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_18 b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_18 index 5157c58aa4..e248a2338e 100755 --- a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_18 +++ b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_18 @@ -32,7 +32,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 ########################################### # Now set up GEMPAK/NTRANS environment diff --git a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_00 b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_00 index ce93ef06f3..fbb1921c47 100755 --- a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_00 +++ b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_00 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 module list diff --git a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_06 b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_06 index ec22a80f35..57c47b5e37 100755 --- a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_06 +++ b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_06 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 module list diff --git a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_12 b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_12 index 8be27ac95e..ac26e77c11 100755 --- a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_12 +++ b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_12 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 module list diff --git a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_18 b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_18 index ff647c282f..dc99d75f9d 100755 --- a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_18 +++ b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_18 @@ -33,7 +33,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.3 -module load prod_envir/1.0.3 +module load prod_envir/1.1.0 module load grib_util/1.1.0 module list diff --git a/driver/product/run_JGFS_WAFS.cray b/driver/product/run_JGFS_WAFS.cray index d16275e52f..0822d81938 100755 --- a/driver/product/run_JGFS_WAFS.cray +++ b/driver/product/run_JGFS_WAFS.cray @@ -23,8 +23,7 @@ module load iobuf module load PrgEnv-intel ESMF-intel-haswell/3_1_0rp5 cfp-intel-sandybridge iobuf craype-hugepages2M craype-haswell #module load cfp-intel-sandybridge/1.1.0 module use /gpfs/hps/nco/ops/nwprod/modulefiles -module load prod_envir -module load prod_util +module load prod_envir/1.1.0 module load prod_util/1.0.4 module load grib_util/1.0.3 diff --git a/driver/product/run_JGFS_WAFS_BLENDING.cray b/driver/product/run_JGFS_WAFS_BLENDING.cray index febc5cb621..6f71b37b28 100755 --- a/driver/product/run_JGFS_WAFS_BLENDING.cray +++ b/driver/product/run_JGFS_WAFS_BLENDING.cray @@ -18,8 +18,7 @@ module load PrgEnv-intel ESMF-intel-haswell/3_1_0rp5 cfp-intel-sandybridge iobuf craype-hugepages2M craype-haswell #module load cfp-intel-sandybridge/1.1.0 module use /gpfs/hps/nco/ops/nwprod/modulefiles -module load prod_envir -module load prod_util +module load prod_envir/1.1.0 module load prod_util/1.0.4 module load grib_util/1.0.3 @@ -168,4 +167,4 @@ if [ $USER = 'Yali.Mao' ] ; then done fi -exit \ No newline at end of file +exit diff --git a/driver/product/run_JGFS_WAFS_GRIB2.cray b/driver/product/run_JGFS_WAFS_GRIB2.cray index 27e8ffedca..82b2506006 100755 --- a/driver/product/run_JGFS_WAFS_GRIB2.cray +++ b/driver/product/run_JGFS_WAFS_GRIB2.cray @@ -18,8 +18,7 @@ module load PrgEnv-intel ESMF-intel-haswell/3_1_0rp5 cfp-intel-sandybridge iobuf craype-hugepages2M craype-haswell #module load cfp-intel-sandybridge/1.1.0 module use /gpfs/hps/nco/ops/nwprod/modulefiles -module load prod_envir -module load prod_util +module load prod_envir/1.1.0 module load prod_util/1.0.4 module load grib_util/1.0.3 diff --git a/driver/product/run_postsnd.sh b/driver/product/run_postsnd.sh index 72f7c26ebb..b11f850c93 100755 --- a/driver/product/run_postsnd.sh +++ b/driver/product/run_postsnd.sh @@ -22,7 +22,7 @@ module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.0 module load grib_util/1.0.6 -module load prod_envir/1.0.2 +module load prod_envir/1.1.0 module load CFP/2.0.1 #module use -a /gpfs/dell1/nco/ops/nwpara/modulefiles/ diff --git a/driver/product/run_postsnd.sh.cray b/driver/product/run_postsnd.sh.cray index 6679562b16..c51ddf61dc 100755 --- a/driver/product/run_postsnd.sh.cray +++ b/driver/product/run_postsnd.sh.cray @@ -20,8 +20,7 @@ module load craype-hugepages16M module load PrgEnv-intel ESMF-intel-haswell/3_1_0rp5 cfp-intel-sandybridge iobuf craype-haswell #module load cfp-intel-sandybridge/1.1.0 module use /gpfs/hps/nco/ops/nwprod/modulefiles -module load prod_envir -module load prod_util +module load prod_envir/1.1.0 module load prod_util/1.0.4 module load grib_util/1.0.3 diff --git a/driver/product/run_postsnd.sh.dell b/driver/product/run_postsnd.sh.dell index e7d3a17d66..406d74b41c 100755 --- a/driver/product/run_postsnd.sh.dell +++ b/driver/product/run_postsnd.sh.dell @@ -22,7 +22,7 @@ module load impi/18.0.1 module load lsf/10.1 module load prod_util/1.1.0 module load grib_util/1.0.6 -module load prod_envir/1.0.2 +module load prod_envir/1.1.0 module load CFP/2.0.1 module use -a /gpfs/dell1/nco/ops/nwpara/modulefiles/ diff --git a/ecflow/ecf/scripts/gfs_FV3/forecast/jgfs_forecast_high.usr b/ecflow/ecf/scripts/gfs_FV3/forecast/jgfs_forecast_high.usr index b926f71899..0abf6ae9b7 100644 --- a/ecflow/ecf/scripts/gfs_FV3/forecast/jgfs_forecast_high.usr +++ b/ecflow/ecf/scripts/gfs_FV3/forecast/jgfs_forecast_high.usr @@ -17,7 +17,7 @@ QUEUE = prod RUN = gfs SENDDBN:YES = YES SENDDBN_NTC:YES = YES -prod_envir_ver = 1.0.3 +prod_envir_ver = 1.1.0 prod_util_ver = 1.1.0 %end - ecf user variables #! /bin/sh @@ -99,7 +99,7 @@ export SENDDBN=${SENDDBN:-YES} export SENDDBN_NTC=${SENDDBN_NTC:-YES} FILESYSTEMROOT=/gpfs/dell1 -module load prod_envir/1.0.3 prod_util/1.1.0 +module load prod_envir/1.1.0 prod_util/1.1.0 case $envir in prod) @@ -189,4 +189,4 @@ trap 0 # Remove all traps exit 0 # End the shell %manual -%end \ No newline at end of file +%end diff --git a/jobs/JGFS_CYCLONE_GENESIS b/jobs/JGFS_CYCLONE_GENESIS index 4247a08948..62519e7eca 100755 --- a/jobs/JGFS_CYCLONE_GENESIS +++ b/jobs/JGFS_CYCLONE_GENESIS @@ -100,7 +100,7 @@ export JYYYY=`echo ${PDY} | cut -c1-4` #export COMOUTgenvit=${COMOUTgenvit:-${COMOUT}/genesis_vital_${JYYYY}} export COMINgenvit=${COMINgenvit:-${DATA}/genesis_vital_${JYYYY}} export COMOUTgenvit=${COMOUTgenvit:-${DATA}/genesis_vital_${JYYYY}} -export COMINsyn=${COMINsyn:-$(compath.py arch/prod/syndat)} +export COMINsyn=${COMINsyn:-$(compath.py gfs/prod/syndat)} mkdir -m 775 -p $COMOUTgenvit diff --git a/jobs/JGFS_CYCLONE_TRACKER b/jobs/JGFS_CYCLONE_TRACKER index d281857c85..c0492c79d7 100755 --- a/jobs/JGFS_CYCLONE_TRACKER +++ b/jobs/JGFS_CYCLONE_TRACKER @@ -98,7 +98,7 @@ export gfsdir=${COMINgfs} export COMINgdas=${COMIN} export gdasdir=${COMINgdas} export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc} -export COMINsyn=${COMINsyn:-$(compath.py arch/prod/syndat)} +export COMINsyn=${COMINsyn:-$(compath.py gfs/prod/syndat)} if [ $RUN_ENVIR = "nco" ]; then export COMOUThur=${COMROOTp1:?}/hur/${envir}/global diff --git a/jobs/rocoto/getic.sh b/jobs/rocoto/getic.sh index de6ad7320b..7db891895c 100755 --- a/jobs/rocoto/getic.sh +++ b/jobs/rocoto/getic.sh @@ -39,6 +39,7 @@ status=$? yyyy=$(echo $CDATE | cut -c1-4) mm=$(echo $CDATE | cut -c5-6) dd=$(echo $CDATE | cut -c7-8) +cyc=${cyc:-$(echo $CDATE | cut -c9-10)} ############################################################### @@ -46,47 +47,57 @@ target_dir=$ICSDIR/$CDATE/$CDUMP mkdir -p $target_dir cd $target_dir -# Save the files as legacy EMC filenames -ftanal[1]="pgbanl.${CDUMP}.$CDATE" -ftanal[2]="siganl.${CDUMP}.$CDATE" -ftanal[3]="sfcanl.${CDUMP}.$CDATE" -ftanal[4]="nstanl.${CDUMP}.$CDATE" - # Initialize return code to 0 rc=1 if [ $ics_from = "opsgfs" ]; then + # Location of production tarballs on HPSS + hpssdir="/NCEPPROD/hpssprod/runhistory/rh$yyyy/$yyyy$mm/$PDY" + # Handle nemsio and pre-nemsio GFS filenames - if [ $CDATE -gt "2017072000" ]; then + if [ $CDATE -le "2019061118" ]; then #GFSv14 + # Add CDUMP.PDY/CYC to target_dir + target_dir=$ICSDIR/$CDATE/$CDUMP/${CDUMP}.$yyyy$mm$dd/$cyc + mkdir -p $target_dir + cd $target_dir + nfanal=4 - fanal[1]="./${CDUMP}.t${cyc}z.pgrbanl" - fanal[2]="./${CDUMP}.t${cyc}z.atmanl.nemsio" - fanal[3]="./${CDUMP}.t${cyc}z.sfcanl.nemsio" - fanal[4]="./${CDUMP}.t${cyc}z.nstanl.nemsio" + fanal[1]="./${CDUMP}.t${cyc}z.atmanl.nemsio" + fanal[2]="./${CDUMP}.t${cyc}z.sfcanl.nemsio" + fanal[3]="./${CDUMP}.t${cyc}z.nstanl.nemsio" + fanal[4]="./${CDUMP}.t${cyc}z.pgrbanl" flanal="${fanal[1]} ${fanal[2]} ${fanal[3]} ${fanal[4]}" tarpref="gpfs_hps_nco_ops_com" - else - nfanal=3 - [[ $CDUMP = "gdas" ]] && str1=1 - fanal[1]="./${CDUMP}${str1}.t${cyc}z.pgrbanl" - fanal[2]="./${CDUMP}${str1}.t${cyc}z.sanl" - fanal[3]="./${CDUMP}${str1}.t${cyc}z.sfcanl" - flanal="${fanal[1]} ${fanal[2]} ${fanal[3]}" - tarpref="com2" + if [ $CDUMP = "gdas" ]; then + tarball="$hpssdir/${tarpref}_gfs_prod_${CDUMP}.${CDATE}.tar" + elif [ $CDUMP = "gfs" ]; then + tarball="$hpssdir/${tarpref}_gfs_prod_${CDUMP}.${CDATE}.anl.tar" + fi + else #GFSv15 + nfanal=2 + fanal[1]="./${CDUMP}.$yyyy$mm$dd/$cyc/${CDUMP}.t${cyc}z.atmanl.nemsio" + fanal[2]="./${CDUMP}.$yyyy$mm$dd/$cyc/${CDUMP}.t${cyc}z.sfcanl.nemsio" + flanal="${fanal[1]} ${fanal[2]}" + tarpref="gpfs_dell1_nco_ops_com" + if [ $CDUMP = "gdas" ]; then + tarball="$hpssdir/${tarpref}_gfs_prod_${CDUMP}.${yyyy}${mm}${dd}_${cyc}.${CDUMP}_nemsio.tar" + elif [ $CDUMP = "gfs" ]; then + tarball="$hpssdir/${tarpref}_gfs_prod_${CDUMP}.${yyyy}${mm}${dd}_${cyc}.${CDUMP}_nemsioa.tar" + fi fi # First check the COMROOT for files, if present copy over if [ $machine = "WCOSS_C" ]; then # Need COMROOT - module load prod_envir >> /dev/null 2>&1 + module load prod_envir/1.1.0 >> /dev/null 2>&1 comdir="$COMROOT/$CDUMP/prod/$CDUMP.$PDY" rc=0 for i in `seq 1 $nfanal`; do if [ -f $comdir/${fanal[i]} ]; then - $NCP $comdir/${fanal[i]} ${ftanal[i]} + $NCP $comdir/${fanal[i]} ${fanal[i]} else rb=1 ; ((rc+=rb)) fi @@ -97,13 +108,6 @@ if [ $ics_from = "opsgfs" ]; then # Get initial conditions from HPSS if [ $rc -ne 0 ]; then - hpssdir="/NCEPPROD/hpssprod/runhistory/rh$yyyy/$yyyy$mm/$PDY" - if [ $CDUMP = "gdas" ]; then - tarball="$hpssdir/${tarpref}_gfs_prod_${CDUMP}.${CDATE}.tar" - elif [ $CDUMP = "gfs" ]; then - tarball="$hpssdir/${tarpref}_gfs_prod_${CDUMP}.${CDATE}.anl.tar" - fi - # check if the tarball exists hsi ls -l $tarball rc=$? @@ -120,9 +124,11 @@ if [ $ics_from = "opsgfs" ]; then fi # Move the files to legacy EMC filenames - for i in `seq 1 $nfanal`; do - $NMV ${fanal[i]} ${ftanal[i]} - done + if [ $CDATE -le "2019061118" ]; then #GFSv14 + for i in `seq 1 $nfanal`; do + $NMV ${fanal[i]} ${flanal[i]} + done + fi fi @@ -134,12 +140,17 @@ if [ $ics_from = "opsgfs" ]; then elif [ $ics_from = "pargfs" ]; then + # Add CDUMP.PDY/CYC to target_dir + target_dir=$ICSDIR/$CDATE/$CDUMP/${CDUMP}.$yyyy$mm$dd/$cyc + mkdir -p $target_dir + cd $target_dir + # Filenames in parallel nfanal=4 - fanal[1]="pgbanl.${CDUMP}.$CDATE" - fanal[2]="gfnanl.${CDUMP}.$CDATE" - fanal[3]="sfnanl.${CDUMP}.$CDATE" - fanal[4]="nsnanl.${CDUMP}.$CDATE" + fanal[1]="gfnanl.${CDUMP}.$CDATE" + fanal[2]="sfnanl.${CDUMP}.$CDATE" + fanal[3]="nsnanl.${CDUMP}.$CDATE" + fanal[4]="pgbanl.${CDUMP}.$CDATE" flanal="${fanal[1]} ${fanal[2]} ${fanal[3]} ${fanal[4]}" # Get initial conditions from HPSS from retrospective parallel @@ -160,11 +171,6 @@ elif [ $ics_from = "pargfs" ]; then exit $rc fi - # Move the files to legacy EMC filenames - for i in $(seq 1 $nfanal); do - $NMV ${fanal[i]} ${ftanal[i]} - done - # If found, exit out if [ $rc -ne 0 ]; then echo "Unable to obtain parallel GFS initial conditions, ABORT!" @@ -179,10 +185,12 @@ else fi ############################################################### -# Copy pgbanl file to COMROT for verification -COMROT=$ROTDIR/${CDUMP}.$PDY/$cyc -[[ ! -d $COMROT ]] && mkdir -p $COMROT -$NCP ${ftanal[1]} $COMROT/${CDUMP}.t${cyc}z.pgrbanl +# Copy pgbanl file to COMROT for verification - GFSv14 only +if [ $CDATE -le "2019061118" ]; then #GFSv14 + COMROT=$ROTDIR/${CDUMP}.$PDY/$cyc + [[ ! -d $COMROT ]] && mkdir -p $COMROT + $NCP ${fanal[4]} $COMROT/${CDUMP}.t${cyc}z.pgrbanl +fi ############################################################### # Exit out cleanly diff --git a/jobs/rocoto/prep.sh b/jobs/rocoto/prep.sh index b392e71066..d1cc32ded3 100755 --- a/jobs/rocoto/prep.sh +++ b/jobs/rocoto/prep.sh @@ -57,13 +57,13 @@ fi if [ $PROCESS_TROPCY = "YES" ]; then - export ARCHSYNDNCO=$COMROOTp1/arch/prod/syndat + export COMINsyn=${COMINsyn:-$(compath.py gfs/prod/syndat)} if [ $RUN_ENVIR != "nco" ]; then export ARCHSYND=${ROTDIR}/syndat if [ ! -d ${ARCHSYND} ]; then mkdir -p $ARCHSYND; fi if [ ! -s $ARCHSYND/syndat_akavit ]; then for file in syndat_akavit syndat_dateck syndat_stmcat.scr syndat_stmcat syndat_sthisto syndat_sthista ; do - cp $ARCHSYNDNCO/$file $ARCHSYND/. + cp $COMINsyn/$file $ARCHSYND/. done fi fi diff --git a/modulefiles/module_base.wcoss_c b/modulefiles/module_base.wcoss_c index 8b69912394..d83fd1aac3 100644 --- a/modulefiles/module_base.wcoss_c +++ b/modulefiles/module_base.wcoss_c @@ -33,7 +33,7 @@ module load udreg module load ugni module load hpss -module load prod_util +module load prod_util/1.1.0 module load g2tmpl-intel/1.4.0 module load crtm-intel/2.2.6 module load iobuf/2.0.7 @@ -46,7 +46,7 @@ setenv USE_CFP YES # modules used by vrfy module load pm5 -module load prod_envir +module load prod_envir/1.1.0 module load util_shared/1.0.7 module load gcc/6.3.0 diff --git a/modulefiles/module_base.wcoss_cray b/modulefiles/module_base.wcoss_cray index aade403c72..8d02d4d3f7 100644 --- a/modulefiles/module_base.wcoss_cray +++ b/modulefiles/module_base.wcoss_cray @@ -31,7 +31,7 @@ module load udreg module load ugni module load hpss -module load prod_util +module load prod_util/1.1.0 module load g2tmpl-intel/1.4.0 module load crtm-intel/2.2.6 module load iobuf/2.0.7 diff --git a/modulefiles/module_base.wcoss_dell_p3 b/modulefiles/module_base.wcoss_dell_p3 index 56600f37f3..70427ed372 100644 --- a/modulefiles/module_base.wcoss_dell_p3 +++ b/modulefiles/module_base.wcoss_dell_p3 @@ -11,7 +11,7 @@ module load EnvVars/1.0.2 module load HPSS/5.0.2.5 module load prod_util/1.1.0 -module load prod_envir/1.0.2 +module load prod_envir/1.1.0 module load g2tmpl/1.5.0 module load crtm/2.2.6 module load ESMF/7_1_0r diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn index 666d68923b..d1ad73ca35 100755 --- a/parm/config/config.base.emc.dyn +++ b/parm/config/config.base.emc.dyn @@ -20,7 +20,7 @@ if [ $machine = "THEIA" ]; then elif [ $machine = "WCOSS_C" -o $machine = "WCOSS_DELL_P3" ]; then - export ACCOUNT="FV3GFS-T2O" + export ACCOUNT="GFS-DEV" export QUEUE="dev" export QUEUE_ARCH="dev_transfer" @@ -50,6 +50,7 @@ if [ $machine = "THEIA" ]; then elif [ $machine = "WCOSS_C" ]; then export NWPROD="/gpfs/hps/nco/ops/nwprod" + export COMROOT=${COMROOT:-"/gpfs/hps/nco/ops/com"} export DMPDIR="/gpfs/dell3/emc/global/dump" if [ -d /gpfs/tp1 ]; then export SITE="LUNA" @@ -61,6 +62,7 @@ elif [ $machine = "WCOSS_C" ]; then elif [ $machine = "WCOSS_DELL_P3" ]; then export NWPROD="/gpfs/dell1/nco/ops/nwprod" + export COMROOT=${COMROOT:-"/gpfs/dell1/nco/ops/com"} export DMPDIR="/gpfs/dell3/emc/global/dump" if [ -d /gpfs/tp1 ]; then export SITE="MARS" diff --git a/parm/config/config.base.nco.static b/parm/config/config.base.nco.static index bc3ebf35f1..984d99c962 100644 --- a/parm/config/config.base.nco.static +++ b/parm/config/config.base.nco.static @@ -12,7 +12,7 @@ export machine="WCOSS_DELL_P3" export RUN_ENVIR="nco" # Account, queue, etc. -export ACCOUNT="FV3GFS-T2O" +export ACCOUNT="GFS-T2O" export QUEUE="prod" export QUEUE_ARCH="dev_transfer" diff --git a/parm/config/config.prep b/parm/config/config.prep index ad1c452158..e5479a8ddf 100755 --- a/parm/config/config.prep +++ b/parm/config/config.prep @@ -18,6 +18,11 @@ export DO_RELOCATE="NO" export TROPCYQCRELOSH="$HOMEgfs/scripts/extropcy_qc_reloc.sh.ecf" export SENDCOM=YES +export COMINsyn=${COMINsyn:-$(compath.py gfs/prod/syndat)} +if [ $machine = "HERA" ]; then + export COMINsyn="${COMROOT}/arch/prod/syndat" +fi + export HOMERELO=$HOMEgfs export EXECRELO=${HOMERELO}/exec export FIXRELO=${HOMERELO}/fix/fix_am diff --git a/parm/config/config.vrfy b/parm/config/config.vrfy index 80bb89e75a..8c2e247d61 100755 --- a/parm/config/config.vrfy +++ b/parm/config/config.vrfy @@ -170,10 +170,7 @@ if [ "$VRFYTRAK" = "YES" ]; then export FHOUT_CYCLONE=6 export FHMAX_CYCLONE=$(( FHMAX_GFS<240 ? FHMAX_GFS : 240 )) fi - if [ $machine = "THEIA" ]; then - export COMROOTp1="/scratch4/NCEPDEV/rstprod/com" - export COMINsyn="$COMROOTp1/arch/prod/syndat" - fi + export COMINsyn=${COMINsyn:-$(compath.py gfs/prod/syndat)} fi diff --git a/scripts/run_gfsmos_master.sh.dell b/scripts/run_gfsmos_master.sh.dell index ff0cfcb09a..6742b5c2f9 100755 --- a/scripts/run_gfsmos_master.sh.dell +++ b/scripts/run_gfsmos_master.sh.dell @@ -54,7 +54,7 @@ module load EnvVars/1.0.2 2>/dev/null module load ips/18.0.1.163 2>/dev/null module load impi/18.0.1 2>/dev/null module load lsf/10.1 2>/dev/null -module load prod_envir/1.0.2 2>/dev/null +module load prod_envir/1.1.0 2>/dev/null module load prod_util/1.1.0 2>/dev/null module load CFP/2.0.1 2>/dev/null diff --git a/ush/fv3gfs_chgres.sh b/ush/fv3gfs_chgres.sh index e7733b1bd9..7a577eb141 100755 --- a/ush/fv3gfs_chgres.sh +++ b/ush/fv3gfs_chgres.sh @@ -106,7 +106,7 @@ elif [ $machine = WCOSS_DELL_P3 ]; then # module load ips/18.0.1.163 2>>/dev/null # module load impi/18.0.1 2>>/dev/null # module load prod_util/1.1.0 2>>/dev/null - # module load prod_envir/1.0.2 2>>/dev/null + # module load prod_envir/1.1.0 2>>/dev/null # module load HPSS/5.0.2.5 2>>/dev/null # module load NetCDF/4.5.0 2>>/dev/null # module load HDF5-serial/1.10.1 2>>/dev/null diff --git a/ush/global_chgres_driver.sh b/ush/global_chgres_driver.sh index 473111681b..1907c50e0d 100755 --- a/ush/global_chgres_driver.sh +++ b/ush/global_chgres_driver.sh @@ -73,10 +73,16 @@ cd $DATA || exit 8 export ymd=`echo $CDATE | cut -c 1-8` export cyc=`echo $CDATE | cut -c 9-10` -# Determine if we are current operations with NSST or the one before that +# Determine if input data is: +# (1) FV3GFS - DATA IS NEMSIO. SFC AND NSST FIELDS IN ONE FILE ('fv3gfs') +# (2) GFS NEMSIO FORMAT. SFC AND NSST FIELDS IN SEPARATE FILES ('opsgfs') +# (3) GFS SIGIO/SFCIO FORMAT ('oldgfs') + if [ ${ATMANL:-"NULL"} = "NULL" ]; then if [ -s ${INIDIR}/nsnanl.${CDUMP}.$CDATE -o -s ${INIDIR}/${CDUMP}.t${cyc}z.nstanl.nemsio ]; then ictype='opsgfs' + elif [ -s ${INIDIR}/sfnanl.${CDUMP}.$CDATE -o -s ${INIDIR}/${CDUMP}.t${cyc}z.sfcanl.nemsio ]; then + ictype='fv3gfs' else ictype='oldgfs' fi @@ -119,23 +125,37 @@ if [ $ictype = oldgfs ]; then # input data is old spectral sigio format. LATB_SFC=1536 fi -elif [ $ictype = opsgfs ]; then # input data is nemsio format. +elif [ $ictype = opsgfs ] || [ $ictype = fv3gfs ]; then # input data is nemsio format. if [ ${ATMANL:-"NULL"} = "NULL" ]; then if [ -s ${INIDIR}/gfnanl.${CDUMP}.$CDATE ]; then export ATMANL=$INIDIR/gfnanl.${CDUMP}.$CDATE export SFCANL=$INIDIR/sfnanl.${CDUMP}.$CDATE - export NSTANL=$INIDIR/nsnanl.${CDUMP}.$CDATE + if [ $ictype = opsgfs ] ; then + export NSTANL=$INIDIR/nsnanl.${CDUMP}.$CDATE + else + export NSTANL=NULL + fi else export ATMANL=$INIDIR/${CDUMP}.t${cyc}z.atmanl.nemsio export SFCANL=$INIDIR/${CDUMP}.t${cyc}z.sfcanl.nemsio - export NSTANL=$INIDIR/${CDUMP}.t${cyc}z.nstanl.nemsio + if [ $ictype = opsgfs ] ; then + export NSTANL=$INIDIR/${CDUMP}.t${cyc}z.nstanl.nemsio + else + export NSTANL=NULL + fi fi fi export SOILTYPE_INP=statsgo export VEGTYPE_INP=igbp - export nopdpvv=.true. + + if [ $ictype = opsgfs ]; then + export nopdpvv=.true. + else + export nopdpvv=.false. + export NTRAC=7 + fi LONB_ATM=0 # not used for LATB_ATM=0 # ops files @@ -152,7 +172,7 @@ fi # is input data old or new format? # to use new albedo, soil/veg type export CLIMO_FIELDS_OPT=3 -export LANDICE_OPT=2 +export LANDICE_OPT=${LANDICE_OPT:-2} export IALB=1 export SOILTYPE_OUT=statsgo export VEGTYPE_OUT=igbp @@ -171,7 +191,7 @@ export FNVEGC=${FIXam}/global_vegfrac.0.144.decpercent.grb export FNVMNC=${FIXam}/global_shdmin.0.144x0.144.grb export FNVMXC=${FIXam}/global_shdmax.0.144x0.144.grb export FNSLPC=${FIXam}/global_slope.1x1.grb -export FNMSKH=${FIXam}/seaice_newland.grb +export FNMSKH=${FIXam}/global_slmask.t1534.3072.1536.grb export FNSMCC=$FIXam/global_soilmgldas.statsgo.t${JCAP_CASE}.${LONB_SFC}.${LATB_SFC}.grb export FNSOTC=$FIXam/global_soiltype.statsgo.t${JCAP_CASE}.${LONB_SFC}.${LATB_SFC}.rg.grb export FNVETC=$FIXam/global_vegtype.igbp.t${JCAP_CASE}.${LONB_SFC}.${LATB_SFC}.rg.grb @@ -190,7 +210,7 @@ if [ $REGIONAL -ne 2 ]; then # REGIONAL -ne 2 is for uniform and regio # Convert atmospheric file. #------------------------------------------------ - export CHGRESVARS="use_ufo=.false.,idvc=2,idvt=21,idsl=1,IDVM=0,nopdpvv=$nopdpvv" + export CHGRESVARS="use_ufo=.false.,idvc=2,nvcoord=2,idvt=21,idsl=1,IDVM=0,nopdpvv=$nopdpvv" export SIGINP=$ATMANL export SFCINP=NULL export NSTINP=NULL @@ -214,7 +234,7 @@ if [ $REGIONAL -ne 2 ]; then # REGIONAL -ne 2 is for uniform and regio # Convert surface and nst files one tile at a time. #--------------------------------------------------- - export CHGRESVARS="use_ufo=.true.,idvc=2,idvt=21,idsl=1,IDVM=0,nopdpvv=$nopdpvv" + export CHGRESVARS="use_ufo=.true.,idvc=2,nvcoord=2,idvt=21,idsl=1,IDVM=0,nopdpvv=$nopdpvv" export SIGINP=NULL export SFCINP=$SFCANL export NSTINP=$NSTANL @@ -248,7 +268,11 @@ if [ $REGIONAL -ne 2 ]; then # REGIONAL -ne 2 is for uniform and regio else # REGIONAL = 2, just generate boundary data export CHGRESVARS="use_ufo=.false.,nst_anl=$nst_anl,idvc=2,idvt=21,idsl=1,IDVM=0,nopdpvv=$nopdpvv" - export ATMANL=$INIDIR/${CDUMP}.t${cyc}z.atmf${bchour}.nemsio + if [ $ictype = oldgfs ]; then + export ATMANL=$INIDIR/${CDUMP}.t${cyc}z.sf${bchour} + else + export ATMANL=$INIDIR/${CDUMP}.t${cyc}z.atmf${bchour}.nemsio + fi export SIGINP=$ATMANL export SFCINP=NULL export NSTINP=NULL diff --git a/ush/global_extrkr.sh b/ush/global_extrkr.sh index 62a381561b..12bb61af80 100755 --- a/ush/global_extrkr.sh +++ b/ush/global_extrkr.sh @@ -287,7 +287,7 @@ export homesyndir=${homesyndir:-${HOMERELO}} export homesyndir=${homesyndir:-$NWPROD/util} export exectrkdir=${exectrkdir:-${homesyndir}/exec} export ushtrkdir=${ushtrkdir:-${homesyndir}/ush} -export archsyndir=${archsyndir:-${COMDIR}${COMROOTp1}/arch/prod/syndat} +export archsyndir=${archsyndir:-${COMINsyn:-$(compath.py gfs/prod/syndat)}} ##cp /com/date/t${CYL}z ncepdate ##export CENT=` cut -c7-8 ncepdate `