diff --git a/Externals.cfg b/Externals.cfg index 4f88947d67..bf8392c149 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,28 +1,28 @@ # External sub-modules of global-workflow [FV3GFS] -tag = GFS.v16.0.1 +tag = GFS.v16.0.10 local_path = sorc/fv3gfs.fd repo_url = https://github.com/ufs-community/ufs-weather-model.git protocol = git required = True [GSI] -tag = gfsda.v16.0.0 +branch = release/gfsda.v16.0.0 local_path = sorc/gsi.fd -repo_url = ssh://vlab.ncep.noaa.gov:29418/ProdGSI +repo_url = https://github.com/NOAA-EMC/GSI.git protocol = git required = True [GLDAS] -tag = gldas_gfsv16_release.v1.0.0 +tag = gldas_gfsv16_release.v1.4.0 local_path = sorc/gldas.fd repo_url = https://github.com/NOAA-EMC/GLDAS.git protocol = git required = True [EMC_post] -tag = upp_gfsv16_release.v1.0.5 +tag = upp_gfsv16_release.v1.0.11 local_path = sorc/gfs_post.fd repo_url = https://github.com/NOAA-EMC/EMC_post.git protocol = git @@ -36,7 +36,7 @@ protocol = git required = True [EMC_verif-global] -tag = verif_global_v1.6.0 +tag = verif_global_v1.9.0 local_path = sorc/verif-global.fd repo_url = https://github.com/NOAA-EMC/EMC_verif-global.git protocol = git diff --git a/README.md b/README.md index 3fac2751aa..1d8231e6d1 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,6 @@ The global-workflow depends on the following prerequisities to be available on t * workload management platform / scheduler - LSF or SLURM * workflow manager - ROCOTO (https://github.com/christopherwharrop/rocoto) * modules - NCEPLIBS (various), esmf v8.0.0bs48, hdf5, intel/ips v18, impi v18, wgrib2, netcdf v4.7.0, hpss, gempak (see module files under /modulefiles for additional details) -* manage_externals - A utility from ESMCI to checkout external dependencies. Manage_externals can be obtained at the following address and should be in the users PATH: https://github.com/ESMCI/manage_externals The global-workflow current supports the following machines: @@ -18,20 +17,11 @@ The global-workflow current supports the following machines: ### 1. Check out components -The global-workflow uses the manage_externals utility to handle checking out its components. The manic-v1.1.8 manage_externals tag is supported. The manage_externals utility will be replacing the current checkout.sh script. - -Run manage_externals (checkout_externals) while at top of clone: - +While in /sorc folder: ``` -$ checkout_externals -e Externals.cfg +$ sh checkout.sh ``` -If checkout_externals is not in your $PATH then use full path to it: - -* WCOSS-Dell: /gpfs/dell2/emc/modeling/noscrub/emc.glopara/git/manage_externals/manic-v1.1.8/checkout_externals -* WCOSS-Cray: /gpfs/hps3/emc/global/noscrub/emc.glopara/git/manage_externals/manic-v1.1.8/checkout_externals -* Hera: /scratch1/NCEPDEV/global/glopara/git/manage_externals/manic-v1.1.8/checkout_externals - ### 2. Build components While in /sorc folder: diff --git a/docs/Release_Notes.gfs_downstream.v16.0.0.txt b/docs/Release_Notes.gfs_downstream.v16.0.0.txt index d6e17cfa10..05c15b9eee 100644 --- a/docs/Release_Notes.gfs_downstream.v16.0.0.txt +++ b/docs/Release_Notes.gfs_downstream.v16.0.0.txt @@ -58,7 +58,7 @@ PARM/wmo 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### diff --git a/driver/gdas/test_gdas_gldas.sh b/driver/gdas/test_gdas_gldas.sh index a788fdcb10..ec84dd88f8 100755 --- a/driver/gdas/test_gdas_gldas.sh +++ b/driver/gdas/test_gdas_gldas.sh @@ -54,7 +54,7 @@ module load CFP/2.0.1 module load impi/18.0.1 module load lsf/10.1 module load prod_envir/1.0.2 -module load prod_util/1.1.0 +module load prod_util/1.1.4 module load grib_util/1.1.0 module load NetCDF/4.5.0 ########################################### diff --git a/driver/product/change_gfs_downstream_date.sh b/driver/product/change_gfs_downstream_date.sh index de6d4e65eb..229ccdd845 100755 --- a/driver/product/change_gfs_downstream_date.sh +++ b/driver/product/change_gfs_downstream_date.sh @@ -7,8 +7,8 @@ export dir=` pwd ` export PDY=`date -u +%Y%m%d` export PDY1=`expr $PDY - 1` -export olddate=20191230 -export newdate=20200106 +export olddate=20200106 +export newdate=20200712 export gdas=/gpfs/dell1/nco/ops/com/gfs/prod/gdas.${PDY}/${cyc} export gdasgp=/gpfs/dell1/nco/ops/com/gfs/prod/gdas.${PDY}/${cyc}/gempak @@ -44,10 +44,3 @@ sed -i s/envir=prod/envir=para/g run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_${cyc} sed -i s/envir=prod/envir=para/g run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_${cyc} done - - - - - - - diff --git a/driver/product/change_gfs_downstream_envir.sh b/driver/product/change_gfs_downstream_envir.sh index 1098b29624..6006797b60 100755 --- a/driver/product/change_gfs_downstream_envir.sh +++ b/driver/product/change_gfs_downstream_envir.sh @@ -7,8 +7,8 @@ export dir=` pwd ` export PDY=`date -u +%Y%m%d` export PDY1=`expr $PDY - 1` -export olddate=20191230 -export newdate=20200106 +export olddate=20200106 +export newdate=20200712 export gdas=/gpfs/dell1/nco/ops/com/gfs/prod/gdas.${PDY}/${cyc} export gdasgp=/gpfs/dell1/nco/ops/com/gfs/prod/gdas.${PDY}/${cyc}/gempak @@ -24,19 +24,12 @@ do vi run_JGDAS_GEMPAK_dell.sh_${cyc} vi run_JGDAS_GEMPAK_META_NCDC_dell.sh_${cyc} vi run_JGFS_GEMPAK_dell.sh_${cyc} - vi run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_${cyc} - vi run_JGFS_AWIPS_G2_dell.sh_${cyc} + vi run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_${cyc} + vi run_JGFS_AWIPS_G2_dell.sh_${cyc} vi run_JGFS_FBWIND_dell.sh_${cyc} vi run_JGFS_GEMPAK_META_dell.sh_${cyc} vi run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_${cyc} - vi run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_${cyc} + vi run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_${cyc} vi run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_${cyc} done - - - - - - - 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 bab3015fe9..22a3052977 100755 --- a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_00 +++ b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_00 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -104,21 +104,17 @@ export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak} export COMINgdas=${COMINgdas:-$(compath.py ${NET}/${envir}/${RUN})} else + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime + export COMINgdas=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN} ### EMC PARA Realtime -# export COMIN=/gpfs/dell1/nco/ops/com/gfs/para/${RUN}.${PDY}/${cyc}/gempak ### NCO PARA Realtime -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/${RUN}.${PDY}/${cyc}/gempak ### EMC PARA Realtime -# export COMINgdas=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/${RUN} ### EMC PARA Realtime -# export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak ### Boi PARA -# export COMINgdas=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN} ### Boi PARA - export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gdas.20200106/00/gempak - export COMINgdas=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gdas fi +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)} export COMINecmwf=${COMINecmwf:-$(compath.py ecmwf/prod/ecmwf)} -export COMOUTncdc=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta +export COMOUTncdc=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta export COMOUTukmet=${COMOUT} export COMOUTecmwf=${COMOUT} 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 8c28de638f..3a84fb338b 100755 --- a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_06 +++ b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_06 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -104,19 +104,17 @@ export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak} export COMINgdas=${COMINgdas:-$(compath.py ${NET}/${envir}/${RUN})} else + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime + export COMINgdas=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN} ### EMC PARA Realtime - export COMIN=/gpfs/dell1/nco/ops/com/gfs/para/${RUN}.${PDY}/${cyc}/gempak ### NCO PARA Realtime -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/${RUN}.${PDY}/${cyc}/gempak ### EMC PARA Realtime -# export COMINgdas=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/${RUN} ### EMC PARA Realtime -# export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak ### Boi PARA -# export COMINgdas=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN} ### Boi PARA fi +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)} -export COMINecmwf=${COMINecmwf:-$(compath.py nawips/prod/ecmwf)} +export COMINecmwf=${COMINecmwf:-$(compath.py ecmwf/prod/ecmwf)} -export COMOUTncdc=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta +export COMOUTncdc=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta export COMOUTukmet=${COMOUT} export COMOUTecmwf=${COMOUT} 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 aecf35237f..b19b9749c9 100755 --- a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_12 +++ b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_12 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -105,21 +105,19 @@ export COMINgdas=${COMINgdas:-$(compath.py ${NET}/${envir}/${RUN})} else - export COMIN=/gpfs/dell1/nco/ops/com/gfs/para/${RUN}.${PDY}/${cyc}/gempak ### NCO PARA Realtime -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/${RUN}.${PDY}/${cyc}/gempak ### EMC PARA Realtime -# export COMINgdas=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/${RUN} ### EMC PARA Realtime -# export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak ### Boi PARA -# export COMINgdas=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN} ### Boi PARA +# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime +# export COMINgdas=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN} ### EMC PARA Realtime + export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gdas.20200712/12/atmos/gempak ### Boi PARA Realtime + export COMINgdas=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gdas ### Boi PARA Realtime - export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gdas.20200106/12/gempak - export COMINgdas=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gdas fi +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)} -export COMINecmwf=${COMINecmwf:-$(compath.py nawips/prod/ecmwf)} +export COMINecmwf=${COMINecmwf:-$(compath.py ecmwf/prod/ecmwf)} -export COMOUTncdc=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta +export COMOUTncdc=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta export COMOUTukmet=${COMOUT} export COMOUTecmwf=${COMOUT} 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 0d1cf2ca53..683f68e6fa 100755 --- a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_18 +++ b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_18 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -105,18 +105,17 @@ export COMINgdas=${COMINgdas:-$(compath.py ${NET}/${envir}/${RUN})} else - export COMIN=/gpfs/dell1/nco/ops/com/gfs/para/${RUN}.${PDY}/${cyc}/gempak ### NCO PARA Realtime -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/${RUN}.${PDY}/${cyc}/gempak ### EMC PARA Realtime -# export COMINgdas=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/${RUN} ### EMC PARA Realtime -# export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak ### Boi PARA -# export COMINgdas=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN} ### Boi PARA + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime + export COMINgdas=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN} ### EMC PARA Realtime + fi +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)} -export COMINecmwf=${COMINecmwf:-$(compath.py nawips/prod/ecmwf)} +export COMINecmwf=${COMINecmwf:-$(compath.py ecmwf/prod/ecmwf)} -export COMOUTncdc=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta +export COMOUTncdc=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta export COMOUTukmet=${COMOUT} export COMOUTecmwf=${COMOUT} diff --git a/driver/product/run_JGDAS_GEMPAK_dell.sh_00 b/driver/product/run_JGDAS_GEMPAK_dell.sh_00 index fdb1a64203..c17d3cebbc 100755 --- a/driver/product/run_JGDAS_GEMPAK_dell.sh_00 +++ b/driver/product/run_JGDAS_GEMPAK_dell.sh_00 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -103,14 +103,10 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else -# export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gdas.20200106/${cyc} ### EMC PARA Realtime - export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gdas.20200106/00 - + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak if [ $SENDCOM = YES ] ; then mkdir -m 775 -p $COMOUT diff --git a/driver/product/run_JGDAS_GEMPAK_dell.sh_06 b/driver/product/run_JGDAS_GEMPAK_dell.sh_06 index 273f41c477..847336e6d7 100755 --- a/driver/product/run_JGDAS_GEMPAK_dell.sh_06 +++ b/driver/product/run_JGDAS_GEMPAK_dell.sh_06 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -103,11 +103,11 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime + fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak if [ $SENDCOM = YES ] ; then mkdir -m 775 -p $COMOUT diff --git a/driver/product/run_JGDAS_GEMPAK_dell.sh_12 b/driver/product/run_JGDAS_GEMPAK_dell.sh_12 index 2e5bec2d68..60feb294c1 100755 --- a/driver/product/run_JGDAS_GEMPAK_dell.sh_12 +++ b/driver/product/run_JGDAS_GEMPAK_dell.sh_12 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -103,11 +103,10 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak if [ $SENDCOM = YES ] ; then mkdir -m 775 -p $COMOUT diff --git a/driver/product/run_JGDAS_GEMPAK_dell.sh_18 b/driver/product/run_JGDAS_GEMPAK_dell.sh_18 index 6645359cb2..6079986586 100755 --- a/driver/product/run_JGDAS_GEMPAK_dell.sh_18 +++ b/driver/product/run_JGDAS_GEMPAK_dell.sh_18 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -103,11 +103,11 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime + fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak if [ $SENDCOM = YES ] ; then mkdir -m 775 -p $COMOUT 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 2193fcbc18..57a42fa416 100755 --- a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_00 +++ b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_00 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 module list @@ -97,13 +97,11 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else -# export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime - export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/00 + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then 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 add653ce32..686ab66dbf 100755 --- a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_06 +++ b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_06 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 module list @@ -97,11 +97,11 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime + fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then 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 e3af038af5..74291e29a7 100755 --- a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_12 +++ b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_12 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 module list @@ -97,12 +97,11 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime - export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/12 + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime + fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then 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 a6f9cca4bf..8b5f55a379 100755 --- a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_18 +++ b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_18 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 module list @@ -97,11 +97,11 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime + fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then diff --git a/driver/product/run_JGFS_AWIPS_G2_dell.sh_00 b/driver/product/run_JGFS_AWIPS_G2_dell.sh_00 index 869549cb15..ed5abce218 100755 --- a/driver/product/run_JGFS_AWIPS_G2_dell.sh_00 +++ b/driver/product/run_JGFS_AWIPS_G2_dell.sh_00 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 module list @@ -97,12 +97,11 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else -# export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime - export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/00 + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime + fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then diff --git a/driver/product/run_JGFS_AWIPS_G2_dell.sh_06 b/driver/product/run_JGFS_AWIPS_G2_dell.sh_06 index 49b86c9d0f..8dd50da89f 100755 --- a/driver/product/run_JGFS_AWIPS_G2_dell.sh_06 +++ b/driver/product/run_JGFS_AWIPS_G2_dell.sh_06 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 module list @@ -97,11 +97,11 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime + fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then diff --git a/driver/product/run_JGFS_AWIPS_G2_dell.sh_12 b/driver/product/run_JGFS_AWIPS_G2_dell.sh_12 index 2c501d0ee4..86936c121a 100755 --- a/driver/product/run_JGFS_AWIPS_G2_dell.sh_12 +++ b/driver/product/run_JGFS_AWIPS_G2_dell.sh_12 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200115 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 module list @@ -48,7 +48,7 @@ export fcsthrs=012 ############################################ # set envir=para or para to test with data in prod or para export envir=para - export envir=prod + export envir=para export SENDCOM=YES export KEEPDATA=YES @@ -97,13 +97,11 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/gfs.20200106/12 + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then diff --git a/driver/product/run_JGFS_AWIPS_G2_dell.sh_18 b/driver/product/run_JGFS_AWIPS_G2_dell.sh_18 index f5bc82b761..95cd46d306 100755 --- a/driver/product/run_JGFS_AWIPS_G2_dell.sh_18 +++ b/driver/product/run_JGFS_AWIPS_G2_dell.sh_18 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 module list @@ -97,11 +97,11 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime + fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then diff --git a/driver/product/run_JGFS_FBWIND_dell.sh_00 b/driver/product/run_JGFS_FBWIND_dell.sh_00 index ad10c8eb69..ea1c655ca3 100755 --- a/driver/product/run_JGFS_FBWIND_dell.sh_00 +++ b/driver/product/run_JGFS_FBWIND_dell.sh_00 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 module list @@ -89,13 +89,11 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else -# export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime - export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/00 + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then diff --git a/driver/product/run_JGFS_FBWIND_dell.sh_06 b/driver/product/run_JGFS_FBWIND_dell.sh_06 index 544017a0f4..0697172eac 100755 --- a/driver/product/run_JGFS_FBWIND_dell.sh_06 +++ b/driver/product/run_JGFS_FBWIND_dell.sh_06 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 module list @@ -89,11 +89,11 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime + fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then diff --git a/driver/product/run_JGFS_FBWIND_dell.sh_12 b/driver/product/run_JGFS_FBWIND_dell.sh_12 index 38c58336c6..3c0ef2aea5 100755 --- a/driver/product/run_JGFS_FBWIND_dell.sh_12 +++ b/driver/product/run_JGFS_FBWIND_dell.sh_12 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 module list @@ -89,14 +89,11 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime -export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/12 - + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then diff --git a/driver/product/run_JGFS_FBWIND_dell.sh_18 b/driver/product/run_JGFS_FBWIND_dell.sh_18 index 207a326ce3..9779c94841 100755 --- a/driver/product/run_JGFS_FBWIND_dell.sh_18 +++ b/driver/product/run_JGFS_FBWIND_dell.sh_18 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 module list @@ -89,11 +89,11 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime + fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then diff --git a/driver/product/run_JGFS_GEMPAK_META_dell.sh_00 b/driver/product/run_JGFS_GEMPAK_META_dell.sh_00 index 404f871e18..fbe710e4a8 100755 --- a/driver/product/run_JGFS_GEMPAK_META_dell.sh_00 +++ b/driver/product/run_JGFS_GEMPAK_META_dell.sh_00 @@ -33,7 +33,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -47,7 +47,7 @@ module list ############################################## # set envir=para or para to test with data in prod or para export envir=para - export envir=prod + export envir=para export SENDCOM=YES export KEEPDATA=YES @@ -111,19 +111,16 @@ if [ $envir = "prod" ] ; then export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak} export COMINgempak=${COMINgempak:-${COMROOT}/${NET}/${envir}} else -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/gfs.${PDY}/${cyc}/gempak ### EMC PARA Realtime -# export COMINgempak=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1 ### EMC PARA Realtime + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime + export COMINgempak=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para ### EMC PARA Realtime - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak ### Boi PARA - export COMINgempak=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir} ### Boi PARA fi +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)} export COMINecmwf=${COMINecmwf:-$(compath.py ecmwf/prod/ecmwf)} export COMINnam=${COMINnam:-$(compath.py nam/prod/nam)} -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta - if [ ! -f $COMOUT ] ; then mkdir -p -m 775 $COMOUT fi diff --git a/driver/product/run_JGFS_GEMPAK_META_dell.sh_06 b/driver/product/run_JGFS_GEMPAK_META_dell.sh_06 index 64f1206f21..85b2ca0d70 100755 --- a/driver/product/run_JGFS_GEMPAK_META_dell.sh_06 +++ b/driver/product/run_JGFS_GEMPAK_META_dell.sh_06 @@ -14,7 +14,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -33,7 +33,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -111,19 +111,16 @@ if [ $envir = "prod" ] ; then export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak} export COMINgempak=${COMINgempak:-${COMROOT}/${NET}/${envir}} else -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/gfs.${PDY}/${cyc}/gempak ### EMC PARA Realtime -# export COMINgempak=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1 ### EMC PARA Realtime + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime + export COMINgempak=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para ### EMC PARA Realtime - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak ### Boi PARA - export COMINgempak=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir} ### Boi PARA fi +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)} -export COMINecmwf=${COMINecmwf:-$(compath.py nawips/prod/ecmwf)} +export COMINecmwf=${COMINecmwf:-$(compath.py ecmwf/prod/ecmwf)} export COMINnam=${COMINnam:-$(compath.py nam/prod/nam)} -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta - if [ ! -f $COMOUT ] ; then mkdir -p -m 775 $COMOUT fi diff --git a/driver/product/run_JGFS_GEMPAK_META_dell.sh_12 b/driver/product/run_JGFS_GEMPAK_META_dell.sh_12 index 55c4492f81..194d8e4208 100755 --- a/driver/product/run_JGFS_GEMPAK_META_dell.sh_12 +++ b/driver/product/run_JGFS_GEMPAK_META_dell.sh_12 @@ -14,7 +14,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -33,7 +33,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -111,23 +111,18 @@ if [ $envir = "prod" ] ; then export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak} export COMINgempak=${COMINgempak:-${COMROOT}/${NET}/${envir}} else -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/gfs.${PDY}/${cyc}/gempak ### EMC PARA Realtime -# export COMINgempak=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1 ### EMC PARA Realtime - - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak ### Boi PARA - export COMINgempak=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir} ### Boi PARA - - export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/12/gempak - export COMINgempak=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs +# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime +# export COMINgempak=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para ### EMC PARA Realtime + export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gfs.20200712/12/atmos/gempak + export COMINgempak=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para fi +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)} -export COMINecmwf=${COMINecmwf:-$(compath.py nawips/prod/ecmwf)} +export COMINecmwf=${COMINecmwf:-$(compath.py ecmwf/prod/ecmwf)} export COMINnam=${COMINnam:-$(compath.py nam/prod/nam)} -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta - if [ ! -f $COMOUT ] ; then mkdir -p -m 775 $COMOUT fi diff --git a/driver/product/run_JGFS_GEMPAK_META_dell.sh_18 b/driver/product/run_JGFS_GEMPAK_META_dell.sh_18 index e1f4dc8811..1d2d7f8605 100755 --- a/driver/product/run_JGFS_GEMPAK_META_dell.sh_18 +++ b/driver/product/run_JGFS_GEMPAK_META_dell.sh_18 @@ -14,7 +14,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -33,7 +33,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -111,19 +111,16 @@ if [ $envir = "prod" ] ; then export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak} export COMINgempak=${COMINgempak:-${COMROOT}/${NET}/${envir}} else -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/gfs.${PDY}/${cyc}/gempak ### EMC PARA Realtime -# export COMINgempak=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1 ### EMC PARA Realtime + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime + export COMINgempak=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para ### EMC PARA Realtime - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak ### Boi PARA - export COMINgempak=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir} ### Boi PARA fi +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)} -export COMINecmwf=${COMINecmwf:-$(compath.py nawips/prod/ecmwf)} +export COMINecmwf=${COMINecmwf:-$(compath.py ecmwf/prod/ecmwf)} export COMINnam=${COMINnam:-$(compath.py nam/prod/nam)} -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta - if [ ! -f $COMOUT ] ; then mkdir -p -m 775 $COMOUT fi 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 b5eab92328..4db2ae3e79 100755 --- a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_00 +++ b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_00 @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -105,14 +105,12 @@ if [ $envir = "prod" ] ; then export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak} export COMINgfs=${COMINgfs:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak ### Boi PARA - export COMINgfs=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc} - export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/00/gempak - export COMINgfs=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/00 + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime + export COMINgfs=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then 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 f2dc305452..f2c8a628a5 100755 --- a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_06 +++ b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_06 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -105,11 +105,12 @@ if [ $envir = "prod" ] ; then export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak} export COMINgfs=${COMINgfs:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak ### Boi PARA - export COMINgfs=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc} + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime + export COMINgfs=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime + fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then 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 cefa9420d9..a5dc8ac0d6 100755 --- a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_12 +++ b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_12 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -105,15 +105,14 @@ if [ $envir = "prod" ] ; then export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak} export COMINgfs=${COMINgfs:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak ### Boi PARA - export COMINgfs=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc} - -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/12/gempak - export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/12/nawips - export COMINgfs=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/12 +# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime +# export COMINgfs=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime + + export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gfs.20200712/12/atmos/gempak *** Boi PARA realtime + export COMINgfs=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gfs.20200712/12/atmos *** Boi PARA realtime fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then 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 e0af0d4c18..d43f250f5b 100755 --- a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_18 +++ b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_18 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -105,11 +105,12 @@ if [ $envir = "prod" ] ; then export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak} export COMINgfs=${COMINgfs:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak ### Boi PARA - export COMINgfs=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc} + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime + export COMINgfs=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime + fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then diff --git a/driver/product/run_JGFS_GEMPAK_dell.sh_00 b/driver/product/run_JGFS_GEMPAK_dell.sh_00 index f96a9cc189..34a66c4f0e 100755 --- a/driver/product/run_JGFS_GEMPAK_dell.sh_00 +++ b/driver/product/run_JGFS_GEMPAK_dell.sh_00 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -104,7 +104,7 @@ if [ $envir = "prod" ] ; then else # export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA # export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime - export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/00 + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200712/00 fi export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak diff --git a/driver/product/run_JGFS_GEMPAK_dell.sh_06 b/driver/product/run_JGFS_GEMPAK_dell.sh_06 index d4f66ceb12..e96647b4ae 100755 --- a/driver/product/run_JGFS_GEMPAK_dell.sh_06 +++ b/driver/product/run_JGFS_GEMPAK_dell.sh_06 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -102,11 +102,12 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime +# export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/gfs.${PDY}/${cyc}/atmos ### EMC PARA Realtime + export ILPOST=3 fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak if [ $SENDCOM = YES ] ; then mkdir -m 775 -p $COMOUT diff --git a/driver/product/run_JGFS_GEMPAK_dell.sh_12 b/driver/product/run_JGFS_GEMPAK_dell.sh_12 index 62cb6ba36c..80b510d321 100755 --- a/driver/product/run_JGFS_GEMPAK_dell.sh_12 +++ b/driver/product/run_JGFS_GEMPAK_dell.sh_12 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -102,11 +102,12 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime +# export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/gfs.${PDY}/${cyc}/atmos ### EMC PARA Realtime + export ILPOST=3 fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak if [ $SENDCOM = YES ] ; then mkdir -m 775 -p $COMOUT diff --git a/driver/product/run_JGFS_GEMPAK_dell.sh_18 b/driver/product/run_JGFS_GEMPAK_dell.sh_18 index 4a2accbee2..56b8f12498 100755 --- a/driver/product/run_JGFS_GEMPAK_dell.sh_18 +++ b/driver/product/run_JGFS_GEMPAK_dell.sh_18 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -102,11 +102,12 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime +# export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/gfs.${PDY}/${cyc}/atmos ### EMC PARA Realtime + export ILPOST=3 fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak if [ $SENDCOM = YES ] ; then mkdir -m 775 -p $COMOUT 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 d056faaacf..c4e350541d 100755 --- a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_00 +++ b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_00 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` export cyc=00 @@ -31,7 +31,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -113,16 +113,13 @@ export NET=gfs if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${NET}.${PDY})/${cyc}} - export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/prod/gfs.20200106/00 + export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/prod/gfs.20200712/00 else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/00 - export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gfs.20200106/00 + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${NET}.${PDY}/${cyc}/gempak +export COMOUT=${COMROOT2}/${NET}/${envir}/${NET}.${PDY}/${cyc}/atmos/gempak if [ $SENDCOM = YES ] ; then mkdir -m 775 -p $COMOUT @@ -139,4 +136,4 @@ cd $DATA ############################################# # run the GFS job ############################################# -sh $HOMEgfs/jobs/JGFS_PGRB2_SPEC_GEMPAK1 +sh $HOMEgfs/jobs/JGFS_PGRB2_SPEC_GEMPAK 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 e1964cfb5f..ab9c5878bc 100755 --- a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_06 +++ b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_06 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` export cyc=06 @@ -31,7 +31,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -114,11 +114,11 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${NET}.${PDY})/${cyc}} else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime + fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${NET}.${PDY}/${cyc}/gempak +export COMOUT=${COMROOT2}/${NET}/${envir}/${NET}.${PDY}/${cyc}/atmos/gempak if [ $SENDCOM = YES ] ; then mkdir -m 775 -p $COMOUT 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 0a8dcd63b0..7d6ee6e7c6 100755 --- a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_12 +++ b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_12 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` export cyc=12 @@ -31,7 +31,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -113,14 +113,14 @@ export NET=gfs if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${NET}.${PDY})/${cyc}} - export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/prod/gfs.20200106/12 + export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/prod/gfs.20200712/12 else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime - export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gfs.20200106/12 +# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime + export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gfs.20200712/12/atmos %%%% Boi PARA Realtime + fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${NET}.${PDY}/${cyc}/gempak +export COMOUT=${COMROOT2}/${NET}/${envir}/${NET}.${PDY}/${cyc}/atmos/gempak if [ $SENDCOM = YES ] ; then mkdir -m 775 -p $COMOUT 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 cdd97e7ce4..9948436f4a 100755 --- a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_18 +++ b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_18 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` export cyc=18 @@ -31,7 +31,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 ########################################### @@ -114,11 +114,11 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${NET}.${PDY})/${cyc}} else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime + fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${NET}.${PDY}/${cyc}/gempak +export COMOUT=${COMROOT2}/${NET}/${envir}/${NET}.${PDY}/${cyc}/atmos/gempak if [ $SENDCOM = YES ] ; then mkdir -m 775 -p $COMOUT 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 cffa770ec6..5721194ca2 100755 --- a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_00 +++ b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_00 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 module list @@ -99,13 +99,11 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else -# export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime - export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/00 + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then 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 1aa31be6b7..c6b5b6f846 100755 --- a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_06 +++ b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_06 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 module list @@ -99,11 +99,11 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime + fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then 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 8ecf46a7dc..e01df1722c 100755 --- a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_12 +++ b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_12 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 module list @@ -98,14 +98,13 @@ export model=${model:-gfs} if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/gfs.20200106/12 + export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/gfs.20200712/12 else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime - export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/12 + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime + fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then 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 01c4620586..79f8c6c6d3 100755 --- a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_18 +++ b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_18 @@ -13,7 +13,7 @@ export KMP_AFFINITY=disabled export PDY=`date -u +%Y%m%d` -export PDY=20200106 +export PDY=20200712 export PDY1=`expr $PDY - 1` @@ -32,7 +32,7 @@ module load ips/18.0.1.163 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_util/1.1.4 module load prod_envir/1.0.3 module load grib_util/1.1.0 module list @@ -99,11 +99,11 @@ if [ $envir = "prod" ] ; then # This setting is for testing with GFS (production) export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} ### NCO PROD else - export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc} ### Boi PARA -# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime + export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime + fi -export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc} +export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then diff --git a/driver/product/run_gfs_downstream_00Z b/driver/product/run_gfs_downstream_00Z deleted file mode 100755 index ad3f0cd2bb..0000000000 --- a/driver/product/run_gfs_downstream_00Z +++ /dev/null @@ -1,11 +0,0 @@ -set -x -bsub < run_JGDAS_GEMPAK_dell.sh_00 -bsub < run_JGDAS_GEMPAK_META_NCDC_dell.sh_00 -bsub < run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_00 -bsub < run_JGFS_AWIPS_G2_dell.sh_00 -bsub < run_JGFS_FBWIND_dell.sh_00 -bsub < run_JGFS_GEMPAK_META_dell.sh_00 -bsub < run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_00 -bsub < run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_00 -bsub < run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_00 -bsub < run_JGFS_GEMPAK_dell.sh_00 diff --git a/driver/product/run_gfs_downstream_06Z b/driver/product/run_gfs_downstream_06Z deleted file mode 100755 index 85c13a97c8..0000000000 --- a/driver/product/run_gfs_downstream_06Z +++ /dev/null @@ -1,12 +0,0 @@ - -set -x -bsub < run_JGDAS_GEMPAK_META_NCDC_dell.sh_06 -bsub < run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_06 -bsub < run_JGFS_AWIPS_G2_dell.sh_06 -bsub < run_JGFS_FBWIND_dell.sh_06 -bsub < run_JGFS_GEMPAK_META_dell.sh_06 -bsub < run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_06 -bsub < run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_06 -bsub < run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_06 -bsub < run_JGDAS_GEMPAK_dell.sh_06 -bsub < run_JGFS_GEMPAK_dell.sh_06 diff --git a/driver/product/run_gfs_downstream_12Z b/driver/product/run_gfs_downstream_12Z deleted file mode 100755 index e0e62cbb93..0000000000 --- a/driver/product/run_gfs_downstream_12Z +++ /dev/null @@ -1,11 +0,0 @@ -set -x -bsub < run_JGDAS_GEMPAK_dell.sh_12 -bsub < run_JGDAS_GEMPAK_META_NCDC_dell.sh_12 -bsub < run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_12 -bsub < run_JGFS_AWIPS_G2_dell.sh_12 -bsub < run_JGFS_FBWIND_dell.sh_12 -bsub < run_JGFS_GEMPAK_META_dell.sh_12 -bsub < run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_12 -bsub < run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_12 -bsub < run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_12 -bsub < run_JGFS_GEMPAK_dell.sh_12 diff --git a/driver/product/run_gfs_downstream_18Z b/driver/product/run_gfs_downstream_18Z deleted file mode 100755 index 51ac565988..0000000000 --- a/driver/product/run_gfs_downstream_18Z +++ /dev/null @@ -1,11 +0,0 @@ -set -x -bsub < run_JGDAS_GEMPAK_dell.sh_18 -bsub < run_JGDAS_GEMPAK_META_NCDC_dell.sh_18 -bsub < run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_18 -bsub < run_JGFS_AWIPS_G2_dell.sh_18 -bsub < run_JGFS_FBWIND_dell.sh_18 -bsub < run_JGFS_GEMPAK_META_dell.sh_18 -bsub < run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_18 -bsub < run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_18 -bsub < run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_18 -bsub < run_GFS_GEMPAK_dell.sh_18 diff --git a/driver/product/run_postsnd.sh b/driver/product/run_postsnd.sh index 13efd0b877..42b01cbb52 100755 --- a/driver/product/run_postsnd.sh +++ b/driver/product/run_postsnd.sh @@ -20,7 +20,7 @@ module load EnvVars/1.0.2 module load ips/18.0.1.163 module load impi/18.0.1 module load lsf/10.1 -module load prod_util/1.1.0 +module load prod_util/1.1.4 module load grib_util/1.0.6 module load prod_envir/1.0.2 module load CFP/2.0.1 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..4c9f193cde 100644 --- a/ecflow/ecf/scripts/gfs_FV3/forecast/jgfs_forecast_high.usr +++ b/ecflow/ecf/scripts/gfs_FV3/forecast/jgfs_forecast_high.usr @@ -18,7 +18,7 @@ RUN = gfs SENDDBN:YES = YES SENDDBN_NTC:YES = YES prod_envir_ver = 1.0.3 -prod_util_ver = 1.1.0 +prod_util_ver = 1.1.4 %end - ecf user variables #! /bin/sh #BSUB -q prod @@ -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.0.3 prod_util/1.1.4 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/env/HERA.env b/env/HERA.env index dce975a383..6031433fd9 100755 --- a/env/HERA.env +++ b/env/HERA.env @@ -42,6 +42,8 @@ elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" ]; then export mpmd="--multi-prog" export CFP_MP="YES" + if [ $step = "waveprep" ]; then export MP_PULSE=0 ; fi + elif [ $step = "anal" ]; then @@ -53,7 +55,6 @@ elif [ $step = "anal" ]; then export NTHREADS_GSI=${nth_anal:-$nth_max} [[ $NTHREADS_GSI -gt $nth_max ]] && export NTHREADS_GSI=$nth_max export APRUN_GSI="$launcher" - export CFP_MP="YES" export NTHREADS_CALCINC=${nth_calcinc:-1} [[ $NTHREADS_CALCINC -gt $nth_max ]] && export NTHREADS_CALCINC=$nth_max @@ -67,11 +68,15 @@ elif [ $step = "anal" ]; then export NTHREADS_GAUSFCANL=1 npe_gausfcanl=${npe_gausfcanl:-1} - export APRUN_GAUSFCANL="$launcher -n $npe_gausfcanl" + export NTHREADS_CHGRES=${nth_echgres:-1} + [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max + export APRUN_CHGRES="" + + export CFP_MP=${CFP_MP:-"YES"} export USE_CFP=${USE_CFP:-"YES"} - export APRUNCFP="$launcher" + export APRUNCFP="$launcher -n \$ncmd --multi-prog" elif [ $step = "gldas" ]; then @@ -102,6 +107,10 @@ elif [ $step = "eobs" ]; then [[ $NTHREADS_GSI -gt $nth_max ]] && export NTHREADS_GSI=$nth_max export APRUN_GSI="$launcher" + export CFP_MP=${CFP_MP:-"YES"} + export USE_CFP=${USE_CFP:-"YES"} + export APRUNCFP="$launcher -n \$ncmd --multi-prog" + elif [ $step = "eupd" ]; then nth_max=$(($npe_node_max / $npe_node_eupd)) @@ -110,6 +119,10 @@ elif [ $step = "eupd" ]; then [[ $NTHREADS_ENKF -gt $nth_max ]] && export NTHREADS_ENKF=$nth_max export APRUN_ENKF="$launcher" + export CFP_MP=${CFP_MP:-"YES"} + export USE_CFP=${USE_CFP:-"YES"} + export APRUNCFP="$launcher -n \$ncmd --multi-prog" + elif [ $step = "fcst" ]; then nth_max=$(($npe_node_max / $npe_node_fcst)) diff --git a/env/JET.env b/env/JET.env index c9ab6c3c7f..2dea123612 100755 --- a/env/JET.env +++ b/env/JET.env @@ -37,6 +37,10 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then export BACK=${BACK:-"YES"} export sys_tp="Cray-CS400" +elif [ $step = "waveprep" ]; then + + export MP_PULSE=0 + elif [ $step = "anal" ]; then nth_max=$(($npe_node_max / $npe_node_anal)) @@ -58,6 +62,10 @@ elif [ $step = "anal" ]; then npe_gausfcanl=${npe_gausfcanl:-1} export APRUN_GAUSFCANL="$launcher $npe_gausfcanl" + export NTHREADS_CHGRES=${nth_echgres:-1} + [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max + export APRUN_CHGRES="" + elif [ $step = "gldas" ]; then nth_max=$(($npe_node_max / $npe_node_gldas)) diff --git a/env/WCOSS_C.env b/env/WCOSS_C.env index b6a40b977d..93bd98ab60 100755 --- a/env/WCOSS_C.env +++ b/env/WCOSS_C.env @@ -37,6 +37,10 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then export POE=${POE:-"YES"} export sys_tp="Cray-XC40" +elif [ $step = "waveprep" ]; then + + export MP_PULSE=0 + elif [ $step = "anal" ]; then nth_max=$(($npe_node_max / $npe_node_anal)) @@ -66,6 +70,10 @@ elif [ $step = "anal" ]; then [[ $npe_node_gausfcanl -gt $npe_gausfcanl ]] && npe_node_gausfcanl=$npe_gausfcanl export APRUN_GAUSFCANL="$launcher -j 1 -n $npe_gausfcanl -N $npe_node_gausfcanl -d $NTHREADS_GAUSFCANL -cc depth" + export NTHREADS_CHGRES=${nth_echgres:-1} + [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max + export APRUN_CHGRES="$launcher -j 1 -n 1 -N 1 -d $NTHREADS_CHGRES -cc depth" + elif [ $step = "gldas" ]; then nth_max=$(($npe_node_max / $npe_node_gldas)) diff --git a/env/WCOSS_DELL_P3.env b/env/WCOSS_DELL_P3.env index 484b5ce73c..ef891347d6 100755 --- a/env/WCOSS_DELL_P3.env +++ b/env/WCOSS_DELL_P3.env @@ -45,6 +45,10 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then export BACK=${BACK:-"YES"} export sys_tp="Dell-p3" +elif [ $step = "waveprep" ]; then + + export MP_PULSE=0 + elif [ $step = "anal" ]; then nth_max=$(($npe_node_max / $npe_node_anal)) @@ -66,9 +70,13 @@ elif [ $step = "anal" ]; then npe_gausfcanl=${npe_gausfcanl:-1} export APRUN_GAUSFCANL="$launcher $npe_gausfcanl" - if [ ${USE_CFP:-"NO"} = "YES" ]; then - export APRUNCFP="$launcher \$ncmd $mpmd" - fi + export NTHREADS_CHGRES=${nth_echgres:-14} + [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max + export APRUN_CHGRES="" + + export CFP_MP=${CFP_MP:-"NO"} + export USE_CFP=${USE_CFP:-"YES"} + export APRUNCFP="$launcher \$ncmd $mpmd" elif [ $step = "gldas" ]; then @@ -92,9 +100,9 @@ elif [ $step = "eobs" ]; then [[ $NTHREADS_GSI -gt $nth_max ]] && export NTHREADS_GSI=$nth_max export APRUN_GSI="$launcher ${npe_gsi:-${npe_eobs:-$PBS_NP}}" - if [ ${USE_CFP:-"NO"} = "YES" ]; then - export APRUNCFP="$launcher \$ncmd $mpmd" - fi + export CFP_MP=${CFP_MP:-"NO"} + export USE_CFP=${USE_CFP:-"YES"} + export APRUNCFP="$launcher \$ncmd $mpmd" elif [ $step = "eupd" ]; then @@ -104,9 +112,9 @@ elif [ $step = "eupd" ]; then [[ $NTHREADS_ENKF -gt $nth_max ]] && export NTHREADS_ENKF=$nth_max export APRUN_ENKF="$launcher ${npe_enkf:-${npe_eupd:-$PBS_NP}}" - if [ ${USE_CFP:-"NO"} = "YES" ]; then - export APRUNCFP="$launcher \$ncmd $mpmd" - fi + export CFP_MP=${CFP_MP:-"NO"} + export USE_CFP=${USE_CFP:-"YES"} + export APRUNCFP="$launcher \$ncmd $mpmd" elif [ $step = "fcst" ]; then diff --git a/gempak/ush/gdas_meta_loop.sh b/gempak/ush/gdas_meta_loop.sh index 4d3d9fe128..90c30af771 100755 --- a/gempak/ush/gdas_meta_loop.sh +++ b/gempak/ush/gdas_meta_loop.sh @@ -27,6 +27,7 @@ else export m_title="GDAS" fi +export COMPONENT=${COMPONENT:-atmos} export pgm=gdplot2_nc;. prep_step; startmsg # @@ -73,8 +74,8 @@ for day in $verdays do # Test with GDAS in PROD # grid="${COMROOT}/nawips/${envir}/gdas.${day}/gdas_${day}${cycle}f000" - export COMIN=${COMINgdas}.${day}/${cycle}/gempak - grid="${COMINgdas}.${day}/${cycle}/gempak/gdas_${day}${cycle}f000" + export COMIN=${COMINgdas}.${day}/${cycle}/${COMPONENT}/gempak + grid="${COMINgdas}.${day}/${cycle}/${COMPONENT}/gempak/gdas_${day}${cycle}f000" $GEMEXE/gdplot2_nc << EOF \$MAPFIL = mepowo.gsf @@ -177,8 +178,8 @@ for day in $verdays do # Test with GDAS in PROD # grid="${COMROOT}/nawips/${envir}/gdas.${day}/gdas_${day}${cycle}f000" - export COMIN=${COMINgdas}.${day}/${cycle}/gempak - grid="${COMINgdas}.${day}/${cycle}/gempak/gdas_${day}${cycle}f000" + export COMIN=${COMINgdas}.${day}/${cycle}/${COMPONENT}/gempak + grid="${COMINgdas}.${day}/${cycle}/${COMPONENT}/gempak/gdas_${day}${cycle}f000" $GEMEXE/gdplot2_nc << EOF \$MAPFIL = mepowo.gsf diff --git a/gempak/ush/gfs_meta_comp.sh b/gempak/ush/gfs_meta_comp.sh index 9d53f1a2ee..ff7f31378e 100755 --- a/gempak/ush/gfs_meta_comp.sh +++ b/gempak/ush/gfs_meta_comp.sh @@ -31,6 +31,8 @@ mkdir -p -m 775 $DATA/COMP $DATA/GEMPAK_META_COMP cd $DATA/COMP cp $FIXgempak/datatype.tbl datatype.tbl +export COMPONENT=${COMPONENT:-atmos} + mdl=gfs MDL=GFS metatype="comp" @@ -41,11 +43,11 @@ PDY2=`echo $PDY | cut -c3-` #XXW export MODEL=$COMROOT/nawips/prod # BV export MODEL=$COMROOT/nawips/${envir} # BV export HPCGFS=${MODEL}/${mdl}.$PDY -export HPCGFS=${COMINgempak}/${mdl}.${PDY}/${cyc}/gempak -export COMIN00=${COMINgempak}/${mdl}.${PDY}/00/gempak -export COMIN06=${COMINgempak}/${mdl}.${PDY}/06/gempak -export COMIN12=${COMINgempak}/${mdl}.${PDY}/12/gempak -export COMIN18=${COMINgempak}/${mdl}.${PDY}/18/gempak +export HPCGFS=${COMINgempak}/${mdl}.${PDY}/${cyc}/${COMPONENT}/gempak +export COMIN00=${COMINgempak}/${mdl}.${PDY}/00/${COMPONENT}/gempak +export COMIN06=${COMINgempak}/${mdl}.${PDY}/06/${COMPONENT}/gempak +export COMIN12=${COMINgempak}/${mdl}.${PDY}/12/${COMPONENT}/gempak +export COMIN18=${COMINgempak}/${mdl}.${PDY}/18/${COMPONENT}/gempak if [ ${cyc} -eq 00 ] ; then cp $COMIN00/gfs_${PDY}00f* $DATA/GEMPAK_META_COMP elif [ ${cyc} -eq 06 ] ; then @@ -116,7 +118,7 @@ if [ ${cyc} -eq 12 ] ; then desc="Y" #XXW export HPCGFS=${MODEL}/gfs.${PDYm1} # BV export HPCGFS=$COMROOT/nawips/${envir}/gfs.${PDYm1} - export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak grid2="F-GFSHPC | ${PDY2m1}/1200" add="24" @@ -126,7 +128,7 @@ if [ ${cyc} -eq 12 ] ; then desc="Y2" #XXW export HPCGFS=${MODEL}/gfs.${PDYm2} # BV export HPCGFS=$COMROOT/nawips/${esnvir}/gfs.${PDYm2} - export HPCGFS=${COMINgempak}/${mdl}.${PDYm2}/${cyc2}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${PDYm2}/${cyc2}/${COMPONENT}/gempak grid2="F-GFSHPC | ${PDY2m2}/1200" add="48" @@ -478,7 +480,7 @@ if [ ${cyc} -eq 00 ] ; then cyc2="18" desc="Y" # BV export HPCGFS=${MODEL}/gfs.${PDYm1} - export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak grid2="F-GFSHPC | ${PDY2m1}/1800" add="06" @@ -486,7 +488,7 @@ if [ ${cyc} -eq 00 ] ; then elif [ ${runtime} = "12" ] ; then cyc2="12" desc="Y" - export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak grid2="F-GFSHPC | ${PDY2m1}/1200" add="12" @@ -494,7 +496,7 @@ if [ ${cyc} -eq 00 ] ; then elif [ ${runtime} = "00y" ] ; then cyc2="00" desc="Y" - export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak grid2="F-GFSHPC | ${PDY2m1}/0000" add="24" @@ -502,7 +504,7 @@ if [ ${cyc} -eq 00 ] ; then elif [ ${runtime} = "002d" ] ; then cyc2="00" desc="Y2" - export HPCGFS=${COMINgempak}/${mdl}.${PDYm2}/${cyc2}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${PDYm2}/${cyc2}/${COMPONENT}/gempak grid2="F-GFSHPC | ${PDY2m2}/0000" add="48" @@ -873,7 +875,7 @@ if [ ${cyc} -eq 18 ] ; then elif [ ${runtime} = "18y" ] ; then cyc2="18" desc="Y" - export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak grid2="F-GFSHPC | ${PDY2m1}/1800" add="24" @@ -987,7 +989,7 @@ if [ ${cyc} -eq 06 ] ; then elif [ ${runtime} -eq 18 ] ; then cyc2="18" desc="Y" - export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak grid2="F-GFSHPC | ${PDY2m1}/1800" add="12" @@ -995,7 +997,7 @@ if [ ${cyc} -eq 06 ] ; then elif [ ${runtime} -eq 12 ] ; then cyc2="12" desc="Y" - export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak grid2="F-GFSHPC | ${PDY2m1}/1200" add="18" @@ -1003,7 +1005,7 @@ if [ ${cyc} -eq 06 ] ; then elif [ ${runtime} -eq 06 ] ; then cyc2="06" desc="Y" - export HPCGFS=${COMINgempak}/${NET}/${envir}/${mdl}.${PDYm1}/${cyc2}/gempak + export HPCGFS=${COMINgempak}/${NET}/${envir}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak grid2="F-GFSHPC | ${PDY2m1}/0600" add="24" diff --git a/gempak/ush/gfs_meta_mar_comp.sh b/gempak/ush/gfs_meta_mar_comp.sh index e6ca1b6738..c475542131 100755 --- a/gempak/ush/gfs_meta_mar_comp.sh +++ b/gempak/ush/gfs_meta_mar_comp.sh @@ -20,6 +20,8 @@ mkdir -p -m 775 $DATA/GEMPAK_META_MAR $DATA/MAR_COMP cd $DATA/MAR_COMP cp $FIXgempak/datatype.tbl datatype.tbl +export COMPONENT=${COMPONENT:-atmos} + mdl=gfs MDL="GFS" metatype="mar_comp" @@ -30,11 +32,11 @@ PDY2=`echo $PDY | cut -c3-` # BV export MODEL=/com/nawips/prod #XXW export HPCGFS=${MODEL}/${mdl}.$PDY # BV export HPCGFS=${COMROOT}/nawips/${envir}/${mdl}.$PDY -export HPCGFS=${COMINgempak}/${mdl}.${PDY}/${cyc}/gempak -export COMIN00=${COMINgempak}/${mdl}.${PDY}/00/gempak -export COMIN06=${COMINgempak}/${mdl}.${PDY}/06/gempak -export COMIN12=${COMINgempak}/${mdl}.${PDY}/12/gempak -export COMIN18=${COMINgempak}/${mdl}.${PDY}/18/gempak +export HPCGFS=${COMINgempak}/${mdl}.${PDY}/${cyc}/${COMPONENT}/gempak +export COMIN00=${COMINgempak}/${mdl}.${PDY}/00/${COMPONENT}/gempak +export COMIN06=${COMINgempak}/${mdl}.${PDY}/06/${COMPONENT}/gempak +export COMIN12=${COMINgempak}/${mdl}.${PDY}/12/${COMPONENT}/gempak +export COMIN18=${COMINgempak}/${mdl}.${PDY}/18/${COMPONENT}/gempak if [ ${cyc} -eq 00 ] ; then cp $COMIN00/gfs_${PDY}00f* $DATA/GEMPAK_META_MAR elif [ ${cyc} -eq 06 ] ; then @@ -436,7 +438,7 @@ if [ ${cyc} = "00" ] ; then cyc2="18" #XXW export HPCGFS=${MODEL}/${mdl}.${PDYm1} # BV export HPCGFS=$COMROOT/nawips/${envir}/${mdl}.${PDYm1} - export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak grid2="F-GFSHPC | ${PDY2m1}/1800" add="06" @@ -444,7 +446,7 @@ if [ ${cyc} = "00" ] ; then elif [ ${runtime} = "12" ] ; then cyc2="12" #XXW export HPCGFS=${MODEL}/${mdl}.${PDYm1} - export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak grid2="F-GFSHPC | ${PDY2m1}/1200" add="12" @@ -905,7 +907,7 @@ if [ ${cyc} -eq "06" ] ; then elif [ ${runtime} = "18" ] ; then cyc2="18" #XXW export HPCGFS=${MODEL}/${mdl}.${PDYm1} - export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak grid2="F-GFSHPC | ${PDY2m1}/1800" add="12" testgfsfhr="72" diff --git a/gempak/ush/gfs_meta_opc_na_ver b/gempak/ush/gfs_meta_opc_na_ver index 57da78ce10..ef1ae56d60 100755 --- a/gempak/ush/gfs_meta_opc_na_ver +++ b/gempak/ush/gfs_meta_opc_na_ver @@ -14,6 +14,8 @@ mkdir -p -m 775 $DATA/OPC_NA_VER_F${fend} cd $DATA/OPC_NA_VER_F${fend} cp $FIXgempak/datatype.tbl datatype.tbl +export COMPONENT=${COMPONENT:-atmos} + mdl=gfs MDL="GFS" metatype="ver" @@ -147,91 +149,91 @@ for verday in ${verdays} cominday=`echo ${verday} | cut -c -8` #XXW export HPCGFS=$COMROOT/nawips/prod/${mdl}.${cominday} # BV export HPCGFS=$COMROOT/nawips/${envir}/${mdl}.${cominday} - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cyc}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cyc}/${COMPONENT}/gempak if [ ${verday} -eq ${dc1} ] ; then dgdattim=f006 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle1}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle1}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate1}/${cycle1}00" elif [ ${verday} -eq ${dc2} ] ; then dgdattim=f012 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle2}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle2}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate2}/${cycle2}00" elif [ ${verday} -eq ${dc3} ] ; then dgdattim=f018 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle3}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle3}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate3}/${cycle3}00" elif [ ${verday} -eq ${dc4} ] ; then dgdattim=f024 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle4}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle4}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate4}/${cycle4}00" elif [ ${verday} -eq ${dc5} ] ; then dgdattim=f030 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle5}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle5}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate5}/${cycle5}00" elif [ ${verday} -eq ${dc6} ] ; then dgdattim=f036 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle6}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle6}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate6}/${cycle6}00" elif [ ${verday} -eq ${dc7} ] ; then dgdattim=f042 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle7}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle7}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate7}/${cycle7}00" elif [ ${verday} -eq ${dc8} ] ; then dgdattim=f048 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle8}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle8}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate8}/${cycle8}00" elif [ ${verday} -eq ${dc9} ] ; then dgdattim=f054 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle9}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle9}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate9}/${cycle9}00" elif [ ${verday} -eq ${dc10} ] ; then dgdattim=f060 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle10}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle10}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate10}/${cycle10}00" elif [ ${verday} -eq ${dc11} ] ; then dgdattim=f066 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle11}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle11}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate11}/${cycle11}00" elif [ ${verday} -eq ${dc12} ] ; then dgdattim=f072 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle12}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle12}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate12}/${cycle12}00" elif [ ${verday} -eq ${dc13} ] ; then dgdattim=f078 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle13}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle13}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate13}/${cycle13}00" elif [ ${verday} -eq ${dc14} ] ; then dgdattim=f084 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle14}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle14}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate14}/${cycle14}00" elif [ ${verday} -eq ${dc15} ] ; then dgdattim=f090 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle15}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle15}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate15}/${cycle15}00" elif [ ${verday} -eq ${dc16} ] ; then dgdattim=f096 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle16}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle16}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate16}/${cycle16}00" elif [ ${verday} -eq ${dc17} ] ; then dgdattim=f102 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle17}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle17}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate17}/${cycle17}00" elif [ ${verday} -eq ${dc18} ] ; then dgdattim=f108 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle18}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle18}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate18}/${cycle18}00" elif [ ${verday} -eq ${dc19} ] ; then dgdattim=f114 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle19}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle19}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate19}/${cycle19}00" elif [ ${verday} -eq ${dc20} ] ; then dgdattim=f120 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle20}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle20}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate20}/${cycle20}00" elif [ ${verday} -eq ${dc21} ] ; then dgdattim=f126 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle21}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle21}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate21}/${cycle21}00" fi diff --git a/gempak/ush/gfs_meta_opc_np_ver b/gempak/ush/gfs_meta_opc_np_ver index abb0179707..dfb320ea82 100755 --- a/gempak/ush/gfs_meta_opc_np_ver +++ b/gempak/ush/gfs_meta_opc_np_ver @@ -14,6 +14,8 @@ mkdir -p -m 775 $DATA/OPC_NP_VER_F${fend} cd $DATA/OPC_NP_VER_F${fend} cp $FIXgempak/datatype.tbl datatype.tbl # +export COMPONENT=${COMPONENT:-atmos} + mdl=gfs MDL="GFS" metatype="ver" @@ -148,91 +150,91 @@ for verday in ${verdays} cominday=`echo ${verday} | cut -c -8` #XXW export HPCGFS=$COMROOT/nawips/prod/${mdl}.${cominday} # BV export HPCGFS=$COMROOT/nawips/${envir}/${mdl}.${cominday} - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cyc}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cyc}/${COMPONENT}/gempak if [ ${verday} -eq ${dc1} ] ; then dgdattim=f006 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle1}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle1}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate1}/${cycle1}00" elif [ ${verday} -eq ${dc2} ] ; then dgdattim=f012 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle2}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle2}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate2}/${cycle2}00" elif [ ${verday} -eq ${dc3} ] ; then dgdattim=f018 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle3}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle3}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate3}/${cycle3}00" elif [ ${verday} -eq ${dc4} ] ; then dgdattim=f024 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle4}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle4}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate4}/${cycle4}00" elif [ ${verday} -eq ${dc5} ] ; then dgdattim=f030 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle5}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle5}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate5}/${cycle5}00" elif [ ${verday} -eq ${dc6} ] ; then dgdattim=f036 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle6}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle6}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate6}/${cycle6}00" elif [ ${verday} -eq ${dc7} ] ; then dgdattim=f042 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle7}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle7}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate7}/${cycle7}00" elif [ ${verday} -eq ${dc8} ] ; then dgdattim=f048 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle8}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle8}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate8}/${cycle8}00" elif [ ${verday} -eq ${dc9} ] ; then dgdattim=f054 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle9}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle9}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate9}/${cycle9}00" elif [ ${verday} -eq ${dc10} ] ; then dgdattim=f060 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle10}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle10}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate10}/${cycle10}00" elif [ ${verday} -eq ${dc11} ] ; then dgdattim=f066 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle11}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle11}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate11}/${cycle11}00" elif [ ${verday} -eq ${dc12} ] ; then dgdattim=f072 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle12}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle12}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate12}/${cycle12}00" elif [ ${verday} -eq ${dc13} ] ; then dgdattim=f078 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle13}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle13}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate13}/${cycle13}00" elif [ ${verday} -eq ${dc14} ] ; then dgdattim=f084 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle14}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle14}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate14}/${cycle14}00" elif [ ${verday} -eq ${dc15} ] ; then dgdattim=f090 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle15}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle15}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate15}/${cycle15}00" elif [ ${verday} -eq ${dc16} ] ; then dgdattim=f096 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle16}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle16}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate16}/${cycle16}00" elif [ ${verday} -eq ${dc17} ] ; then dgdattim=f102 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle17}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle17}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate17}/${cycle17}00" elif [ ${verday} -eq ${dc18} ] ; then dgdattim=f108 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle18}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle18}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate18}/${cycle18}00" elif [ ${verday} -eq ${dc19} ] ; then dgdattim=f114 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle19}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle19}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate19}/${cycle19}00" elif [ ${verday} -eq ${dc20} ] ; then dgdattim=f120 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle20}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle20}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate20}/${cycle20}00" elif [ ${verday} -eq ${dc21} ] ; then dgdattim=f126 - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle21}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle21}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate21}/${cycle21}00" fi diff --git a/gempak/ush/gfs_meta_sa2.sh b/gempak/ush/gfs_meta_sa2.sh index b71b158a7b..eab320e4cd 100755 --- a/gempak/ush/gfs_meta_sa2.sh +++ b/gempak/ush/gfs_meta_sa2.sh @@ -21,6 +21,8 @@ echo " start with ukmet_gfs_meta_sa2.sh" export PS4='SA2:$SECONDS + ' cp $FIXgempak/datatype.tbl datatype.tbl +export COMPONENT=${COMPONENT:-atmos} + mdl=gfs MDL=GFS @@ -44,7 +46,7 @@ fi PDY2=`echo ${PDY} | cut -c3-` # export HPCGFS=$COMROOT/nawips/${envir}/gfs.${PDY} -export HPCGFS=${COMINgempak}/${mdl}.${PDY}/${cyc}/gempak +export HPCGFS=${COMINgempak}/${mdl}.${PDY}/${cyc}/${COMPONENT}/gempak grid1="F-GFSHPC | ${PDY2}/${cyc}00" diff --git a/gempak/ush/gfs_meta_ver.sh b/gempak/ush/gfs_meta_ver.sh index 2bd9076599..54697264be 100755 --- a/gempak/ush/gfs_meta_ver.sh +++ b/gempak/ush/gfs_meta_ver.sh @@ -28,6 +28,8 @@ mkdir -p -m 775 $DATA/VER cd $DATA/VER cp $FIXgempak/datatype.tbl datatype.tbl +export COMPONENT=${COMPONENT:-atmos} + mdl=gfs MDL=GFS metatype="ver" @@ -225,139 +227,139 @@ for verday in ${verdays} cominday=`echo ${verday} | cut -c -8` #XXW export HPCGFS=$COMROOT/nawips/prod/${mdl}.${cominday} # BV export HPCGFS=$COMROOT/nawips/${envir}/${mdl}.${cominday} - export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cyc}/gempak + export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cyc}/${COMPONENT}/gempak if [ ${verday} -eq ${dc1} ] ; then dgdattim=f006 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle1}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle1}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate1}/${cycle1}00" elif [ ${verday} -eq ${dc2} ] ; then dgdattim=f012 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle2}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle2}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate2}/${cycle2}00" elif [ ${verday} -eq ${dc3} ] ; then dgdattim=f018 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle3}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle3}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate3}/${cycle3}00" elif [ ${verday} -eq ${dc4} ] ; then dgdattim=f024 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle4}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle4}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate4}/${cycle4}00" elif [ ${verday} -eq ${dc5} ] ; then dgdattim=f030 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle5}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle5}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate5}/${cycle5}00" elif [ ${verday} -eq ${dc6} ] ; then dgdattim=f036 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle6}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle6}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate6}/${cycle6}00" elif [ ${verday} -eq ${dc7} ] ; then dgdattim=f042 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle7}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle7}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate7}/${cycle7}00" elif [ ${verday} -eq ${dc8} ] ; then dgdattim=f048 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle8}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle8}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate8}/${cycle8}00" elif [ ${verday} -eq ${dc9} ] ; then dgdattim=f054 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle9}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle9}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate9}/${cycle9}00" elif [ ${verday} -eq ${dc10} ] ; then dgdattim=f060 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle10}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle10}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate10}/${cycle10}00" elif [ ${verday} -eq ${dc11} ] ; then dgdattim=f066 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle11}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle11}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate11}/${cycle11}00" elif [ ${verday} -eq ${dc12} ] ; then dgdattim=f072 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle12}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle12}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate12}/${cycle12}00" elif [ ${verday} -eq ${dc13} ] ; then dgdattim=f078 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle13}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle13}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate13}/${cycle13}00" elif [ ${verday} -eq ${dc14} ] ; then dgdattim=f084 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle14}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle14}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate14}/${cycle14}00" elif [ ${verday} -eq ${dc15} ] ; then dgdattim=f090 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle15}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle15}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate15}/${cycle15}00" elif [ ${verday} -eq ${dc16} ] ; then dgdattim=f096 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle16}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle16}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate16}/${cycle16}00" elif [ ${verday} -eq ${dc17} ] ; then dgdattim=f102 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle17}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle17}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate17}/${cycle17}00" elif [ ${verday} -eq ${dc18} ] ; then dgdattim=f108 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle18}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle18}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate18}/${cycle18}00" elif [ ${verday} -eq ${dc19} ] ; then dgdattim=f114 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle19}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle19}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate19}/${cycle19}00" elif [ ${verday} -eq ${dc20} ] ; then dgdattim=f120 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle20}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle20}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate20}/${cycle20}00" elif [ ${verday} -eq ${dc21} ] ; then dgdattim=f126 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle21}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle21}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate21}/${cycle21}00" elif [ ${verday} -eq ${dc22} ] ; then dgdattim=f132 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle22}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle22}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate22}/${cycle22}00" elif [ ${verday} -eq ${dc23} ] ; then dgdattim=f138 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle23}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle23}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate23}/${cycle23}00" elif [ ${verday} -eq ${dc24} ] ; then dgdattim=f144 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle24}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle24}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate24}/${cycle24}00" elif [ ${verday} -eq ${dc25} ] ; then dgdattim=f150 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle25}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle25}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate25}/${cycle25}00" elif [ ${verday} -eq ${dc26} ] ; then dgdattim=f156 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle26}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle26}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate26}/${cycle26}00" elif [ ${verday} -eq ${dc27} ] ; then dgdattim=f162 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle27}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle27}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate27}/${cycle27}00" elif [ ${verday} -eq ${dc28} ] ; then dgdattim=f168 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle28}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle28}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate28}/${cycle28}00" elif [ ${verday} -eq ${dc29} ] ; then dgdattim=f174 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle29}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle29}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate29}/${cycle29}00" elif [ ${verday} -eq ${dc30} ] ; then dgdattim=f180 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle30}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle30}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate30}/${cycle30}00" elif [ ${verday} -eq ${dc31} ] ; then dgdattim=f192 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle31}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle31}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate31}/${cycle31}00" elif [ ${verday} -eq ${dc32} ] ; then dgdattim=f204 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle32}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle32}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate32}/${cycle32}00" elif [ ${verday} -eq ${dc33} ] ; then dgdattim=f216 - HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle33}/gempak + HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle33}/${COMPONENT}/gempak grid="F-${MDL2} | ${sdate33}/${cycle33}00" fi diff --git a/jobs/JGDAS_GEMPAK b/jobs/JGDAS_GEMPAK index 2ae8d08c3f..5ab6987e3a 100755 --- a/jobs/JGDAS_GEMPAK +++ b/jobs/JGDAS_GEMPAK @@ -56,12 +56,13 @@ export DBN_ALERT_TYPE=GDAS_GEMPAK export NET=${NET:-gfs} export RUN=${RUN:-gdas} export model=${model:-gdas} +export COMPONENT=${COMPONENT:-atmos} ############################################## # Define COM directories ############################################## -export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} -export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak} +export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT} +export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT/gempak} if [ $SENDCOM = YES ] ; then mkdir -m 775 -p $COMOUT diff --git a/jobs/JGDAS_GEMPAK_META_NCDC b/jobs/JGDAS_GEMPAK_META_NCDC index 6edc4b6eff..b6e411a956 100755 --- a/jobs/JGDAS_GEMPAK_META_NCDC +++ b/jobs/JGDAS_GEMPAK_META_NCDC @@ -50,6 +50,7 @@ cp $FIXgempak/datatype.tbl datatype.tbl #################################### export NET=${NET:-gfs} export RUN=${RUN:-gdas} +export COMPONENT=${COMPONENT:-atmos} export MODEL=GDAS export GRID_NAME=gdas export fend=09 @@ -65,10 +66,10 @@ export DBN_ALERT_TYPE=GDAS_METAFILE ############################################## # Define COM directories ############################################## -export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak} +export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT/gempak} export COMINgdas=${COMINgdas:-$(compath.py ${NET}/${envir}/${RUN})} -export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta} -export COMOUTncdc=${COMOUTncdc:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}} +export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT/gempak/meta} +export COMOUTncdc=${COMOUTncdc:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT} export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)} export COMINecmwf=${COMINecmwf:-$(compath.py ecmwf/prod/ecmwf)} diff --git a/jobs/JGFS_AWIPS_20KM_1P0DEG b/jobs/JGFS_AWIPS_20KM_1P0DEG index c05386fe65..bafd73f284 100755 --- a/jobs/JGFS_AWIPS_20KM_1P0DEG +++ b/jobs/JGFS_AWIPS_20KM_1P0DEG @@ -44,12 +44,13 @@ export FIXgfs=${FIXgfs:-$HOMEgfs/fix} export NET=${NET:-gfs} export RUN=${RUN:-gfs} export model=${model:-gfs} +export COMPONENT=${COMPONENT:-atmos} ############################################## # Define COM directories ############################################## -export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} -export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}} +export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT} +export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT} export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then diff --git a/jobs/JGFS_AWIPS_G2 b/jobs/JGFS_AWIPS_G2 index 6840bff2cc..a661a4f0cf 100755 --- a/jobs/JGFS_AWIPS_G2 +++ b/jobs/JGFS_AWIPS_G2 @@ -45,12 +45,13 @@ export UTILgfs=${UTILgfs:-$HOMEgfs/util} export NET=${NET:-gfs} export RUN=${RUN:-gfs} export model=${model:-gfs} +export COMPONENT=${COMPONENT:-atmos} ############################################## # Define COM directories ############################################## -export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} -export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}} +export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT} +export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT} export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then diff --git a/jobs/JGFS_CYCLONE_GENESIS b/jobs/JGFS_CYCLONE_GENESIS index ad14bea99a..e43edbbaca 100755 --- a/jobs/JGFS_CYCLONE_GENESIS +++ b/jobs/JGFS_CYCLONE_GENESIS @@ -53,7 +53,7 @@ setpdy.sh #################################### export NET=${NET:-gfs} export RUN=${RUN:-gfs} - +export COMPONENT=${COMPONENT:-atmos} ############################################## # Determine Job Output Name on System @@ -91,10 +91,10 @@ export SCRIPTens_tracker=${SCRIPTens_tracker:-$HOMEens_tracker/scripts} ############################################## # Define COM directories ############################################## -export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc} +export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/$COMPONENT export gfsdir=${COMIN} export COMINgfs=${COMIN} -export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc} +export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/$COMPONENT export JYYYY=`echo ${PDY} | cut -c1-4` export COMINgenvit=${COMINgenvit:-${COMOUT}/genesis_vital_${JYYYY}} diff --git a/jobs/JGFS_CYCLONE_TRACKER b/jobs/JGFS_CYCLONE_TRACKER index 1ebab8064a..a26393cb27 100755 --- a/jobs/JGFS_CYCLONE_TRACKER +++ b/jobs/JGFS_CYCLONE_TRACKER @@ -53,6 +53,7 @@ setpdy.sh #################################### export NET=${NET:-gfs} export RUN=${RUN:-gfs} +export COMPONENT=${COMPONENT:-atmos} ############################################## @@ -92,12 +93,12 @@ export USHens_tracker=${USHens_tracker:-$HOMEens_tracker/ush} ############################################## # Define COM and Data directories ############################################## -export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc} +export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/$COMPONENT export COMINgfs=${COMIN} export gfsdir=${COMINgfs} export COMINgdas=${COMIN} export gdasdir=${COMINgdas} -export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc} +export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/$COMPONENT export COMINsyn=${COMINsyn:-$(compath.py arch/prod/syndat)} if [ $RUN_ENVIR = "nco" ]; then diff --git a/jobs/JGFS_FBWIND b/jobs/JGFS_FBWIND index abec894b84..c51a077b29 100755 --- a/jobs/JGFS_FBWIND +++ b/jobs/JGFS_FBWIND @@ -44,12 +44,13 @@ export UTILgfs=${UTILgfs:-$HOMEgfs/util} export NET=${NET:-gfs} export RUN=${RUN:-gfs} export model=${model:-gfs} +export COMPONENT=${COMPONENT:-atmos} ############################################## # Define COM directories ############################################## -export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} -export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}} +export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT} +export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT} export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then diff --git a/jobs/JGFS_FSU_GENESIS b/jobs/JGFS_FSU_GENESIS index c66b3d1169..f693f01b42 100755 --- a/jobs/JGFS_FSU_GENESIS +++ b/jobs/JGFS_FSU_GENESIS @@ -54,6 +54,7 @@ setpdy.sh #################################### export NET=${NET:-gfs} export RUN=${RUN:-gfs} +export COMPONENT=${COMPONENT:-atmos} ############################################## @@ -88,18 +89,19 @@ export HOMEens_tracker=${HOMEens_tracker:-${NWROOT:?}/ens_tracker.${ens_tracker_ export EXECens_tracker=${EXECens_tracker:-$HOMEens_tracker/exec} export FIXens_tracker=${FIXens_tracker:-$HOMEens_tracker/fix} export USHens_tracker=${USHens_tracker:-$HOMEens_tracker/ush} - +export SCRIPTens_tracker=${SCRIPTens_tracker:-$HOMEens_tracker/scripts} +export BINens_tracker=${BINens_tracker:-$HOMEens_tracker/ush/FSUgenesisPY/bin} ############################################## # Define COM and Data directories ############################################## -export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc} +export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/${COMPONENT} export COMINgfs=${COMIN} #export gfsdir=${COMINgfs} export gfsdir=${ROTDIR} export COMINgdas=${COMIN} export gdasdir=${COMINgdas} -export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc} +export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/${COMPONENT} export COMINsyn=${COMINsyn:-$(compath.py arch/prod/syndat)} if [ $RUN_ENVIR = "nco" ]; then @@ -123,51 +125,9 @@ $LOGSCRIPT ############################################################# # Execute the script -#export pert="p01" -export cmodel=$CDUMP -#export loopnum=1 - -#-----------input data checking ----------------- -#${USHens_tracker}/data_check_gfs.sh -${USHens_tracker}/data_check_gfs_180hr.sh -# exit code 6 = missing data of opportunity -if [ $? -eq 6 ]; then exit; fi -#------------------------------------------------ - -machine=${machine:-`echo ${SITE}`} -if [ $machine = TIDE -o $machine = GYRE ] ; then # For WCOSS - machine=wcoss -# ${USHens_tracker}/extrkr_gfs.sh ${loopnum} ${cmodel} ${CDATE} ${pert} ${DATA} - ${USHens_tracker}/extrkr_fsu.sh ${cmodel} ${CDATE} ${DATA} ${gfsdir} - -elif [ $machine = LUNA -o $machine = SURGE -o $machine = WCOSS_C ] ; then # For CRAY - machine=cray -# ${APRUNTRACK} ${USHens_tracker}/extrkr_gfs.sh ${loopnum} ${cmodel} ${CDATE} ${pert} ${DATA} - ${APRUNTRACK} ${USHens_tracker}/extrkr_fsu.sh ${cmodel} ${CDATE} ${DATA} ${gfsdir} - -elif [ $machine = VENUS -o $machine = MARS -o $machine = WCOSS_DELL_P3 ] ; then # For DELL - machine=dell -# mpirun -n 1 ${USHens_tracker}/extrkr_gfs.sh ${loopnum} ${cmodel} ${CDATE} ${pert} ${DATA} - mpirun -n 1 ${USHens_tracker}/extrkr_fsu.sh ${cmodel} ${CDATE} ${DATA} ${gfsdir} - -elif [ $machine = HERA ]; then # For HERA - machine=hera -# ${USHens_tracker}/extrkr_gfs.sh ${loopnum} ${cmodel} ${CDATE} ${pert} ${DATA} - ${USHens_tracker}/extrkr_fsu.sh ${cmodel} ${CDATE} ${DATA} ${gfsdir} -fi +${SCRIPTens_tracker}/exgfs_fsu_genesis.sh export err=$?; err_chk - -#if [ "$SENDCOM" = 'YES' ]; then -# cat ${DATA}/trak.avnx.atcfunix.${PDY}${cyc} | \ -# sed s:AVNX:GFSO:g \ -# > ${COMOUT}/gfso.t${cyc}z.cyclone.trackatcfunix -# -# cat ${DATA}/trak.avnx.atcfunix.${PDY}${cyc} | \ -# sed s:AVNX:AVNO:g \ -# > ${COMOUT}/avn.t${cyc}z.cyclone.trackatcfunix -#fi - ############################################## # Final processing ############################################## @@ -175,11 +135,9 @@ if [ -e "$pgmout" ] ; then cat $pgmout fi - msg="ENDED NORMALLY." postmsg "$jlogfile" "$msg" - ########################################## # Remove the Temporary working directory ########################################## diff --git a/jobs/JGFS_GEMPAK b/jobs/JGFS_GEMPAK index 888b970a3f..d6434f72f1 100755 --- a/jobs/JGFS_GEMPAK +++ b/jobs/JGFS_GEMPAK @@ -56,12 +56,13 @@ export DBN_ALERT_TYPE=${DBN_ALERT_TYPE:-GFS_GEMPAK} export NET=${NET:-gfs} export RUN=${RUN:-gfs} export model=${model:-gfs} +export COMPONENT=${COMPONENT:-atmos} ############################################## # Define COM directories ############################################## -export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} -export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak} +export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT} +export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT/gempak} if [ $SENDCOM = YES ] ; then mkdir -m 775 -p $COMOUT diff --git a/jobs/JGFS_GEMPAK_META b/jobs/JGFS_GEMPAK_META index 45c6a0153d..06edd5ebf3 100755 --- a/jobs/JGFS_GEMPAK_META +++ b/jobs/JGFS_GEMPAK_META @@ -62,6 +62,7 @@ export fhinc=12 export NET=${NET:-gfs} export RUN=${RUN:-gfs} export model=${model:-gfs} +export COMPONENT=${COMPONENT:-atmos} ############################################## # Set up model and cycle specific variables @@ -71,8 +72,8 @@ export DBN_ALERT_TYPE=GFS_METAFILE ############################################## # Define COM directories ############################################## -export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak} -export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta} +export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT/gempak} +export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT/gempak/meta} export COMINgempak=${COMINgempak:-${COMROOT}/${NET}/${envir}} export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)} diff --git a/jobs/JGFS_GEMPAK_NCDC_UPAPGIF b/jobs/JGFS_GEMPAK_NCDC_UPAPGIF index bf09cbf578..b9a6d411fc 100755 --- a/jobs/JGFS_GEMPAK_NCDC_UPAPGIF +++ b/jobs/JGFS_GEMPAK_NCDC_UPAPGIF @@ -65,13 +65,14 @@ export fstart=00 export NET=${NET:-gfs} export RUN=${RUN:-gfs} export model=${model:-gfs} +export COMPONENT=${COMPONENT:-atmos} ############################################## # Define COM directories ############################################## -export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak} -export COMINgfs=${COMINgfs:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} -export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}} +export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT/gempak} +export COMINgfs=${COMINgfs:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT} +export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT} export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then diff --git a/jobs/JGFS_PGRB2_SPEC_GEMPAK b/jobs/JGFS_PGRB2_SPEC_GEMPAK index 0ad0ff0d4d..e913a9eca1 100755 --- a/jobs/JGFS_PGRB2_SPEC_GEMPAK +++ b/jobs/JGFS_PGRB2_SPEC_GEMPAK @@ -45,6 +45,7 @@ export SRCgfs=${SRCgfs:-$HOMEgfs/scripts} #################################### export NET=gfs export RUN=gfs_goessim +export COMPONENT=${COMPONENT:-atmos} export finc=3 export model=gfs export EXT="" @@ -52,8 +53,8 @@ export EXT="" ############################################## # Define COM directories ############################################## -export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${NET}.${PDY})/${cyc}} -export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${NET}.${PDY}/${cyc}/gempak} +export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${NET}.${PDY})/${cyc}/$COMPONENT} +export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${NET}.${PDY}/${cyc}/$COMPONENT/gempak} if [ $SENDCOM = YES ] ; then mkdir -m 775 -p $COMOUT diff --git a/jobs/JGFS_PGRB2_SPEC_NPOESS b/jobs/JGFS_PGRB2_SPEC_NPOESS index af9478237c..954ab52613 100755 --- a/jobs/JGFS_PGRB2_SPEC_NPOESS +++ b/jobs/JGFS_PGRB2_SPEC_NPOESS @@ -47,12 +47,13 @@ export FIXgfs=${FIXgfs:-$HOMEgfs/fix} export NET=${NET:-gfs} export RUN=${RUN:-gfs} export model=${model:-gfs} +export COMPONENT=${COMPONENT:-atmos} ############################################## # Define COM directories ############################################## -export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}} -export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}} +export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT} +export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT} export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} if [ $SENDCOM = YES ] ; then diff --git a/jobs/JGFS_POSTSND b/jobs/JGFS_POSTSND index 0777eff655..4205a27cfa 100755 --- a/jobs/JGFS_POSTSND +++ b/jobs/JGFS_POSTSND @@ -34,6 +34,7 @@ export cycle=t${cyc}z export NET=${NET:-gfs} export RUN=${RUN:-gfs} export model=${model:-gfs} +export COMPONENT=${COMPONENT:-atmos} ################################### # Set up the UTILITIES @@ -53,8 +54,8 @@ setpdy.sh ############################## # Define COM Directories ############################## -export COMIN=${COMIN:-$COMROOT/${NET}/${envir}/${RUN}.${PDY}/${cyc}} -export COMOUT=${COMOUT:-$COMROOT/${NET}/${envir}/${RUN}.${PDY}/${cyc}} +export COMIN=${COMIN:-$COMROOT/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT} +export COMOUT=${COMOUT:-$COMROOT/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT} export pcom=${pcom:-${COMOUT}/wmo} export COMAWP=${COMAWP:-${COMOUT}/gempak} mkdir -p $COMOUT $pcom $COMAWP diff --git a/jobs/JGLOBAL_EMCSFC_SFC_PREP b/jobs/JGLOBAL_EMCSFC_SFC_PREP index c4c713a2f5..b40ee3b8f3 100755 --- a/jobs/JGLOBAL_EMCSFC_SFC_PREP +++ b/jobs/JGLOBAL_EMCSFC_SFC_PREP @@ -40,12 +40,11 @@ PDY_m6hrs=$(echo $GDATE | cut -c1-8) cyc_m6hrs=$(echo $GDATE | cut -c9-10) export cycle_m6hrs=t${cyc_m6hrs}z -#### Lin Gan request for change -#### export COMOUT=${COMROOT}/$NET/$envir/$RUN.$PDY/$cyc -export COMOUT=${COMOUT:-${COMROOT}/$NET/$envir/$RUN.$PDY/$cyc} +export COMPONENT=${COMPONENT:-atmos} +export COMOUT=${COMOUT:-${COMROOT}/$NET/$envir/$RUN.$PDY/$cyc/$COMPONENT} -export COMINgfs=${COMINgfs:-$(compath.py $NET/$envir/$RUN.$PDY)/$cyc} -export COMINgfs_m6hrs=${COMINgfs_m6hrs:-$(compath.py $NET/$envir/$RUN.$PDY_m6hrs)/$cyc_m6hrs} +export COMINgfs=${COMINgfs:-$(compath.py $NET/$envir/$RUN.$PDY)/$cyc/$COMPONENT} +export COMINgfs_m6hrs=${COMINgfs_m6hrs:-$(compath.py $NET/$envir/$RUN.$PDY_m6hrs)/$cyc_m6hrs/$COMPONENT} export IMS_FILE=${COMINgfs}/${RUN}.${cycle}.imssnow96.grib2 export FIVE_MIN_ICE_FILE=${COMINgfs}/${RUN}.${cycle}.seaice.5min.grib2 diff --git a/jobs/JGLOBAL_FORECAST b/jobs/JGLOBAL_FORECAST index be694dcf34..6f53551275 100755 --- a/jobs/JGLOBAL_FORECAST +++ b/jobs/JGLOBAL_FORECAST @@ -70,12 +70,12 @@ if [ $RUN_ENVIR = "nco" ]; then export RSTDIR=${GESROOT:?}/$envir fi -# Source additional configs +# Set wave variables if [ ${DO_WAVE:-"NO"} = "YES" ]; then -# WAVE component directory - export WAV_MOD_ID=${WAV_MOD_ID:-wave} - export COMINWW3=${COMINWW3:-${ROTDIR:?}} - export COMOUTWW3=${COMOUTWW3:-${ROTDIR:?}} + # WAVE component directory + export CDUMPwave=${CDUMPwave:-${CDUMP}wave} + export COMINwave=${COMINwave:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave} + export COMOUTwave=${COMOUTwave:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave} fi ############################################## diff --git a/jobs/JGLOBAL_TROPCY_QC_RELOC b/jobs/JGLOBAL_TROPCY_QC_RELOC index 95fd4fb5ae..5e80606a4b 100755 --- a/jobs/JGLOBAL_TROPCY_QC_RELOC +++ b/jobs/JGLOBAL_TROPCY_QC_RELOC @@ -57,6 +57,7 @@ export pgmerr=errfile ############################################## export CDATE=${CDATE:-${PDY}${cyc}} export CDUMP=${CDUMP:-${RUN:-"gfs"}} +export COMPONENT=${COMPONENT:-atmos} if [ $RUN_ENVIR = "nco" ]; then export ROTDIR=${COMROOT:?}/$NET/$envir fi @@ -88,8 +89,8 @@ export TANK_TROPCY=${TANK_TROPCY:-${DCOMROOT}/prod} # path to tropical cyclone ############################################## # Define COM directories ############################################## -export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc} -export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc} +export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/$COMPONENT +export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/$COMPONENT if [ ! -d ${COMOUT} ]; then mkdir -p $COMOUT; fi #export COMINgdas=${ROTDIR}/gdas.${PDY}/${cyc} #export COMINgfs=${ROTDIR}/gfs.${PDY}/${cyc} diff --git a/jobs/JWAVE_INIT b/jobs/JGLOBAL_WAVE_INIT similarity index 69% rename from jobs/JWAVE_INIT rename to jobs/JGLOBAL_WAVE_INIT index 70cb2fd8b0..dbed424464 100755 --- a/jobs/JWAVE_INIT +++ b/jobs/JGLOBAL_WAVE_INIT @@ -27,16 +27,11 @@ status=$? # PATH for working directory export NET=${NET:-gfs} export RUN=${RUN:-gfs} -export COMPONENTwave=${COMPONENTwave:-${RUN}wave} - -export HOMEgfs=${HOMEgfs:-$NWROOT/${NET}.${gfs_ver}} +export COMPONENT=${COMPONENT:-wave} # Add default errchk = err_chk export errchk=${errchk:-err_chk} -# Set HOMEwave to HOMEgfs -HOMEwave=${HOMEwave:-${HOMEgfs}} - # Create and go to DATA directory export DATA=${DATA:-${DATAROOT:?}/${jobid}} mkdir -p $DATA @@ -53,24 +48,18 @@ export pgmout=OUTPUT.$$ export MP_PULSE=0 -# Set resources to propagate NTASKS across cfp call -NTASKS=${NTASKS:-${npe_node_waveinit}} -export NTASKS=${NTASKS:?NTASKS required to be set} - # Path to HOME Directory -export FIXwave=${FIXwave:-$HOMEwave/fix/fix_wave_${NET}} -export PARMwave=${PARMwave:-$HOMEwave/parm/wave} -export USHwave=${USHwave:-$HOMEwave/ush} +export FIXwave=${FIXwave:-$HOMEgfs/fix/fix_wave_${NET}} +export PARMwave=${PARMwave:-$HOMEgfs/parm/wave} +export USHwave=${USHwave:-$HOMEgfs/ush} export EXECwave=${EXECwave:-$HOMEgfs/exec} # Set COM Paths and GETGES environment if [ $RUN_ENVIR = "nco" ]; then export ROTDIR=${COMROOT:?}/$NET/$envir fi -export COMINwave=${COMINwave:-${ROTDIR:?}} -export COMOUTwave=${COMOUTwave:-${ROTDIR:?}} -export COMIN=${COMIN:-${COMINwave}/${COMPONENTwave}.${PDY}/${cyc}} -export COMOUT=${COMOUT:-${COMOUTwave}/${COMPONENTwave}.${PDY}/${cyc}} +export COMIN=${COMIN:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT} +export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT} [[ ! -d $COMOUT ]] && mkdir -m 775 -p $COMOUT if [ $SENDCOM = YES ]; then @@ -82,7 +71,7 @@ export wavempexec=${launcher:-"mpirun -n"} export wave_mpmd=${mpmd:-"cfp"} # Execute the Script -$HOMEwave/scripts/exwave_init.sh +$HOMEgfs/scripts/exgfs_wave_init.sh ########################################## # Remove the Temporary working directory diff --git a/jobs/JWAVE_POST_SBS b/jobs/JGLOBAL_WAVE_POST_SBS similarity index 76% rename from jobs/JWAVE_POST_SBS rename to jobs/JGLOBAL_WAVE_POST_SBS index bca6a0cb6a..87cf5e074e 100755 --- a/jobs/JWAVE_POST_SBS +++ b/jobs/JGLOBAL_WAVE_POST_SBS @@ -27,7 +27,7 @@ status=$? # PATH for working directory export NET=${NET:-gfs} export RUN=${RUN:-gfs} -export COMPONENTwave=${COMPONENTwave:-${RUN}wave} +export COMPONENT=${COMPONENT:-wave} export HOMEgefs=${HOMEgefs:-$NWROOT/$NET.${gefs_ver}} export HOMEgfs=${HOMEgfs:-$NWROOT/$NET.${gfs_ver}} @@ -35,13 +35,6 @@ export HOMEgfs=${HOMEgfs:-$NWROOT/$NET.${gfs_ver}} # Add default errchk = err_chk export errchk=${errchk:-err_chk} -# Set HOMEwave to HOMEgefs -HOMEwave=${HOMEwave:-${HOMEgfs}} - -# Set resources to propagate NTASKS across cfp call -NTASKS=${NTASKS:-${npe_node_waveprep}} -export NTASKS=${NTASKS:?NTASKS required to be set} - # Create and go to DATA directory export DATA=${DATA:-${DATAROOT:?}/${jobid}} mkdir -p $DATA @@ -59,19 +52,17 @@ export pgmout=OUTPUT.$$ export MP_PULSE=0 # Path to HOME Directory -export FIXwave=${FIXwave:-$HOMEwave/fix/fix_wave_${NET}} -export PARMwave=${PARMwave:-$HOMEwave/parm/wave} -export USHwave=${USHwave:-$HOMEwave/ush} +export FIXwave=${FIXwave:-$HOMEgfs/fix/fix_wave_${NET}} +export PARMwave=${PARMwave:-$HOMEgfs/parm/wave} +export USHwave=${USHwave:-$HOMEgfs/ush} export EXECwave=${EXECwave:-$HOMEgfs/exec} # Set COM Paths and GETGES environment if [ $RUN_ENVIR = "nco" ]; then export ROTDIR=${COMROOT:?}/$NET/$envir fi -export COMINwave=${COMINwave:-${ROTDIR:?}} -export COMOUTwave=${COMOUTwave:-${ROTDIR:?}} -export COMIN=${COMIN:-${COMINwave}/${COMPONENTwave}.${PDY}/${cyc}} -export COMOUT=${COMOUT:-${COMOUTwave}/${COMPONENTwave}.${PDY}/${cyc}} +export COMIN=${COMIN:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT} +export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT} export COMINice=${COMINice:-${COMROOTp2}/omb/prod} export COMINwnd=${COMINwnd:-${COMROOT}/gfs/prod} @@ -94,12 +85,12 @@ env | sort membTAG='p' if [ "${waveMEMB}" == "00" ]; then membTAG='c'; fi export membTAG -export WAV_MOD_TAG=${COMPONENTwave}${waveMEMB} +export WAV_MOD_TAG=${CDUMP}wave${waveMEMB} export CFP_VERBOSE=1 # Execute the Script -$HOMEwave/scripts/exwave_post_sbs.sh +$HOMEgfs/scripts/exgfs_wave_post_sbs.sh err=$? if [ $err -ne 0 ]; then msg="FATAL ERROR: ex-script of GWES_POST failed!" diff --git a/jobs/JWAVE_PREP b/jobs/JGLOBAL_WAVE_PREP similarity index 71% rename from jobs/JWAVE_PREP rename to jobs/JGLOBAL_WAVE_PREP index ba821d2ee2..59e2932ca9 100755 --- a/jobs/JWAVE_PREP +++ b/jobs/JGLOBAL_WAVE_PREP @@ -27,20 +27,13 @@ status=$? # PATH for working directory export NET=${NET:-gfs} export RUN=${RUN:-gfs} -export COMPONENTwave=${COMPONENTwave:-${RUN}wave} +export COMPONENT=${COMPONENT:-wave} export HOMEgfs=${HOMEgfs:-$NWROOT/gfs.${gfs_ver}} # Add default errchk = err_chk export errchk=${errchk:-err_chk} -# Set HOMEwave to HOMEgfs -HOMEwave=${HOMEwave:-${HOMEgfs}} - -# Set resources to propagate NTASKS across cfp call -NTASKS=${NTASKS:-${npe_node_waveprep}} -export NTASKS=${NTASKS:?NTASKS required to be set} - # Create and go to DATA directory export DATA=${DATA:-${DATAROOT:?}/${jobid}} mkdir -p $DATA @@ -63,24 +56,22 @@ export MP_PULSE=0 export CDO=${CDO_ROOT}/bin/cdo # Path to HOME Directory -export FIXwave=${FIXwave:-$HOMEwave/fix/fix_wave_${NET}} -export PARMwave=${PARMwave:-$HOMEwave/parm/wave} -export USHwave=${USHwave:-$HOMEwave/ush} +export FIXwave=${FIXwave:-$HOMEgfs/fix/fix_wave_${NET}} +export PARMwave=${PARMwave:-$HOMEgfs/parm/wave} +export USHwave=${USHwave:-$HOMEgfs/ush} export EXECwave=${EXECwave:-$HOMEgfs/exec} # Set COM Paths and GETGES environment if [ $RUN_ENVIR = "nco" ]; then export ROTDIR=${COMROOT:?}/$NET/$envir fi -export COMINwave=${COMINwave:-${ROTDIR:?}} -export COMOUTwave=${COMOUTwave:-${ROTDIR:?}} -export COMIN=${COMIN:-${COMINwave}/${COMPONENTwave}.${PDY}/${cyc}} -export COMOUT=${COMOUT:-${COMOUTwave}/${COMPONENTwave}.${PDY}/${cyc}} +export COMIN=${COMIN:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT} +export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT} [[ ! -d $COMOUT ]] && mkdir -m 775 -p $COMOUT if [ $RUN_ENVIR = "nco" ]; then - export COMIN_WAV_ICE=${COMIN_WAV_ICE:-$(compath.py gfs/prod)}/${CDUMP}.${PDY}/${cyc} - export COMIN_WAV_WND=${COMIN_WAV_WND:-$(compath.py gfs/prod)}/${CDUMP}.${PDY}/${cyc} + export COMIN_WAV_ICE=${COMIN_WAV_ICE:-$(compath.py gfs/prod)}/${CDUMP}.${PDY}/${cyc}/atmos + export COMIN_WAV_WND=${COMIN_WAV_WND:-$(compath.py gfs/prod)}/${CDUMP}.${PDY}/${cyc}/atmos export COMIN_WAV_CUR=${COMIN_WAV_CUR:-$(compath.py ${WAVECUR_DID}/prod)}/${WAVECUR_DID}.${RPDY} if [ ! -d $COMIN_WAV_CUR ]; then export RPDY=`$NDATE -24 ${PDY}00 | cut -c1-8` @@ -91,10 +82,10 @@ else if [ ! -L $ROTDIR/${WAVECUR_DID}.${RPDY} ]; then # Check if symlink already exists in ROTDIR $NLN $DMPDIR/${WAVECUR_DID}.${RPDY} $ROTDIR/${WAVECUR_DID}.${RPDY} fi - if [ ! -L $ROTDIR/${CDUMP}.${PDY}/${cyc}/${WAVICEFILE} ]; then # Check if symlink already exists in ROTDIR - $NLN $DMPDIR/$CDUMP.${PDY}/$cyc/${WAVICEFILE} $ROTDIR/$CDUMP.${PDY}/$cyc/${WAVICEFILE} + if [ ! -L $ROTDIR/${CDUMP}.${PDY}/${cyc}/atmos/${WAVICEFILE} ]; then # Check if symlink already exists in ROTDIR + $NLN $DMPDIR/$CDUMP.${PDY}/$cyc/${WAVICEFILE} $ROTDIR/$CDUMP.${PDY}/$cyc/atmos/${WAVICEFILE} fi - export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc} + export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc/atmos} export COMIN_WAV_ICE=${COMIN_OBS} export COMIN_WAV_WND=${COMIN_OBS} export COMIN_WAV_CUR=${ROTDIR}/${WAVECUR_DID}.${RPDY} @@ -104,12 +95,8 @@ fi export wavempexec=${launcher:-"mpirun -n"} export wave_mpmd=${mpmd:-"cfp"} -# Set wave model ID tag to include member number -# if ensemble; waveMEMB var empty in deterministic -export WAV_MOD_TAG=${COMPONENTwave}${waveMEMB} - # Execute the Script -$HOMEwave/scripts/exwave_prep.sh +$HOMEgfs/scripts/exgfs_wave_prep.sh ########################################## # Remove the Temporary working directory diff --git a/jobs/rocoto/arch.sh b/jobs/rocoto/arch.sh index 68286fee57..bdfa41a25e 100755 --- a/jobs/rocoto/arch.sh +++ b/jobs/rocoto/arch.sh @@ -44,6 +44,7 @@ else format="nemsio" fi + # Realtime parallels run GFS MOS on 1 day delay # If realtime parallel, back up CDATE_MOS one day CDATE_MOS=$CDATE @@ -56,7 +57,7 @@ PDY_MOS=$(echo $CDATE_MOS | cut -c1-8) # Archive online for verification and diagnostics ############################################################### -COMIN="$ROTDIR/$CDUMP.$PDY/$cyc" +COMIN=${COMINatmos:-"$ROTDIR/$CDUMP.$PDY/$cyc/atmos"} cd $COMIN [[ ! -d $ARCDIR ]] && mkdir -p $ARCDIR @@ -303,8 +304,8 @@ RTOFS_DATE=$($NDATE -48 $CDATE) while [ $GDATE -le $GDATEEND ]; do gPDY=$(echo $GDATE | cut -c1-8) gcyc=$(echo $GDATE | cut -c9-10) - COMIN="$ROTDIR/$CDUMP.$gPDY/$gcyc" - COMINwave="$ROTDIR/${CDUMP}wave.$gPDY/$gcyc" + COMIN="$ROTDIR/${CDUMP}.$gPDY/$gcyc/atmos" + COMINwave="$ROTDIR/${CDUMP}.$gPDY/$gcyc/wave" COMINrtofs="$ROTDIR/rtofs.$gPDY" if [ -d $COMIN ]; then rocotolog="$EXPDIR/logs/${GDATE}.log" @@ -329,12 +330,10 @@ while [ $GDATE -le $GDATEEND ]; do fi # Remove any empty directories - COMIN="$ROTDIR/$CDUMP.$gPDY" if [ -d $COMIN ]; then [[ ! "$(ls -A $COMIN)" ]] && rm -rf $COMIN fi - COMINwave="$ROTDIR/${CDUMP}wave.$gPDY" if [ -d $COMINwave ]; then [[ ! "$(ls -A $COMINwave)" ]] && rm -rf $COMINwave fi diff --git a/jobs/rocoto/awips.sh b/jobs/rocoto/awips.sh index 4c04f75f19..40c5db8cb4 100755 --- a/jobs/rocoto/awips.sh +++ b/jobs/rocoto/awips.sh @@ -40,10 +40,11 @@ status=$? [[ $status -ne 0 ]] && exit $status ############################################################### +export COMPONENT=${COMPONENT:-atmos} export CDATEm1=$($NDATE -24 $CDATE) export PDYm1=$(echo $CDATEm1 | cut -c1-8) -export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc" +export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" export DATAROOT="$RUNDIR/$CDATE/$CDUMP/awips$FHRGRP" [[ -d $DATAROOT ]] && rm -rf $DATAROOT mkdir -p $DATAROOT @@ -53,7 +54,7 @@ mkdir -p $DATAROOT echo echo "=============== BEGIN AWIPS ===============" export SENDCOM="YES" -export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc" +export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" export PCOM="$COMOUT/wmo" export jlogfile="$ROTDIR/logs/$CDATE/jgfs_awips.log" diff --git a/jobs/rocoto/earc.sh b/jobs/rocoto/earc.sh index 3bc42fab68..795b567b72 100755 --- a/jobs/rocoto/earc.sh +++ b/jobs/rocoto/earc.sh @@ -28,6 +28,8 @@ for config in $configs; do [[ $status -ne 0 ]] && exit $status done +export COMPONENT=${COMPONENT:-atmos} + n=$((ENSGRP)) # ICS are restarts and always lag INC by $assim_freq hours. @@ -40,7 +42,7 @@ fi # EnKF update in GFS, GDAS or both CDUMP_ENKF=$(echo ${EUPD_CYC:-"gdas"} | tr a-z A-Z) -ARCH_LIST="$ROTDIR/enkf${CDUMP}.$PDY/$cyc/earc$ENSGRP" +ARCH_LIST="$ROTDIR/enkf${CDUMP}.$PDY/$cyc/$COMPONENT/earc$ENSGRP" [[ -d $ARCH_LIST ]] && rm -rf $ARCH_LIST mkdir -p $ARCH_LIST cd $ARCH_LIST @@ -130,12 +132,12 @@ if [ $ENSGRP -eq 0 ]; then [[ ! -d $ARCDIR ]] && mkdir -p $ARCDIR cd $ARCDIR - $NCP $ROTDIR/enkf${CDUMP}.$PDY/$cyc/${CDUMP}.t${cyc}z.enkfstat enkfstat.${CDUMP}.$CDATE - $NCP $ROTDIR/enkf$CDUMP.$PDY/$cyc/${CDUMP}.t${cyc}z.gsistat.ensmean gsistat.${CDUMP}.${CDATE}.ensmean + $NCP $ROTDIR/enkf${CDUMP}.$PDY/$cyc/$COMPONENT/${CDUMP}.t${cyc}z.enkfstat enkfstat.${CDUMP}.$CDATE + $NCP $ROTDIR/enkf${CDUMP}.$PDY/$cyc/$COMPONENT/${CDUMP}.t${cyc}z.gsistat.ensmean gsistat.${CDUMP}.${CDATE}.ensmean if [ $CDUMP_ENKF != "GDAS" ]; then - $NCP $ROTDIR/enkfgfs.$PDY/$cyc/${CDUMP}.t${cyc}z.enkfstat enkfstat.gfs.$CDATE - $NCP $ROTDIR/enkfgfs.$PDY/$cyc/${CDUMP}.t${cyc}z.gsistat.ensmean gsistat.gfs.${CDATE}.ensmean + $NCP $ROTDIR/enkfgfs.$PDY/$cyc/$COMPONENT/${CDUMP}.t${cyc}z.enkfstat enkfstat.gfs.$CDATE + $NCP $ROTDIR/enkfgfs.$PDY/$cyc/$COMPONENT/${CDUMP}.t${cyc}z.gsistat.ensmean gsistat.gfs.${CDATE}.ensmean fi fi @@ -159,10 +161,10 @@ if [ $ENSGRP -eq 0 ]; then gPDY=$(echo $GDATE | cut -c1-8) gcyc=$(echo $GDATE | cut -c9-10) - # Handle GDAS and GFS EnKF directories separately - COMIN_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc" + # Handle GDAS and GFS EnKF directories separately + COMIN_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc/$COMPONENT" [[ -d $COMIN_ENS ]] && rm -rf $COMIN_ENS - COMIN_ENS="$ROTDIR/enkfgfs.$gPDY/$gcyc" + COMIN_ENS="$ROTDIR/enkfgfs.$gPDY/$gcyc/$COMPONENT" [[ -d $COMIN_ENS ]] && rm -rf $COMIN_ENS # PREVIOUS day 00Z remove the whole day @@ -170,7 +172,7 @@ if [ $ENSGRP -eq 0 ]; then gPDY=$(echo $GDATE | cut -c1-8) gcyc=$(echo $GDATE | cut -c9-10) - # Handle GDAS and GFS EnKF directories separately + # Handle GDAS and GFS EnKF directories separately COMIN_ENS="$ROTDIR/enkfgdas.$gPDY" [[ -d $COMIN_ENS ]] && rm -rf $COMIN_ENS COMIN_ENS="$ROTDIR/enkfgfs.$gPDY" diff --git a/jobs/rocoto/echgres.sh b/jobs/rocoto/echgres.sh new file mode 100755 index 0000000000..5278f58539 --- /dev/null +++ b/jobs/rocoto/echgres.sh @@ -0,0 +1,13 @@ +#!/bin/ksh -x + +############################################################### +# Source FV3GFS workflow modules +. $HOMEgfs/ush/load_fv3gfs_modules.sh +status=$? +[[ $status -ne 0 ]] && exit $status + +############################################################### +# Execute the JJOB +$HOMEgfs/jobs/JGDAS_ENKF_CHGRES +status=$? +exit $status diff --git a/jobs/rocoto/fv3ic.sh b/jobs/rocoto/fv3ic.sh index 72dca464ed..b5c2e40b48 100755 --- a/jobs/rocoto/fv3ic.sh +++ b/jobs/rocoto/fv3ic.sh @@ -33,6 +33,9 @@ done status=$? [[ $status -ne 0 ]] && exit $status +# Set component +export COMPONENT=${COMPONENT:-atmos} + # Temporary runtime directory export DATA="$RUNDIR/$CDATE/$CDUMP/fv3ic$$" [[ -d $DATA ]] && rm -rf $DATA @@ -55,7 +58,7 @@ if [ $status -ne 0 ]; then fi # Stage the FV3 initial conditions to ROTDIR -COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc" +COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" [[ ! -d $COMOUT ]] && mkdir -p $COMOUT cd $COMOUT || exit 99 rm -rf INPUT diff --git a/jobs/rocoto/gempak.sh b/jobs/rocoto/gempak.sh index d31f11dac7..599c6f3766 100755 --- a/jobs/rocoto/gempak.sh +++ b/jobs/rocoto/gempak.sh @@ -39,10 +39,11 @@ status=$? [[ $status -ne 0 ]] && exit $status ############################################################### +export COMPONENT=${COMPONENT:-atmos} export CDATEm1=$($NDATE -24 $CDATE) export PDYm1=$(echo $CDATEm1 | cut -c1-8) -export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc" +export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" export DATAROOT="$RUNDIR/$CDATE/$CDUMP/gempak" [[ -d $DATAROOT ]] && rm -rf $DATAROOT mkdir -p $DATAROOT @@ -55,7 +56,7 @@ export job="jgfs_gempak_${cyc}" export jlogfile="$ROTDIR/logs/$CDATE/$job.log" export DATA="${DATAROOT}/$job" export SENDCOM="YES" -export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/gempak" +export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT/gempak" export FIXgfs="" # set blank so that GEMPAKSH defaults FIXgfs to HOMEgfs/gempak/fix export USHgfs="" # set blank so that GEMPAKSH defaults FIXgfs to HOMEgfs/gempak/ush diff --git a/jobs/rocoto/getic.sh b/jobs/rocoto/getic.sh index 2da15881cd..fc938a1531 100755 --- a/jobs/rocoto/getic.sh +++ b/jobs/rocoto/getic.sh @@ -41,6 +41,8 @@ mm=$(echo $CDATE | cut -c5-6) dd=$(echo $CDATE | cut -c7-8) cyc=${cyc:-$(echo $CDATE | cut -c9-10)} +export COMPONENT=${COMPONENT:-atmos} + ############################################################### target_dir=$ICSDIR/$CDATE/$CDUMP @@ -187,7 +189,7 @@ fi # Copy pgbanl file to COMROT for verification - GFSv14 only if [ $CDATE -le "2019061118" ]; then #GFSv14 - COMROT=$ROTDIR/${CDUMP}.$PDY/$cyc + COMROT=$ROTDIR/${CDUMP}.$PDY/$cyc/$COMPONENT [[ ! -d $COMROT ]] && mkdir -p $COMROT $NCP ${fanal[4]} $COMROT/${CDUMP}.t${cyc}z.pgrbanl fi diff --git a/jobs/rocoto/metp.sh b/jobs/rocoto/metp.sh index b6658a5239..789810d6a7 100755 --- a/jobs/rocoto/metp.sh +++ b/jobs/rocoto/metp.sh @@ -40,10 +40,11 @@ status=$? [[ $status -ne 0 ]] && exit $status ############################################################### +export COMPONENT=${COMPONENT:-atmos} export CDATEm1=$($NDATE -24 $CDATE) export PDYm1=$(echo $CDATEm1 | cut -c1-8) -export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc" +export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" export DATAROOT="$RUNDIR/$CDATE/$CDUMP/vrfy" [[ -d $DATAROOT ]] && rm -rf $DATAROOT mkdir -p $DATAROOT diff --git a/jobs/rocoto/post.sh b/jobs/rocoto/post.sh index 70476cdc8e..4a253db31e 100755 --- a/jobs/rocoto/post.sh +++ b/jobs/rocoto/post.sh @@ -11,13 +11,14 @@ status=$? [[ $status -ne 0 ]] && exit $status +export COMPONENT=${COMPONENT:-atmos} if [ $FHRGRP -eq 0 ]; then fhrlst="anl" - restart_file=$ROTDIR/${CDUMP}.${PDY}/${cyc}/${CDUMP}.t${cyc}z.atm + restart_file=$ROTDIR/${CDUMP}.${PDY}/${cyc}/$COMPONENT/${CDUMP}.t${cyc}z.atm else fhrlst=$(echo $FHRLST | sed -e 's/_/ /g; s/f/ /g; s/,/ /g') - restart_file=$ROTDIR/${CDUMP}.${PDY}/${cyc}/${CDUMP}.t${cyc}z.logf + restart_file=$ROTDIR/${CDUMP}.${PDY}/${cyc}/$COMPONENT/${CDUMP}.t${cyc}z.logf fi @@ -33,8 +34,8 @@ for fhr in $fhrlst; do continue fi - #master=$ROTDIR/${CDUMP}.${PDY}/${cyc}/${CDUMP}.t${cyc}z.master.grb2f${fhr} - pgb0p25=$ROTDIR/${CDUMP}.${PDY}/${cyc}/${CDUMP}.t${cyc}z.pgrb2.0p25.f${fhr} + #master=$ROTDIR/${CDUMP}.${PDY}/${cyc}/$COMPONENT/${CDUMP}.t${cyc}z.master.grb2f${fhr} + pgb0p25=$ROTDIR/${CDUMP}.${PDY}/${cyc}/$COMPONENT/${CDUMP}.t${cyc}z.pgrb2.0p25.f${fhr} if [ ! -s $pgb0p25 ]; then export post_times=$fhr $HOMEgfs/jobs/JGLOBAL_NCEPPOST diff --git a/jobs/rocoto/postsnd.sh b/jobs/rocoto/postsnd.sh index 8a30d329b5..e3a7e3f8d7 100755 --- a/jobs/rocoto/postsnd.sh +++ b/jobs/rocoto/postsnd.sh @@ -39,10 +39,11 @@ status=$? [[ $status -ne 0 ]] && exit $status ############################################################### +export COMPONENT=${COMPONENT:-atmos} export CDATEm1=$($NDATE -24 $CDATE) export PDYm1=$(echo $CDATEm1 | cut -c1-8) -export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc" +export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" export DATAROOT="$RUNDIR/$CDATE/$CDUMP/postsnd" [[ -d $DATAROOT ]] && rm -rf $DATAROOT mkdir -p $DATAROOT @@ -57,7 +58,7 @@ export DATA="${DATAROOT}/$job" export SENDCOM="YES" export SENDDBN="YES" export HOMEbufrsnd=$HOMEgfs -export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc" +export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" export pcom="$COMOUT/wmo" export COMAWP="$COMOUT/gempak" diff --git a/jobs/rocoto/prep.sh b/jobs/rocoto/prep.sh index 8e8037ebd6..39ec1c0a7a 100755 --- a/jobs/rocoto/prep.sh +++ b/jobs/rocoto/prep.sh @@ -23,8 +23,9 @@ status=$? ############################################################### # Set script and dependency variables +export COMPONENT=${COMPONENT:-atmos} export OPREFIX="${CDUMP}.t${cyc}z." -export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc" +export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" [[ ! -d $COMOUT ]] && mkdir -p $COMOUT ############################################################### @@ -39,7 +40,7 @@ if [ $ROTDIR_DUMP = "YES" ]; then gPDY=$(echo $GDATE | cut -c1-8) gcyc=$(echo $GDATE | cut -c9-10) GDUMP=gdas - gCOMOUT="$ROTDIR/$GDUMP.$gPDY/$gcyc" + gCOMOUT="$ROTDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT" if [ ! -s $gCOMOUT/$GDUMP.t${gcyc}z.updated.status.tm00.bufr_d ]; then $HOMEgfs/ush/getdump.sh $GDATE $GDUMP $DMPDIR/${GDUMP}${DUMP_SUFFIX}.${gPDY}/${gcyc} $gCOMOUT status=$? @@ -90,13 +91,16 @@ if [ $DO_MAKEPREPBUFR = "YES" ]; then export job="j${CDUMP}_prep_${cyc}" export DATAROOT="$RUNDIR/$CDATE/$CDUMP/prepbufr" + #export COMIN=${COMIN:-$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT} + export COMIN=${COMIN:-$ROTDIR} + export COMINgdas=${COMINgdas:-$ROTDIR/gdas.$PDY/$cyc/$COMPONENT} + export COMINgfs=${COMINgfs:-$ROTDIR/gfs.$PDY/$cyc/$COMPONENT} if [ $ROTDIR_DUMP = "NO" ]; then COMIN_OBS=${COMIN_OBS:-$DMPDIR/${CDUMP}${DUMP_SUFFIX}.${PDY}/${cyc}} export COMSP=${COMSP:-$COMIN_OBS/$CDUMP.t${cyc}z.} + else + export COMSP=${COMSP:-$ROTDIR/${CDUMP}.${PDY}/${cyc}/$COMPONENT/$CDUMP.t${cyc}z.} fi - export COMIN=${COMIN:-$ROTDIR/$CDUMP.$PDY/$cyc} - export COMINgdas=${COMINgdas:-$ROTDIR/gdas.$PDY/$cyc} - export COMINgfs=${COMINgfs:-$ROTDIR/gfs.$PDY/$cyc} $HOMEobsproc_network/jobs/JGLOBAL_PREP status=$? diff --git a/jobs/rocoto/vrfy.sh b/jobs/rocoto/vrfy.sh index 0c077c8152..f3101fc95a 100755 --- a/jobs/rocoto/vrfy.sh +++ b/jobs/rocoto/vrfy.sh @@ -39,10 +39,11 @@ status=$? [[ $status -ne 0 ]] && exit $status ############################################################### +export COMPONENT=${COMPONENT:-atmos} export CDATEm1=$($NDATE -24 $CDATE) export PDYm1=$(echo $CDATEm1 | cut -c1-8) -export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc" +export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" export DATAROOT="$RUNDIR/$CDATE/$CDUMP/vrfy" [[ -d $DATAROOT ]] && rm -rf $DATAROOT mkdir -p $DATAROOT @@ -55,7 +56,7 @@ if [ $MKPGB4PRCP = "YES" -a $CDUMP = "gfs" ]; then nthreads_env=${OMP_NUM_THREADS:-1} # get threads set in env export OMP_NUM_THREADS=1 cd $COMIN - fhmax=$vhr_rain + fhmax=${vhr_rain:-$FHMAX_GFS} fhr=0 while [ $fhr -le $fhmax ]; do fhr2=$(printf %02i $fhr) @@ -122,7 +123,7 @@ echo "=============== START TO RUN RADMON DATA EXTRACTION ===============" if [ $VRFYRAD = "YES" -a $CDUMP = $CDFNL -a $CDATE != $SDATE ]; then export EXP=$PSLOT - export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc" + export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" export jlogfile="$ROTDIR/logs/$CDATE/${CDUMP}radmon.log" export TANKverf_rad="$TANKverf/stats/$PSLOT/$CDUMP.$PDY" export TANKverf_radM1="$TANKverf/stats/$PSLOT/$CDUMP.$PDYm1" @@ -139,7 +140,7 @@ echo "=============== START TO RUN OZMON DATA EXTRACTION ===============" if [ $VRFYOZN = "YES" -a $CDUMP = $CDFNL -a $CDATE != $SDATE ]; then export EXP=$PSLOT - export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc" + export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" export jlogfile="$ROTDIR/logs/$CDATE/${CDUMP}oznmon.log" export TANKverf_ozn="$TANKverf_ozn/stats/$PSLOT/$CDUMP.$PDY" export TANKverf_oznM1="$TANKverf_ozn/stats/$PSLOT/$CDUMP.$PDYm1" @@ -155,7 +156,7 @@ echo echo "=============== START TO RUN MINMON ===============" if [ $VRFYMINMON = "YES" -a $CDATE != $SDATE ]; then - export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc" + export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" export jlogfile="$ROTDIR/logs/$CDATE/${CDUMP}minmon.log" export M_TANKverfM0="$M_TANKverf/stats/$PSLOT/$CDUMP.$PDY" export M_TANKverfM1="$M_TANKverf/stats/$PSLOT/$CDUMP.$PDYm1" diff --git a/jobs/rocoto/waveinit.sh b/jobs/rocoto/waveinit.sh index ce7397c3e7..5f837bcee0 100755 --- a/jobs/rocoto/waveinit.sh +++ b/jobs/rocoto/waveinit.sh @@ -11,7 +11,7 @@ status=$? echo echo "=============== START TO RUN WAVE INIT ===============" # Execute the JJOB -$HOMEgfs/jobs/JWAVE_INIT +$HOMEgfs/jobs/JGLOBAL_WAVE_INIT status=$? exit $status diff --git a/jobs/rocoto/wavepostsbs.sh b/jobs/rocoto/wavepostsbs.sh index 751bb9e8c4..3139ba477f 100755 --- a/jobs/rocoto/wavepostsbs.sh +++ b/jobs/rocoto/wavepostsbs.sh @@ -11,7 +11,7 @@ status=$? echo echo "=============== START TO RUN WAVE POST_SBS ===============" # Execute the JJOB -$HOMEgfs/jobs/JWAVE_POST_SBS +$HOMEgfs/jobs/JGLOBAL_WAVE_POST_SBS status=$? exit $status diff --git a/jobs/rocoto/waveprep.sh b/jobs/rocoto/waveprep.sh index faef5533d9..f93e02fed0 100755 --- a/jobs/rocoto/waveprep.sh +++ b/jobs/rocoto/waveprep.sh @@ -11,7 +11,7 @@ status=$? echo echo "=============== START TO RUN WAVE PREP ===============" # Execute the JJOB -$HOMEgfs/jobs/JWAVE_PREP +$HOMEgfs/jobs/JGLOBAL_WAVE_PREP status=$? exit $status diff --git a/modulefiles/module_base.hera b/modulefiles/module_base.hera index fdd1fcdc0b..a60234f5f5 100644 --- a/modulefiles/module_base.hera +++ b/modulefiles/module_base.hera @@ -27,7 +27,7 @@ module load esmflocal/8.0.1.08bs #module load esmf/8.0.1bs08 # python -module use -a /contrib/modulefiles +module use -a /contrib/anaconda/modulefiles module load anaconda/2.3.0 # waveprep diff --git a/modulefiles/module_base.wcoss_dell_p3 b/modulefiles/module_base.wcoss_dell_p3 index e39e407f1b..76de5f0622 100644 --- a/modulefiles/module_base.wcoss_dell_p3 +++ b/modulefiles/module_base.wcoss_dell_p3 @@ -7,16 +7,16 @@ module load ips/18.0.1.163 module load impi/18.0.1 module load lsf/10.1 -module load EnvVars/1.0.2 +module load EnvVars/1.0.3 module load HPSS/5.0.2.5 -module load prod_util/1.1.0 +module load prod_util/1.1.4 module load prod_envir/1.1.0 module unload grib_util/1.0.6 module load grib_util/1.1.0 module load NCO/4.7.0 -module load CFP/2.0.1 +module load CFP/2.0.2 setenv USE_CFP YES module load pm5 @@ -37,5 +37,5 @@ module load crtm/2.3.0 module load g2tmpl/1.6.0 # Load FSU Genesis module -module use -a /gpfs/dell2/emc/modeling/noscrub/emc.glopara/git/tracker/ens_tracker.v1.1.15.2/tclogg/modulefiles +module use -a /gpfs/dell2/emc/modeling/noscrub/emc.glopara/git/tracker/ens_tracker.v1.1.15.3/ush/FSUgenesisPY/modulefiles module load tclogg diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn index cc9dadd9fb..a185ed2ee9 100755 --- a/parm/config/config.base.emc.dyn +++ b/parm/config/config.base.emc.dyn @@ -43,7 +43,6 @@ export NOSCRUB="@NOSCRUB@" # Base directories for various builds export BASE_GIT="@BASE_GIT@" -export BASE_SVN="@BASE_SVN@" # Toggle to turn on/off GFS downstream processing. export DO_BUFRSND="YES" @@ -51,7 +50,10 @@ export DO_GEMPAK="NO" export DO_AWIPS="NO" # NO for retrospective parallel; YES for real-time parallel -export REALTIME="NO" +# arch.sh uses REALTIME for MOS. Need to set REALTIME=YES +# if want MOS written to HPSS. Should update arch.sh to +# use RUNMOS flag (currently in config.vrfy) +export REALTIME="YES" #################################################### @@ -65,10 +67,10 @@ export HOMEgsi="$HOMEgfs" export FIXgsi="$HOMEgfs/fix/fix_gsi" export HOMEfv3gfs="$HOMEgfs/sorc/fv3gfs.fd" export HOMEpost="$HOMEgfs" -export HOMEobsproc_prep="$BASE_GIT/obsproc/gfsv16/obsproc_prep.iss70457.netcdfhistory_new" -export HOMEobsproc_network="$BASE_GIT/obsproc/gfsv16/obsproc_global.iss71402.supportGFSv16" +export HOMEobsproc_prep="$BASE_GIT/obsproc/gfsv16b/obsproc_prep.iss70457.netcdfhistory" +export HOMEobsproc_network="$BASE_GIT/obsproc/gfsv16b/obsproc_global.iss71402.supportGFSv16" export HOMEobsproc_global=$HOMEobsproc_network -export BASE_VERIF="$BASE_SVN/verif/global/tags/vsdb" +export BASE_VERIF="$BASE_GIT/verif/global/tags/vsdb" # CONVENIENT utility scripts and other environment parameters export NCP="/bin/cp -p" @@ -78,6 +80,8 @@ export VERBOSE="YES" export KEEPDATA="NO" export CHGRP_CMD="chgrp rstprod" export NEMSIOGET="$HOMEgfs/exec/nemsio_get" +export NCDUMP="$NETCDF/bin/ncdump" +export NCLEN="$HOMEgfs/ush/getncdimlen" # Machine environment, jobs, and other utility scripts export BASE_ENV="$HOMEgfs/env" @@ -92,6 +96,9 @@ export EXPDIR="@EXPDIR@/$PSLOT" export ROTDIR="@ROTDIR@/$PSLOT" export ROTDIR_DUMP="YES" #Note: A value of "NO" does not currently work export DUMP_SUFFIX="" +if [[ "$CDATE" -ge "2019092100" && "$CDATE" -le "2019110700" ]]; then + export DUMP_SUFFIX="p" # Use dumps from NCO GFS v15.3 parallel +fi export RUNDIR="$STMP/RUNDIRS/$PSLOT" export DATAROOT="$RUNDIR/$CDATE/$CDUMP" export ARCDIR="$NOSCRUB/archive/$PSLOT" @@ -102,6 +109,11 @@ export ATARDIR="/NCEPDEV/$HPSS_PROJECT/1year/$USER/$machine/scratch/$PSLOT" export envir=${envir:-"prod"} export NET="gfs" export RUN=${RUN:-${CDUMP:-"gfs"}} +export COMINatmos=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos +export COMOUTatmos=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos +export COMINwave=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave +export COMOUTwave=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave + export jlogfile="${EXPDIR}/logs/jlogfile" export ERRSCRIPT=${ERRSCRIPT:-'eval [[ $err = 0 ]]'} export LOGSCRIPT=${LOGSCRIPT:-""} @@ -200,7 +212,7 @@ export gldas_cyc=00 # run wave component export DO_WAVE=YES -export WAVE_CDUMP="gdas" +export WAVE_CDUMP="both" # Microphysics Options: 99-ZhaoCarr, 8-Thompson; 6-WSM6, 10-MG, 11-GFDL export imp_physics=11 @@ -254,9 +266,11 @@ export binary_diag=".false." export DO_METP="YES" # Run MET+ jobs # Archiving options -export HPSSARCH="NO" # save data to HPSS archive +export HPSSARCH="YES" # save data to HPSS archive export ARCH_CYC=00 # Archive data at this cycle for warm_start capability export ARCH_WARMICFREQ=4 # Archive frequency in days for warm_start capability export ARCH_FCSTICFREQ=1 # Archive frequency in days for gdas and gfs forecast-only capability +export DELETE_COM_IN_ARCHIVE_JOB="YES" # NO=retain ROTDIR. YES default in arch.sh and earc.sh. + echo "END: config.base" diff --git a/parm/config/config.base.nco.static b/parm/config/config.base.nco.static index 183bd9d0b5..b014c7373b 100755 --- a/parm/config/config.base.nco.static +++ b/parm/config/config.base.nco.static @@ -50,7 +50,6 @@ export RTMFIX=$CRTM_FIX # Base directories for various builds export BASE_GIT="/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git" - export BASE_SVN="/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git" # Toggle to turn on/off GFS downstream processing. @@ -75,7 +74,7 @@ export HOMEfv3gfs="$HOMEgfs/sorc/fv3gfs.fd" export HOMEpost="$HOMEgfs" export HOMEobsproc_prep="$BASE_GIT/obsproc/obsproc_prep.iss-46886.fv3gfs" export HOMEobsproc_network="$BASE_GIT/obsproc/obsproc_global.iss-46886.fv3gfs" -export BASE_VERIF="$BASE_SVN/verif/global/tags/vsdb" +export BASE_VERIF="$BASE_GIT/verif/global/tags/vsdb" # CONVENIENT utility scripts and other environment parameters export NCP="/bin/cp -p" @@ -108,6 +107,11 @@ export ATARDIR="/NCEPDEV/$HPSS_PROJECT/1year/$USER/$machine/scratch/$PSLOT" export envir=${envir:-"prod"} export NET="gfs" export RUN=${RUN:-${CDUMP:-"gfs"}} +export COMINatmos=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos +export COMOUTatmos=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos +export COMINwave=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave +export COMOUTwave=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave + export ERRSCRIPT=${ERRSCRIPT:-'eval [[ $err = 0 ]]'} export LOGSCRIPT=${LOGSCRIPT:-""} #export ERRSCRIPT=${ERRSCRIPT:-"err_chk"} diff --git a/parm/config/config.echgres b/parm/config/config.echgres new file mode 100755 index 0000000000..c7b2061545 --- /dev/null +++ b/parm/config/config.echgres @@ -0,0 +1,13 @@ +#!/bin/ksh -x + +########## config.echgres ########## +# regrid full-res forecast for use in ensemble-res analysis generation + +echo "BEGIN: config.echgres" + +# Get task specific resources +. $EXPDIR/config.resources echgres + +export CHGRESFCSTSH=$HOMEgfs/scripts/exglobal_enkf_chgres_fv3gfs.sh.ecf + +echo "END: config.echgres" diff --git a/parm/config/config.metp b/parm/config/config.metp index 68c16d5671..aaea79db62 100755 --- a/parm/config/config.metp +++ b/parm/config/config.metp @@ -52,7 +52,7 @@ if [ "$CDUMP" = "gfs" ] ; then export g2o1_obtype_upper_air="ADPUPA" export g2o1_grid_upper_air="G003" export g2o1_fhr_out_upper_air="6" - export g2o1_obtype_conus_sfc="ONLYSF" + export g2o1_obtype_conus_sfc="ONLYSF ADPUPA" export g2o1_grid_conus_sfc="G104" export g2o1_fhr_out_conus_sfc="3" export g2o1_prepbufr_data_runhpss="YES" diff --git a/parm/config/config.resources b/parm/config/config.resources index 1f24fe11b6..9af606b5e2 100755 --- a/parm/config/config.resources +++ b/parm/config/config.resources @@ -8,7 +8,7 @@ if [ $# -ne 1 ]; then echo "Must specify an input task argument to set resource variables!" echo "argument can be any one of the following:" - echo "anal analcalc analdiag gldas fcst post vrfy metp arch" + echo "anal analcalc analdiag gldas fcst post vrfy metp arch echgres" echo "eobs ediag eomg eupd ecen esfc efcs epos earc" echo "waveinit waveprep wavepostsbs wavegempaksbs waveawipssbs" echo "wavepost waveawips wavestat" @@ -200,6 +200,13 @@ elif [ $step = "metp" ]; then export memory_metp="16384M" fi +elif [ $step = "echgres" ]; then + + export wtime_echgres="01:00:00" + export npe_echgres=3 + export nth_echgres=$npe_node_max + export npe_node_echgres=1 + elif [ $step = "arch" -o $step = "earc" -o $step = "getic" ]; then eval "export wtime_$step='06:00:00'" diff --git a/parm/config/config.vrfy b/parm/config/config.vrfy index df39098cd8..af1df37dfb 100755 --- a/parm/config/config.vrfy +++ b/parm/config/config.vrfy @@ -44,10 +44,10 @@ if [ $VRFYFITS = "YES" ]; then fi if [ $machine = "WCOSS_C" ]; then - export fitdir="$BASE_SVN/verif/global/parafits.fv3nems/batrun" + export fitdir="$BASE_GIT/verif/global/parafits.fv3nems/batrun" export PREPQFITSH="$fitdir/subfits_cray_nems" elif [ $machine = "WCOSS_DELL_P3" ]; then - export fitdir="$BASE_SVN/verif/global/Fit2Obs/ncf-vqc/batrun" + export fitdir="$BASE_GIT/verif/global/Fit2Obs/ncf-vqc/batrun" export PREPQFITSH="$fitdir/subfits_dell_nems" elif [ $machine = "HERA" ]; then #export fitdir="$BASE_GIT/Fit2Obs/batrun" @@ -155,8 +155,8 @@ if [ "$VRFYTRAK" = "YES" ]; then export FHMAX_CYCLONE=$(( FHMAX_GFS<240 ? FHMAX_GFS : 240 )) fi if [ $machine = "HERA" ]; then - export COMROOTp1="/scratch1/NCEPDEV/rstprod/com" - export COMINsyn=${COMINsyn:-${COMROOTp1}/arch/prod/syndat} + export COMROOTp1="/scratch1/NCEPDEV/global/glopara/com" + export COMINsyn=${COMINsyn:-${COMROOTp1}/gfs/prod/syndat} else export COMINsyn=${COMINsyn:-${COMROOT}/gfs/prod/syndat} fi @@ -179,6 +179,8 @@ if [[ "$RUNMOS" == "YES" && "$CDUMP" == "gfs" ]]; then export RUNGFSMOSSH="$HOMEgfs/scripts/run_gfsmos_master.sh.cray" elif [ $machine = "WCOSS_DELL_P3" ] ; then export RUNGFSMOSSH="$HOMEgfs/scripts/run_gfsmos_master.sh.dell" + elif [ $machine = "HERA" ] ; then + export RUNGFSMOSSH="$HOMEgfs/scripts/run_gfsmos_master.sh.hera" else echo "WARNING: MOS package is not enabled on $machine!" export RUNMOS="NO" diff --git a/parm/config/config.wave b/parm/config/config.wave index 9980c4748f..df37ff49d3 100755 --- a/parm/config/config.wave +++ b/parm/config/config.wave @@ -14,13 +14,10 @@ export wave_sys_ver=v1.0.0 # Some others are also used across the workflow in wave component scripts # General runtime labels -# export WAV_MOD_ID=${WAV_MOD_ID:-wave} # generic modID=wave valid for GFSv16 and beyond -# COMPONENTwave stands for model component, in addition to NET/RUN for coupled systems -export COMPONENTwave=${COMPONENTwave:-${RUN}wave} +export CDUMPwave="${CDUMP}wave" # In GFS/GDAS, restart files are generated/read from gdas runs -# Can I use rCDUMP here???? -export COMPONENTRSTwave=${COMPONENTRSTwave:-gdaswave} +export CDUMPRSTwave="gdas" # Grids for wave model # GFSv16 @@ -50,12 +47,10 @@ export wavepostGRD='gnh_10m aoc_9km gsh_15m' # Native grids that will be post-pr export CDATE=${PDY}${cyc} # The start time reflects the number of hindcast hours prior to the cycle initial time -if [ "$CDUMP" = "gdas" ] -then +if [ "$CDUMP" = "gdas" ]; then export FHMAX_WAV=${FHMAX:-9} else - FHMAX_GFS="FHMAX_GFS_${cyc}" - export FHMAX_WAV=${!FHMAX_GFS} + export FHMAX_WAV=$FHMAX_GFS fi export WAVHINDH=${WAVHINDH:-0} export FHMIN_WAV=${FHMIN_WAV:-0} @@ -72,13 +67,11 @@ export FHINCP_WAV=`expr $DTPNT_WAV / 3600` export OUTPARS_WAV="WND CUR ICE HS T01 T02 DIR FP DP PHS PTP PDIR CHA" # Restart file config -if [ "$CDUMP" = "gdas" ] -then +if [ "$CDUMP" = "gdas" ]; then WAVNCYC=4 WAVHCYC=6 FHMAX_WAV_CUR=${FHMAX_WAV_CUR:-48} # RTOFS forecasts only out to 8 days -elif [ ${gfs_cyc} -ne 0 ] -then +elif [ ${gfs_cyc} -ne 0 ]; then FHMAX_WAV_CUR=${FHMAX_WAV_CUR:-192} # RTOFS forecasts only out to 8 days WAVHCYC=`expr 24 / ${gfs_cyc}` else diff --git a/scripts/exwave_init.sh b/scripts/exgfs_wave_init.sh similarity index 94% rename from scripts/exwave_init.sh rename to scripts/exgfs_wave_init.sh index 848222d5ed..0183c5bfa9 100755 --- a/scripts/exwave_init.sh +++ b/scripts/exgfs_wave_init.sh @@ -14,6 +14,7 @@ # Script history log: # 2019-05-06 J-Henrique Alves First Version. # 2019-11-02 J-Henrique Alves Ported to global-workflow. +# 2020-06-10 J-Henrique Alves Ported to R&D machine Hera # # $Id$ # @@ -36,7 +37,7 @@ msg="HAS BEGUN on `hostname`" postmsg "$jlogfile" "$msg" - msg="Starting MWW3 INIT CONFIG SCRIPT for $COMPONENTwave" + msg="Starting MWW3 INIT CONFIG SCRIPT for ${CDUMP}wave" postmsg "$jlogfile" "$msg" set +x @@ -45,7 +46,7 @@ echo ' *** MWW3 INIT CONFIG SCRIPT ***' echo ' ********************************' echo ' Initial configuration script' - echo " Model identifier : $COMPONENTwave" + echo " Model identifier : ${CDUMP}wave" echo ' ' echo "Starting at : `date`" echo ' ' @@ -89,12 +90,12 @@ for grdID in ${grdALL} do - if [ -f "$COMIN/rundata/${COMPONENTwave}.mod_def.${grdID}" ] + if [ -f "$COMIN/rundata/${CDUMP}wave.mod_def.${grdID}" ] then set +x echo " Mod def file for $grdID found in ${COMIN}/rundata. copying ...." [[ "$LOUD" = YES ]] && set -x - cp $COMIN/rundata/${COMPONENTwave}.mod_def.${grdID} mod_def.$grdID + cp $COMIN/rundata/${CDUMP}wave.mod_def.${grdID} mod_def.$grdID else set +x @@ -195,7 +196,7 @@ for grdID in ${grdALL} do - if [ -f ${COMOUT}/rundata/${COMPONENTwave}.mod_def.$grdID ] + if [ -f ${COMOUT}/rundata/${CDUMP}wave.mod_def.$grdID ] then set +x echo ' ' @@ -230,7 +231,6 @@ echo ' ' [[ "$LOUD" = YES ]] && set -x - msg="$job completed normally" - postmsg "$jlogfile" "$msg" + exit $err # End of MWW3 init config script ------------------------------------------- # diff --git a/scripts/exwave_post_sbs.sh b/scripts/exgfs_wave_post_sbs.sh similarity index 86% rename from scripts/exwave_post_sbs.sh rename to scripts/exgfs_wave_post_sbs.sh index 8d637f0b2b..fe37a689bf 100755 --- a/scripts/exwave_post_sbs.sh +++ b/scripts/exgfs_wave_post_sbs.sh @@ -19,7 +19,8 @@ # wave_tar.sh : tars the spectral and bulletin multiple files # # Script history log: -# 2019-12-06 J-Henrique Alves First Version adapted from HTolman post.sh 2007 +# 2019-12-06 J-Henrique Alves: First Version adapted from HTolman post.sh 2007 +# 2020-06-10 J-Henrique Alves: Porting to R&D machine Hera # # $Id$ # @@ -38,6 +39,10 @@ export LOUD=${LOUD:-YES}; [[ $LOUD = yes ]] && export LOUD=YES [[ "$LOUD" != YES ]] && set +x + # Set wave model ID tag to include member number + # if ensemble; waveMEMB var empty in deterministic + export WAV_MOD_TAG=${CDUMP}wave${waveMEMB} + cd $DATA postmsg "$jlogfile" "HAS BEGUN on `hostname`" @@ -137,13 +142,13 @@ # Copy model definition files for grdID in $waveGRD $wavesbsGRD $wavepostGRD $waveinterpGRD $waveuoutpGRD do - if [ -f "$COMIN/rundata/${COMPONENTwave}.mod_def.${grdID}" ] + if [ -f "$COMIN/rundata/${CDUMP}wave.mod_def.${grdID}" ] then set +x echo " Mod def file for $grdID found in ${COMIN}/rundata. copying ...." [[ "$LOUD" = YES ]] && set -x - cp -f $COMIN/rundata/${COMPONENTwave}.mod_def.${grdID} mod_def.$grdID + cp -f $COMIN/rundata/${CDUMP}wave.mod_def.${grdID} mod_def.$grdID iloop=`expr $iloop + 1` fi done @@ -516,49 +521,7 @@ export GRDIDATA=${DATA}/output_$YMDHMS ln -fs $DATA/mod_def.${waveuoutpGRD} mod_def.ww3 - if [ $fhr = $fhrp ] - then - iwait=0 - pfile=$COMIN/rundata/${WAV_MOD_TAG}.out_pnt.${waveuoutpGRD}.${YMD}.${HMS} - while [ ! -s ${pfile} ]; do sleep 10; ((iwait++)) && ((iwait==$iwaitmax)) && break ; echo $iwait; done - if [ $iwait -eq $iwaitmax ]; then - echo " FATAL ERROR : NO RAW POINT OUTPUT FILE out_pnt.$waveuoutpGRD - echo ' ' - [[ "$LOUD" = YES ]] && set -x - postmsg "$jlogfile" "FATAL ERROR : NO RAW POINT OUTPUT FILE out_pnt.$waveuoutpGRD - err=6; export err;${errchk} - exit $err - fi - ln -fs ${pfile} ./out_pnt.${waveuoutpGRD} - - if [ "$DOSPC_WAV" = 'YES' ] - then - export dtspec=3600. - for buoy in $buoys - do - echo "$USHwave/wave_outp_spec.sh $buoy $ymdh spec > spec_$buoy.out 2>&1" >> ${fcmdnow} - done - fi - - if [ "$DOIBP_WAV" = 'YES' ] - then - export dtspec=3600. - for buoy in $ibpoints - do - echo "$USHwave/wave_outp_spec.sh $buoy $ymdh ibp > ibp_$buoy.out 2>&1" >> ${fcmdnow} - done - fi - - if [ "$DOBLL_WAV" = 'YES' ] - then - export dtspec=3600. - for buoy in $buoys - do - echo "$USHwave/wave_outp_spec.sh $buoy $ymdh bull > bull_$buoy.out 2>&1" >> ${fcmdnow} - done - fi - - fi +# Gridded data (main part, need to be run side-by-side with forecast if [ $fhr = $fhrg ] then @@ -588,7 +551,7 @@ glo_15mxt) ymdh_int=`$NDATE -${WAVHINDH} $ymdh`; dt_int=3600.; n_int=9999 ;; glo_30mxt) ymdh_int=`$NDATE -${WAVHINDH} $ymdh`; dt_int=3600.; n_int=9999 ;; esac - echo "$USHwave/wave_grid_interp_sbs.sh $grdID $ymdh_int $dt_int $n_int > grint_$grdID.out 2>&1" >> ${fcmdigrd}.${nigrd} + echo "$USHwave/wave_grid_interp_sbs.sh $grdID $ymdh_int $dt_int $n_int > grint_$grdID.out 2>&1" >> ${fcmdigrd}.${nigrd} if [ "$DOGRB_WAV" = 'YES' ] then gribFL=\'`echo ${OUTPARS_WAV}`\' @@ -596,9 +559,10 @@ glo_15mxt) GRDNAME='global' ; GRDRES=0p25 ; GRIDNR=255 ; MODNR=11 ;; glo_30mxt) GRDNAME='global' ; GRDRES=0p50 ; GRIDNR=255 ; MODNR=11 ;; esac - echo "$USHwave/wave_grib2_sbs.sh $grdID $GRIDNR $MODNR $ymdh $fhr $GRDNAME $GRDRES $gribFL > grib_$grdID.out 2>&1" >> ${fcmdigrd}.${nigrd} + echo "$USHwave/wave_grib2_sbs.sh $grdID $GRIDNR $MODNR $ymdh $fhr $GRDNAME $GRDRES $gribFL > grib_$grdID.out 2>&1" >> ${fcmdigrd}.${nigrd} fi - echo "${fcmdigrd}.${nigrd}" >> ${fcmdnow} + echo "pwd" >> ${fcmdnow} + echo "${GRIBDATA}/${fcmdigrd}.${nigrd}" >> ${fcmdnow} chmod 744 ${fcmdigrd}.${nigrd} nigrd=$((nigrd+1)) done @@ -620,12 +584,84 @@ so_20m) GRDNAME='antarc' ; GRDRES=0p33 ; GRIDNR=255 ; MODNR=11 ;; glo_15mxt) GRDNAME='global' ; GRDRES=0p25 ; GRIDNR=255 ; MODNR=11 ;; esac - echo "$USHwave/wave_grib2_sbs.sh $grdID $GRIDNR $MODNR $ymdh $fhr $GRDNAME $GRDRES $gribFL > grib_$grdID.out 2>&1" >> ${fcmdnow} + echo "$USHwave/wave_grib2_sbs.sh $grdID $GRIDNR $MODNR $ymdh $fhr $GRDNAME $GRDRES $gribFL > grib_$grdID.out 2>&1" >> ${fcmdnow} done fi fi +# Point output part (can be split or become meta-task to reduce resource usage) + if [ $fhr = $fhrp ] + then + iwait=0 + pfile=$COMIN/rundata/${WAV_MOD_TAG}.out_pnt.${waveuoutpGRD}.${YMD}.${HMS} + while [ ! -s ${pfile} ]; do sleep 10; ((iwait++)) && ((iwait==$iwaitmax)) && break ; echo $iwait; done + if [ $iwait -eq $iwaitmax ]; then + echo " FATAL ERROR : NO RAW POINT OUTPUT FILE out_pnt.$waveuoutpGRD + echo ' ' + [[ "$LOUD" = YES ]] && set -x + postmsg "$jlogfile" "FATAL ERROR : NO RAW POINT OUTPUT FILE out_pnt.$waveuoutpGRD + err=6; export err;${errchk} + exit $err + fi + ln -fs ${pfile} ./out_pnt.${waveuoutpGRD} + + if [ "$DOSPC_WAV" = 'YES' ] + then + export dtspec=3600. + for buoy in $buoys + do + echo "$USHwave/wave_outp_spec.sh $buoy $ymdh spec > spec_$buoy.out 2>&1" >> ${fcmdnow} + done + fi + + if [ "$DOIBP_WAV" = 'YES' ] + then + export dtspec=3600. + for buoy in $ibpoints + do + echo "$USHwave/wave_outp_spec.sh $buoy $ymdh ibp > ibp_$buoy.out 2>&1" >> ${fcmdnow} + done + fi + + if [ "$DOBLL_WAV" = 'YES' ] + then + export dtspec=3600. + for buoy in $buoys + do + echo "$USHwave/wave_outp_spec.sh $buoy $ymdh bull > bull_$buoy.out 2>&1" >> ${fcmdnow} + done + fi + + fi + + if [ ${CFP_MP:-"NO"} = "YES" ]; then + nfile=0 + ifile=0 + iline=1 + ifirst='yes' + nlines=$( wc -l ${fcmdnow} | awk '{print $1}' ) + while [ $iline -le $nlines ]; do + line=$( sed -n ''$iline'p' ${fcmdnow} ) + if [ -z "$line" ]; then + break + else + if [ "$ifirst" = 'yes' ]; then + echo "#!/bin/sh" > cmdmfile.$nfile + echo "$nfile cmdmfile.$nfile" >> cmdmprog + chmod 744 cmdmfile.$nfile + fi + echo $line >> cmdmfile.$nfile + nfile=$(( nfile + 1 )) + if [ $nfile -eq $NTASKS ]; then + nfile=0 + ifirst='no' + fi + iline=$(( iline + 1 )) + fi + done + fi + wavenproc=`wc -l ${fcmdnow} | awk '{print $1}'` wavenproc=`echo $((${wavenproc}<${NTASKS}?${wavenproc}:${NTASKS}))` @@ -638,7 +674,11 @@ if [ "$wavenproc" -gt '1' ] then - ${wavempexec} ${wavenproc} ${wave_mpmd} ${fcmdnow} + if [ ${CFP_MP:-"NO"} = "YES" ]; then + ${wavempexec} -n ${wavenproc} ${wave_mpmd} cmdmprog + else + ${wavempexec} ${wavenproc} ${wave_mpmd} ${fcmdnow} + fi exit=$? else chmod 744 ${fcmdnow} @@ -700,15 +740,31 @@ # 6.b Spectral data files + if [ ${CFP_MP:-"NO"} = "YES" ]; then nm=0; fi + if [ "$DOIBP_WAV" = 'YES' ] then - echo "$USHwave/wave_tar.sh $WAV_MOD_TAG ibp $Nibp > ${WAV_MOD_TAG}_ibp_tar.out 2>&1 " >> cmdtarfile + if [ ${CFP_MP:-"NO"} = "YES" ]; then + echo "$nm $USHwave/wave_tar.sh $WAV_MOD_TAG ibp $Nibp > ${WAV_MOD_TAG}_ibp_tar.out 2>&1 " >> cmdtarfile + nm=$(( nm + 1 )) + else + echo "$USHwave/wave_tar.sh $WAV_MOD_TAG ibp $Nibp > ${WAV_MOD_TAG}_ibp_tar.out 2>&1 " >> cmdtarfile + fi fi if [ "$DOSPC_WAV" = 'YES' ] then - echo "$USHwave/wave_tar.sh $WAV_MOD_TAG spec $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile - echo "$USHwave/wave_tar.sh $WAV_MOD_TAG bull $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile - echo "$USHwave/wave_tar.sh $WAV_MOD_TAG cbull $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile + if [ ${CFP_MP:-"NO"} = "YES" ]; then + echo "$nm $USHwave/wave_tar.sh $WAV_MOD_TAG spec $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile + nm=$(( nm + 1 )) + echo "$nm $USHwave/wave_tar.sh $WAV_MOD_TAG bull $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile + nm=$(( nm + 1 )) + echo "$nm $USHwave/wave_tar.sh $WAV_MOD_TAG cbull $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile + nm=$(( nm + 1 )) + else + echo "$USHwave/wave_tar.sh $WAV_MOD_TAG spec $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile + echo "$USHwave/wave_tar.sh $WAV_MOD_TAG bull $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile + echo "$USHwave/wave_tar.sh $WAV_MOD_TAG cbull $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile + fi fi wavenproc=`wc -l cmdtarfile | awk '{print $1}'` @@ -723,7 +779,11 @@ if [ "$wavenproc" -gt '1' ] then - ${wavempexec} ${wavenproc} ${wave_mpmd} cmdtarfile + if [ ${CFP_MP:-"NO"} = "YES" ]; then + ${wavempexec} -n ${wavenproc} ${wave_mpmd} cmdtarfile + else + ${wavempexec} ${wavenproc} ${wave_mpmd} cmdtarfile + fi exit=$? else chmod 744 cmdtarfile diff --git a/scripts/exwave_prep.sh b/scripts/exgfs_wave_prep.sh similarity index 95% rename from scripts/exwave_prep.sh rename to scripts/exgfs_wave_prep.sh index 98711b574f..256bdfd146 100755 --- a/scripts/exwave_prep.sh +++ b/scripts/exgfs_wave_prep.sh @@ -30,6 +30,7 @@ # Nov2012 JHAlves - Transitioning to WCOSS # # Apr2019 JHAlves - Transitioning to GEFS workflow # # Nov2019 JHAlves - Merging wave scripts to global workflow # +# Jun2020 JHAlves - Porting to R&D machine Hera # # # # WAV_MOD_ID and WAV_MOD_TAG replace modID. WAV_MOD_TAG # # is used for ensemble-specific I/O. For deterministic # @@ -45,6 +46,10 @@ export LOUD=${LOUD:-YES}; [[ $LOUD = yes ]] && export LOUD=YES [[ "$LOUD" != YES ]] && set +x + # Set wave model ID tag to include member number + # if ensemble; waveMEMB var empty in deterministic + export WAV_MOD_TAG=${CDUMP}wave${waveMEMB} + cd $DATA mkdir outtmp @@ -65,8 +70,8 @@ echo ' ' [[ "$LOUD" = YES ]] && set -x -# export MP_PGMMODEL=mpmd -# export MP_CMDFILE=./cmdfile + # export MP_PGMMODEL=mpmd + # export MP_CMDFILE=./cmdfile if [ "$INDRUN" = 'no' ] then @@ -75,19 +80,19 @@ FHMAX_WAV=${FHMAX_WAV:-384} fi -# 0.b Date and time stuff + # 0.b Date and time stuff -# Beginning time for outpupt may differ from SDATE if DOIAU=YES + # Beginning time for outpupt may differ from SDATE if DOIAU=YES export date=$PDY export YMDH=${PDY}${cyc} -# Roll back $IAU_FHROT hours of DOIAU=YES + # Roll back $IAU_FHROT hours of DOIAU=YES IAU_FHROT=3 if [ "$DOIAU" = "YES" ] then WAVHINDH=$(( WAVHINDH + IAU_FHROT )) fi -# Set time stamps for model start and output -# For special case when IAU is on but this is an initial half cycle + # Set time stamps for model start and output + # For special case when IAU is on but this is an initial half cycle if [ $IAU_OFFSET = 0 ]; then ymdh_beg=$YMDH else @@ -99,14 +104,14 @@ ymdh_beg_out=$YMDH time_beg_out="`echo $ymdh_beg_out | cut -c1-8` `echo $ymdh_beg_out | cut -c9-10`0000" -# Restart file times (already has IAU_FHROT in WAVHINDH) + # Restart file times (already has IAU_FHROT in WAVHINDH) RSTOFFSET=$(( ${WAVHCYC} - ${WAVHINDH} )) -# Update restart time is added offset relative to model start + # Update restart time is added offset relative to model start RSTOFFSET=$(( ${RSTOFFSET} + ${RSTIOFF_WAV} )) ymdh_rst_ini=`$NDATE ${RSTOFFSET} $YMDH` RST2OFFSET=$(( DT_2_RST_WAV / 3600 )) ymdh_rst2_ini=`$NDATE ${RST2OFFSET} $YMDH` # DT2 relative to first-first-cycle restart file -# First restart file for cycling + # First restart file for cycling time_rst_ini="`echo $ymdh_rst_ini | cut -c1-8` `echo $ymdh_rst_ini | cut -c9-10`0000" if [ ${DT_1_RST_WAV} = 1 ]; then time_rst1_end=${time_rst_ini} @@ -115,11 +120,11 @@ ymdh_rst1_end=`$NDATE $RST1OFFSET $ymdh_rst_ini` time_rst1_end="`echo $ymdh_rst1_end | cut -c1-8` `echo $ymdh_rst1_end | cut -c9-10`0000" fi -# Second restart file for checkpointing + # Second restart file for checkpointing if [ "${RSTTYPE_WAV}" = "T" ]; then time_rst2_ini="`echo $ymdh_rst2_ini | cut -c1-8` `echo $ymdh_rst2_ini | cut -c9-10`0000" time_rst2_end=$time_end -# Condition for gdas run or any other run when checkpoint stamp is > ymdh_end + # Condition for gdas run or any other run when checkpoint stamp is > ymdh_end if [ $ymdh_rst2_ini -ge $ymdh_end ]; then ymdh_rst2_ini=`$NDATE 3 $ymdh_end` time_rst2_ini="`echo $ymdh_rst2_ini | cut -c1-8` `echo $ymdh_rst2_ini | cut -c9-10`0000" @@ -140,16 +145,16 @@ echo ' ' [[ "$LOUD" = YES ]] && set -x -# Script will run only if pre-defined NTASKS -# The actual work is distributed over these tasks. + # Script will run only if pre-defined NTASKS + # The actual work is distributed over these tasks. if [ -z ${NTASKS} ] then echo "FATAL ERROR: Requires NTASKS to be set " err=1; export err;${errchk} fi -# --------------------------------------------------------------------------- # -# 1. Get files that are used by most child scripts + # --------------------------------------------------------------------------- # + # 1. Get files that are used by most child scripts set +x echo 'Preparing input files :' @@ -157,7 +162,7 @@ echo ' ' [[ "$LOUD" = YES ]] && set -x -# 1.a Model definition files + # 1.a Model definition files rm -f cmdfile touch cmdfile @@ -171,12 +176,12 @@ for grdID in $grdINP $waveGRD do - if [ -f "$COMIN/rundata/${COMPONENTwave}.mod_def.${grdID}" ] + if [ -f "$COMIN/rundata/${CDUMP}wave.mod_def.${grdID}" ] then set +x echo " Mod def file for $grdID found in ${COMIN}/rundata. copying ...." [[ "$LOUD" = YES ]] && set -x - cp $COMIN/rundata/${COMPONENTwave}.mod_def.${grdID} mod_def.$grdID + cp $COMIN/rundata/${CDUMP}wave.mod_def.${grdID} mod_def.$grdID else msg="FATAL ERROR: NO MODEL DEFINITION FILE" @@ -194,7 +199,7 @@ fi done -# 1.b Netcdf Preprocessor template files + # 1.b Netcdf Preprocessor template files if [ "$WW3ATMINP" = 'YES' ]; then itype="$itype wind" ; fi if [ "$WW3ICEINP" = 'YES' ]; then itype="$itype ice" ; fi if [ "$WW3CURINP" = 'YES' ]; then itype="$itype cur" ; fi @@ -749,7 +754,7 @@ cat $file >> cur.${WAVECUR_FID} done - cp -f cur.${WAVECUR_FID} ${COMOUT}/rundata/${COMPONENTwave}.${WAVECUR_FID}.$cycle.cur + cp -f cur.${WAVECUR_FID} ${COMOUT}/rundata/${CDUMP}wave.${WAVECUR_FID}.$cycle.cur else echo ' ' @@ -1019,7 +1024,6 @@ echo ' ' [[ "$LOUD" = YES ]] && set -x - msg="$job completed normally" - postmsg "$jlogfile" "$msg" + exit $err # End of MWW3 preprocessor script ------------------------------------------- # diff --git a/scripts/exglobal_fcst_nemsfv3gfs.sh b/scripts/exglobal_fcst_nemsfv3gfs.sh index 6f60bbc51d..66f0d81da1 100755 --- a/scripts/exglobal_fcst_nemsfv3gfs.sh +++ b/scripts/exglobal_fcst_nemsfv3gfs.sh @@ -40,6 +40,7 @@ machine=${machine:-"WCOSS_C"} machine=$(echo $machine | tr '[a-z]' '[A-Z]') # Cycling and forecast hour specific parameters +CDUMPwave="${CDUMP}wave" CASE=${CASE:-C768} CDATE=${CDATE:-2017032500} CDUMP=${CDUMP:-gdas} @@ -148,10 +149,21 @@ if [ ! -d $DATA ]; then fi cd $DATA || exit 8 mkdir -p $DATA/INPUT + +if [ $cplwav = ".true." ]; then + if [ $CDUMP = "gdas" ]; then + RSTDIR_WAVE=$ROTDIR/${CDUMP}.${PDY}/${cyc}/wave/restart + else + RSTDIR_WAVE=${RSTDIR_WAVE:-$ROTDIR/${CDUMP}.${PDY}/${cyc}/wave/restart} + fi + if [ ! -d $RSTDIR_WAVE ]; then mkdir -p $RSTDIR_WAVE ; fi + $NLN $RSTDIR_WAVE restart_wave +fi + if [ $CDUMP = "gfs" -a $rst_invt1 -gt 0 ]; then - RSTDIR_TMP=${RSTDIR:-$ROTDIR}/${CDUMP}.${PDY}/${cyc}/RERUN_RESTART - if [ ! -d $RSTDIR_TMP ]; then mkdir -p $RSTDIR_TMP ; fi - $NLN $RSTDIR_TMP RESTART + RSTDIR_ATM=${RSTDIR:-$ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos/RERUN_RESTART + if [ ! -d $RSTDIR_ATM ]; then mkdir -p $RSTDIR_ATM ; fi + $NLN $RSTDIR_ATM RESTART else mkdir -p $DATA/RESTART fi @@ -159,7 +171,7 @@ fi #------------------------------------------------------- # determine if restart IC exists to continue from a previous forecast RERUN="NO" -filecount=$(find $RSTDIR_TMP -type f | wc -l) +filecount=$(find $RSTDIR_ATM -type f | wc -l) if [ $CDUMP = "gfs" -a $rst_invt1 -gt 0 -a $FHMAX -gt $rst_invt1 -a $filecount -gt 10 ]; then reverse=$(echo "${restart_interval[@]} " | tac -s ' ') for xfh in $reverse ; do @@ -167,8 +179,8 @@ if [ $CDUMP = "gfs" -a $rst_invt1 -gt 0 -a $FHMAX -gt $rst_invt1 -a $filecount - SDATE=$($NDATE +$yfh $CDATE) PDYS=$(echo $SDATE | cut -c1-8) cycs=$(echo $SDATE | cut -c9-10) - flag1=$RSTDIR_TMP/${PDYS}.${cycs}0000.coupler.res - flag2=$RSTDIR_TMP/coupler.res + flag1=$RSTDIR_ATM/${PDYS}.${cycs}0000.coupler.res + flag2=$RSTDIR_ATM/coupler.res if [ -s $flag1 ]; then CDATE_RST=$SDATE [[ $RERUN = "YES" ]] && break @@ -191,13 +203,13 @@ else rprefix=enkf$rCDUMP memchar=mem$(printf %03i $MEMBER) fi -memdir=$ROTDIR/${prefix}.$PDY/$cyc/$memchar +memdir=$ROTDIR/${prefix}.$PDY/$cyc/atmos/$memchar if [ ! -d $memdir ]; then mkdir -p $memdir; fi GDATE=$($NDATE -$assim_freq $CDATE) gPDY=$(echo $GDATE | cut -c1-8) gcyc=$(echo $GDATE | cut -c9-10) -gmemdir=$ROTDIR/${rprefix}.$gPDY/$gcyc/$memchar +gmemdir=$ROTDIR/${rprefix}.$gPDY/$gcyc/atmos/$memchar sCDATE=$($NDATE -3 $CDATE) if [[ "$DOIAU" = "YES" ]]; then @@ -311,12 +323,14 @@ EOF export warm_start=".true." PDYT=$(echo $CDATE_RST | cut -c1-8) cyct=$(echo $CDATE_RST | cut -c9-10) - for file in $(ls $RSTDIR_TMP/${PDYT}.${cyct}0000.*); do + for file in $(ls $RSTDIR_ATM/${PDYT}.${cyct}0000.*); do file2=$(echo $(basename $file)) file2=$(echo $file2 | cut -d. -f3-) $NLN $file $DATA/INPUT/$file2 done + hour_rst=`$NHOUR $CDATE_RST $CDATE` + IAU_FHROT=$((IAU_OFFSET+hour_rst)) if [ $DOIAU = "YES" ]; then IAUFHRS=-1 IAU_DELTHRS=0 @@ -395,37 +409,40 @@ if [ $IAER -gt 0 ] ; then done fi -#### Copy over WW3 inputs +#-------------wavewave---------------------- if [ $cplwav = ".true." ]; then -# Link WW3 files - for file in $(ls $COMINWW3/${COMPONENTwave}.${PDY}/${cyc}/rundata/rmp_src_to_dst_conserv_*) ; do + + for file in $(ls $COMINwave/rundata/rmp_src_to_dst_conserv_*) ; do $NLN $file $DATA/ done - $NLN $COMINWW3/${COMPONENTwave}.${PDY}/${cyc}/rundata/ww3_multi.${COMPONENTwave}${WAV_MEMBER}.${cycle}.inp $DATA/ww3_multi.inp - # Check for expected wave grids for this run + $NLN $COMINwave/rundata/ww3_multi.${CDUMPwave}${WAV_MEMBER}.${cycle}.inp $DATA/ww3_multi.inp + array=($WAVECUR_FID $WAVEICE_FID $WAVEWND_FID $waveuoutpGRD $waveGRD $waveesmfGRD $wavesbsGRD $wavepostGRD $waveinterpGRD) grdALL=`printf "%s\n" "${array[@]}" | sort -u | tr '\n' ' '` + for wavGRD in ${grdALL}; do - # Wave IC (restart) file must exist for warm start on this cycle, if not wave model starts from flat ocean - # For IAU needs to use sPDY for adding IAU backup of 3h - $NLN $COMINWW3/${COMPONENTwave}.${PDY}/${cyc}/rundata/${COMPONENTwave}.mod_def.$wavGRD $DATA/mod_def.$wavGRD + $NLN $COMINwave/rundata/${CDUMPwave}.mod_def.$wavGRD $DATA/mod_def.$wavGRD done - # Wave IC (restart) interval assumes 4 daily cycles (restarts only written by gdas cycle) - # WAVHCYC needs to be consistent with restart write interval in ww3_multi.inp or will FAIL - WAVHCYC=${WAVHCYC:-6} - WRDATE=`$NDATE -${WAVHCYC} $CDATE` - WRPDY=`echo $WRDATE | cut -c1-8` - WRcyc=`echo $WRDATE | cut -c9-10` - WRDIR=$COMINWW3/${COMPONENTRSTwave}.${WRPDY}/${WRcyc}/restart - datwave=$COMOUTWW3/${COMPONENTwave}.${PDY}/${cyc}/rundata/ - wavprfx=${COMPONENTwave}${WAV_MEMBER} + + export WAVHCYC=${WAVHCYC:-6} + export WRDATE=`$NDATE -${WAVHCYC} $CDATE` + export WRPDY=`echo $WRDATE | cut -c1-8` + export WRcyc=`echo $WRDATE | cut -c9-10` + export WRDIR=${ROTDIR}/${CDUMPRSTwave}.${WRPDY}/${WRcyc}/wave/restart + export datwave=$COMOUTwave/rundata + export wavprfx=${CDUMPwave}${WAV_MEMBER} + for wavGRD in $waveGRD ; do - # Link wave IC for current cycle - $NLN ${WRDIR}/${sPDY}.${scyc}0000.restart.${wavGRD} $DATA/restart.${wavGRD} + if [ $RERUN = "NO" ]; then + $NLN ${WRDIR}/${sPDY}.${scyc}0000.restart.${wavGRD} $DATA/restart.${wavGRD} + else + $NLN ${RSTDIR_WAVE}/${PDYT}.${cyct}0000.restart.${wavGRD} $DATA/restart.${wavGRD} + fi eval $NLN $datwave/${wavprfx}.log.${wavGRD}.${PDY}${cyc} log.${wavGRD} done + if [ "$WW3ICEINP" = "YES" ]; then - wavicefile=$COMINWW3/${COMPONENTwave}.${PDY}/${cyc}/rundata/${COMPONENTwave}.${WAVEICE_FID}.${cycle}.ice + wavicefile=$COMINwave/rundata/${CDUMPwave}.${WAVEICE_FID}.${cycle}.ice if [ ! -f $wavicefile ]; then echo "ERROR: WW3ICEINP = ${WW3ICEINP}, but missing ice file" echo "Abort!" @@ -433,8 +450,9 @@ if [ $cplwav = ".true." ]; then fi $NLN ${wavicefile} $DATA/ice.${WAVEICE_FID} fi + if [ "$WW3CURINP" = "YES" ]; then - wavcurfile=$COMINWW3/${COMPONENTwave}.${PDY}/${cyc}/rundata/${COMPONENTwave}.${WAVECUR_FID}.${cycle}.cur + wavcurfile=$COMINwave/rundata/${CDUMPwave}.${WAVECUR_FID}.${cycle}.cur if [ ! -f $wavcurfile ]; then echo "ERROR: WW3CURINP = ${WW3CURINP}, but missing current file" echo "Abort!" @@ -442,10 +460,12 @@ if [ $cplwav = ".true." ]; then fi $NLN $wavcurfile $DATA/current.${WAVECUR_FID} fi -# Link output files + + # Link output files cd $DATA eval $NLN $datwave/${wavprfx}.log.mww3.${PDY}${cyc} log.mww3 -# Loop for gridded output (uses FHINC) + + # Loop for gridded output (uses FHINC) fhr=$FHMIN_WAV while [ $fhr -le $FHMAX_WAV ]; do YMDH=`$NDATE $fhr $CDATE` @@ -460,7 +480,8 @@ if [ $cplwav = ".true." ]; then fi fhr=$((fhr+FHINC)) done -# Loop for point output (uses DTPNT) + + # Loop for point output (uses DTPNT) fhr=$FHMIN_WAV while [ $fhr -le $FHMAX_WAV ]; do YMDH=`$NDATE $fhr $CDATE` @@ -470,7 +491,9 @@ if [ $cplwav = ".true." ]; then FHINC=$FHINCP_WAV fhr=$((fhr+FHINC)) done -fi + +fi #cplwav=true +#-------------wavewave---------------------- # inline post fix files if [ $WRITE_DOPOST = ".true." ]; then @@ -1294,7 +1317,6 @@ if [ $SEND = "YES" ]; then if [ $CDUMP = "gdas" -a $rst_invt1 -gt 0 ]; then cd $DATA/RESTART mkdir -p $memdir/RESTART - for rst_int in $restart_interval ; do if [ $rst_int -ge 0 ]; then RDATE=$($NDATE +$rst_int $CDATE) @@ -1303,14 +1325,6 @@ if [ $SEND = "YES" ]; then for file in $(ls ${rPDY}.${rcyc}0000.*) ; do $NCP $file $memdir/RESTART/$file done - if [ $cplwav = ".true." ]; then - WRDIR=$COMOUTWW3/${COMPONENTRSTwave}.${PDY}/${cyc}/restart - mkdir -p ${WRDIR} - for wavGRD in $waveGRD ; do - # Copy wave IC for the next cycle - $NCP $DATA/${rPDY}.${rcyc}0000.restart.${wavGRD} ${WRDIR} - done - fi fi done if [ $DOIAU = "YES" ] || [ $DOIAU_coldstart = "YES" ]; then @@ -1325,18 +1339,8 @@ if [ $SEND = "YES" ]; then for file in $(ls ${rPDY}.${rcyc}0000.*) ; do $NCP $file $memdir/RESTART/$file done - if [ $cplwav = ".true." ]; then - WRDIR=$COMOUTWW3/${COMPONENTRSTwave}.${PDY}/${cyc}/restart/ - mkdir -p ${WRDIR} - for wavGRD in $waveGRD ; do - # Copy wave IC for the next cycle - $NCP $DATA/${rPDY}.${rcyc}0000.restart.${wavGRD} ${WRDIR} - done - fi fi - fi - fi #------------------------------------------------------------------ diff --git a/scripts/run_gfsmos_master.sh.cray b/scripts/run_gfsmos_master.sh.cray index e35cf6cb93..78fd4b14d8 100755 --- a/scripts/run_gfsmos_master.sh.cray +++ b/scripts/run_gfsmos_master.sh.cray @@ -73,7 +73,7 @@ else exit fi -export range=both +export range=${range:-"both"} export skipmodel=n export skipprep=n export stnonly=Y diff --git a/scripts/run_gfsmos_master.sh.dell b/scripts/run_gfsmos_master.sh.dell index b1ed325a78..b90d6434ed 100755 --- a/scripts/run_gfsmos_master.sh.dell +++ b/scripts/run_gfsmos_master.sh.dell @@ -55,7 +55,7 @@ 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.3 2>/dev/null -module load prod_util/1.1.3 2>/dev/null +module load prod_util/1.1.4 2>/dev/null module load CFP/2.0.1 2>/dev/null module use -a /gpfs/dell1/nco/ops/nwpara/modulefiles/compiler_prod/ips/18.0.1 @@ -85,7 +85,8 @@ export STMPROOT=$RUNDIR/gfsmos.$PDY export DATAROOT=$STMPROOT ##export MODELROOT=/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git/gfsmos export MODELROOT=/gpfs/dell2/mdl/mdlstat/noscrub/usr/Scott.Scallion/gfsv16 -export MODELDIR=$MODELROOT/gfsmos.v5.2.0.1 +#export MODELDIR=$MODELROOT/gfsmos.v5.2.0.1 +export MODELDIR=$MODELROOT/gfsmos.v5.2.0.1-restructure export CODEDIR=/gpfs/dell1/nco/ops/nwpara/mos_shared.v2.6.5 #-------------------------------- @@ -139,7 +140,7 @@ export prevday=`$NDATE -24 ${PDY}00 | cut -c1-8` ##fi # ERIC ENGLE 05/30/2018 - PATCH FOR FV3GFS WINTER 17/18 PARALLEL -export range=both +export range=${range:-"both"} #if [ $cyc -eq 00 -o $cyc -eq 12 ]; then # if [ $cyc -eq 00 ]; then diff --git a/scripts/run_gfsmos_master.sh.hera b/scripts/run_gfsmos_master.sh.hera index 2037cddbff..b8a69ab673 100755 --- a/scripts/run_gfsmos_master.sh.hera +++ b/scripts/run_gfsmos_master.sh.hera @@ -163,7 +163,7 @@ export prevday=`$NDATE -24 ${PDY}00 | cut -c1-8` ##fi # ERIC ENGLE 05/30/2018 - PATCH FOR FV3GFS WINTER 17/18 PARALLEL -export range=short +export range=${range:-"both"} #if [ $cyc -eq 00 -o $cyc -eq 12 ]; then # if [ $cyc -eq 00 ]; then diff --git a/sorc/build_ufs_utils.sh b/sorc/build_ufs_utils.sh index 464f3c27ae..292145d764 100755 --- a/sorc/build_ufs_utils.sh +++ b/sorc/build_ufs_utils.sh @@ -11,7 +11,5 @@ cd ufs_utils.fd/sorc ./build_all_ufs_utils.sh -./link_fixdirs.sh emc $target - exit diff --git a/sorc/checkout.sh b/sorc/checkout.sh index e067fa7d04..c188bd86d0 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -1,6 +1,23 @@ #!/bin/sh set -xue +while getopts "o" option; +do + case $option in + o) + echo "Received -o flag for optional checkout of GTG, will check out GTG with EMC_post" + checkout_gtg="YES" + ;; + :) + echo "option -$OPTARG needs an argument" + ;; + *) + echo "invalid option -$OPTARG, exiting..." + exit + ;; + esac +done + topdir=$(pwd) echo $topdir @@ -9,7 +26,7 @@ if [[ ! -d fv3gfs.fd ]] ; then rm -f ${topdir}/checkout-fv3gfs.log git clone https://github.com/ufs-community/ufs-weather-model fv3gfs.fd >> ${topdir}/checkout-fv3gfs.log 2>&1 cd fv3gfs.fd - git checkout GFS.v16.0.5 + git checkout GFS.v16.0.10 git submodule update --init --recursive cd ${topdir} else @@ -33,7 +50,7 @@ if [[ ! -d gldas.fd ]] ; then rm -f ${topdir}/checkout-gldas.log git clone https://github.com/NOAA-EMC/GLDAS gldas.fd >> ${topdir}/checkout-gldas.fd.log 2>&1 cd gldas.fd - git checkout gldas_gfsv16_release.v1.2.0 + git checkout gldas_gfsv16_release.v1.4.0 cd ${topdir} else echo 'Skip. Directory gldas.fd already exists.' @@ -55,7 +72,19 @@ if [[ ! -d gfs_post.fd ]] ; then rm -f ${topdir}/checkout-gfs_post.log git clone https://github.com/NOAA-EMC/EMC_post.git gfs_post.fd >> ${topdir}/checkout-gfs_post.log 2>&1 cd gfs_post.fd - git checkout upp_gfsv16_release.v1.0.8 + git checkout upp_gfsv16_release.v1.0.11 + ################################################################################ + # checkout_gtg + ## yes: The gtg code at NCAR private repository is available for ops. GFS only. + # Only approved persons/groups have access permission. + ## no: No need to check out gtg code for general GFS users. + ################################################################################ + checkout_gtg=${checkout_gtg:-"NO"} + if [[ ${checkout_gtg} == "YES" ]] ; then + ./manage_externals/checkout_externals + cp sorc/post_gtg.fd/*f90 sorc/ncep_post.fd/. + cp sorc/post_gtg.fd/gtg.config.gfs parm/. + fi cd ${topdir} else echo 'Skip. Directory gfs_post.fd already exists.' @@ -77,7 +106,7 @@ if [[ ! -d verif-global.fd ]] ; then rm -f ${topdir}/checkout-verif-global.log git clone --recursive https://github.com/NOAA-EMC/EMC_verif-global.git verif-global.fd >> ${topdir}/checkout-verif-global.log 2>&1 cd verif-global.fd - git checkout verif_global_v1.8.0 + git checkout verif_global_v1.9.0 cd ${topdir} else echo 'Skip. Directory verif-global.fd already exist.' diff --git a/sorc/enkf_chgres_recenter_nc.fd/setup.f90 b/sorc/enkf_chgres_recenter_nc.fd/setup.f90 index 4bb1a0253c..1ea5b98a82 100644 --- a/sorc/enkf_chgres_recenter_nc.fd/setup.f90 +++ b/sorc/enkf_chgres_recenter_nc.fd/setup.f90 @@ -23,6 +23,7 @@ subroutine program_setup implicit none integer :: istat + character(len=500) :: filenamelist namelist /chgres_setup/ i_output, j_output, input_file, output_file, & terrain_file, vcoord_file, cld_amt @@ -30,8 +31,9 @@ subroutine program_setup cld_amt = .false. ! default option print* - print*,"OPEN SETUP NAMELIST." - open(43, file="./chgres_nc_gauss.nml", iostat=istat) + call getarg(1,filenamelist) + print*,"OPEN SETUP NAMELIST ",trim(filenamelist) + open(43, file=filenamelist, iostat=istat) if (istat /= 0) then print*,"FATAL ERROR OPENING NAMELIST FILE. ISTAT IS: ",istat stop diff --git a/sorc/link_fv3gfs.sh b/sorc/link_fv3gfs.sh index fafcd34d02..7e41a8eddf 100755 --- a/sorc/link_fv3gfs.sh +++ b/sorc/link_fv3gfs.sh @@ -43,6 +43,10 @@ for dir in fix_am fix_chem fix_fv3 fix_fv3_gmted2010 fix_gldas fix_orog fix_sfc_ done $LINK $FIX_DIR/* . +if [ -d ${pwd}/ufs_utils.fd ]; then + cd ${pwd}/ufs_utils.fd/sorc + ./link_fixdirs.sh $RUN_ENVIR $machine +fi #--------------------------------------- #--add files from external repositories @@ -63,8 +67,8 @@ cd ${pwd}/../scripts ||exit 8 $LINK ../sorc/ufs_utils.fd/scripts/exemcsfc_global_sfc_prep.sh.ecf . $LINK ../sorc/gldas.fd/scripts/exgdas_gldas.sh.ecf . cd ${pwd}/../ush ||exit 8 - for file in fv3gfs_downstream_nems.sh fv3gfs_dwn_nems.sh gfs_nceppost.sh \ - gfs_transfer.sh link_crtm_fix.sh trim_rh.sh fix_precip.sh; do + for file in fv3gfs_downstream_nems.sh fv3gfs_dwn_nems.sh gfs_nceppost.sh \ + gfs_transfer.sh mod_icec.sh link_crtm_fix.sh trim_rh.sh fix_precip.sh; do $LINK ../sorc/gfs_post.fd/ush/$file . done for file in emcsfc_ice_blend.sh fv3gfs_driver_grid.sh fv3gfs_make_orog.sh global_cycle_driver.sh \ @@ -114,6 +118,7 @@ cd ${pwd}/../jobs ||exit 8 $LINK ../sorc/gsi.fd/jobs/JGDAS_ENKF_SURFACE . $LINK ../sorc/gsi.fd/jobs/JGDAS_ENKF_FCST . $LINK ../sorc/gsi.fd/jobs/JGDAS_ENKF_POST . + $LINK ../sorc/gsi.fd/jobs/JGDAS_ENKF_CHGRES . cd ${pwd}/../scripts ||exit 8 $LINK ../sorc/gsi.fd/scripts/exglobal_analysis_fv3gfs.sh.ecf . $LINK ../sorc/gsi.fd/scripts/exglobal_analcalc_fv3gfs.sh.ecf . @@ -125,6 +130,7 @@ cd ${pwd}/../scripts ||exit 8 $LINK ../sorc/gsi.fd/scripts/exglobal_enkf_surface_fv3gfs.sh.ecf . $LINK ../sorc/gsi.fd/scripts/exglobal_enkf_fcst_fv3gfs.sh.ecf . $LINK ../sorc/gsi.fd/scripts/exglobal_enkf_post_fv3gfs.sh.ecf . + $LINK ../sorc/gsi.fd/scripts/exglobal_enkf_chgres_fv3gfs.sh.ecf . cd ${pwd}/../fix ||exit 8 [[ -d fix_gsi ]] && rm -rf fix_gsi $LINK ../sorc/gsi.fd/fix fix_gsi diff --git a/ush/drive_makeprepbufr.sh b/ush/drive_makeprepbufr.sh index c886b25f75..ad36904724 100755 --- a/ush/drive_makeprepbufr.sh +++ b/ush/drive_makeprepbufr.sh @@ -39,6 +39,8 @@ DONST=${DONST:-"NO"} ############################################################### # Set script and dependency variables +export COMPONENT=${COMPONENT:-atmos} + GDATE=$($NDATE -$assim_freq $CDATE) cymd=$(echo $CDATE | cut -c1-8) @@ -54,8 +56,8 @@ APREFIX="${CDUMP}.t${chh}z." ASUFFIX=${ASUFFIX:-$SUFFIX} COMIN_OBS=${COMIN_OBS:-"$DMPDIR/${CDUMP}${DUMP_SUFFIX}.${PDY}/${cyc}"} -COMIN_GES=${COMIN_GES:-"$ROTDIR/gdas.$gymd/$ghh"} -COMOUT=${COMOUT:-"$ROTDIR/$CDUMP.$cymd/$chh"} +COMIN_GES=${COMIN_GES:-"$ROTDIR/gdas.$gymd/$ghh/$COMPONENT"} +COMOUT=${COMOUT:-"$ROTDIR/$CDUMP.$cymd/$chh/$COMPONENT"} [[ ! -d $COMOUT ]] && mkdir -p $COMOUT export DATA="$RUNDIR/$CDATE/$CDUMP/prepbufr" [[ -d $DATA ]] && rm -rf $DATA diff --git a/ush/getdump.sh b/ush/getdump.sh index 7e92115a1f..3766914f14 100755 --- a/ush/getdump.sh +++ b/ush/getdump.sh @@ -1,10 +1,12 @@ #!/bin/ksh set -x +export COMPONENT=${COMPONENT:-atmos} + CDATE=${1:-""} CDUMP=${2:-""} SOURCE_DIR=${3:-$DMPDIR/${CDUMP}${DUMP_SUFFIX}.${PDY}/${cyc}} -TARGET_DIR=${4:-$ROTDIR/${CDUMP}.${PDY}/$cyc} +TARGET_DIR=${4:-$ROTDIR/${CDUMP}.${PDY}/$cyc/$COMPONENT} DUMP_SUFFIX=${DUMP_SUFFIX:-""} diff --git a/ush/hpssarch_gen.sh b/ush/hpssarch_gen.sh index 06a3a54505..0bdf56650b 100755 --- a/ush/hpssarch_gen.sh +++ b/ush/hpssarch_gen.sh @@ -46,7 +46,7 @@ if [ $type = "gfs" ]; then touch gfs_${format}b.txt touch gfs_restarta.txt - dirpath="gfs.${PDY}/${cyc}/" + dirpath="gfs.${PDY}/${cyc}/atmos/" dirname="./${dirpath}" head="gfs.t${cyc}z." @@ -148,7 +148,7 @@ if [ $type = "gfs" ]; then rm -rf gfswave.txt touch gfswave.txt - dirpath="gfswave.${PDY}/${cyc}/" + dirpath="gfs.${PDY}/${cyc}/wave/" dirname="./${dirpath}" head="gfswave.t${cyc}z." @@ -176,7 +176,7 @@ if [ $type = "gdas" ]; then touch gdas_restarta.txt touch gdas_restartb.txt - dirpath="gdas.${PDY}/${cyc}/" + dirpath="gdas.${PDY}/${cyc}/atmos/" dirname="./${dirpath}" head="gdas.t${cyc}z." @@ -188,6 +188,15 @@ if [ $type = "gdas" ]; then echo "${dirname}${head}pgrb2.1p00.anl.idx " >>gdas.txt echo "${dirname}${head}atmanl${SUFFIX} " >>gdas.txt echo "${dirname}${head}sfcanl${SUFFIX} " >>gdas.txt + if [ -s $ROTDIR/${dirpath}${head}atmanl.ensres${SUFFIX} ]; then + echo "${dirname}${head}atmanl.ensres${SUFFIX} " >>gdas.txt + fi + if [ -s $ROTDIR/${dirpath}${head}atma003.ensres${SUFFIX} ]; then + echo "${dirname}${head}atma003.ensres${SUFFIX} " >>gdas.txt + fi + if [ -s $ROTDIR/${dirpath}${head}atma009.ensres${SUFFIX} ]; then + echo "${dirname}${head}atma009.ensres${SUFFIX} " >>gdas.txt + fi if [ -s $ROTDIR/${dirpath}${head}cnvstat ]; then echo "${dirname}${head}cnvstat " >>gdas.txt fi @@ -264,7 +273,7 @@ if [ $type = "gdas" ]; then rm -rf gdaswave_restart.txt touch gdaswave_restart.txt - dirpath="gdaswave.${PDY}/${cyc}/" + dirpath="gdas.${PDY}/${cyc}/wave/" dirname="./${dirpath}" head="gdaswave.t${cyc}z." @@ -298,7 +307,7 @@ if [ $type = "enkfgdas" -o $type = "enkfgfs" ]; then ##NTARS2=$((NTARS/2)) # number of earc groups to include analysis/increments NTARS2=$NTARS - dirpath="enkf${CDUMP}.${PDY}/${cyc}/" + dirpath="enkf${CDUMP}.${PDY}/${cyc}/atmos/" dirname="./${dirpath}" head="${CDUMP}.t${cyc}z." @@ -369,7 +378,7 @@ if [ $type = "enkfgdas" -o $type = "enkfgfs" ]; then while [ $m -le $NMEM_EARCGRP ]; do nm=$(((n-1)*NMEM_EARCGRP+m)) mem=$(printf %03i $nm) - dirpath="enkf${CDUMP}.${PDY}/${cyc}/mem${mem}/" + dirpath="enkf${CDUMP}.${PDY}/${cyc}/atmos/mem${mem}/" dirname="./${dirpath}" head="${CDUMP}.t${cyc}z." @@ -380,8 +389,8 @@ if [ $type = "enkfgdas" -o $type = "enkfgfs" ]; then if [ -s $ROTDIR/${dirpath}${head}atmanl${SUFFIX} ] ; then echo "${dirname}${head}atmanl${SUFFIX} " >>enkf${CDUMP}_grp${n}.txt fi - if [ -s $ROTDIR/${dirpath}${head}atminc${SUFFIX} ] ; then - echo "${dirname}${head}atminc${SUFFIX} " >>enkf${CDUMP}_grp${n}.txt + if [ -s $ROTDIR/${dirpath}${head}ratminc${SUFFIX} ] ; then + echo "${dirname}${head}ratminc${SUFFIX} " >>enkf${CDUMP}_grp${n}.txt fi fi if [ -s $ROTDIR/${dirpath}${head}ratminc${SUFFIX} ] ; then @@ -393,8 +402,8 @@ if [ $type = "enkfgdas" -o $type = "enkfgfs" ]; then if [ -s $ROTDIR/${dirpath}${head}atma00${FHR}${SUFFIX} ] ; then echo "${dirname}${head}atma00${FHR}${SUFFIX} " >>enkf${CDUMP}_grp${n}.txt fi - if [ -s $ROTDIR/${dirpath}${head}atmi00${FHR}${SUFFIX} ] ; then - echo "${dirname}${head}atmi00${FHR}${SUFFIX} " >>enkf${CDUMP}_grp${n}.txt + if [ -s $ROTDIR/${dirpath}${head}ratmi00${FHR}${SUFFIX} ] ; then + echo "${dirname}${head}ratmi00${FHR}${SUFFIX} " >>enkf${CDUMP}_grp${n}.txt fi fi if [ -s $ROTDIR/${dirpath}${head}ratmi00${FHR}${SUFFIX} ] ; then @@ -403,6 +412,9 @@ if [ $type = "enkfgdas" -o $type = "enkfgfs" ]; then fi echo "${dirname}${head}atmf00${FHR}${SUFFIX} " >>enkf${CDUMP}_grp${n}.txt + if [ $FHR -eq 6 ]; then + echo "${dirname}${head}sfcf00${FHR}${SUFFIX} " >>enkf${CDUMP}_grp${n}.txt + fi done # loop over FHR if [[ lobsdiag_forenkf = ".false." ]] ; then diff --git a/ush/rocoto/setup_expt.py b/ush/rocoto/setup_expt.py index d4841b3278..f2040e382b 100755 --- a/ush/rocoto/setup_expt.py +++ b/ush/rocoto/setup_expt.py @@ -92,7 +92,6 @@ def edit_baseconfig(): .replace('@NMEM_ENKF@', '%d' % nens) \ .replace('@HOMEgfs@', top) \ .replace('@BASE_GIT@', base_git) \ - .replace('@BASE_SVN@', base_svn) \ .replace('@DMPDIR@', dmpdir) \ .replace('@NWPROD@', nwprod) \ .replace('@HOMEDIR@', homedir) \ diff --git a/ush/rocoto/setup_expt_fcstonly.py b/ush/rocoto/setup_expt_fcstonly.py index 79d6fa9ed8..2769b35aaf 100755 --- a/ush/rocoto/setup_expt_fcstonly.py +++ b/ush/rocoto/setup_expt_fcstonly.py @@ -66,7 +66,6 @@ def edit_baseconfig(): .replace('@CASECTL@', 'C%d' % res) \ .replace('@HOMEgfs@', top) \ .replace('@BASE_GIT@', base_git) \ - .replace('@BASE_SVN@', base_svn) \ .replace('@DMPDIR@', dmpdir) \ .replace('@NWPROD@', nwprod) \ .replace('@HOMEDIR@', homedir) \ diff --git a/ush/rocoto/setup_workflow.py b/ush/rocoto/setup_workflow.py index c3cc41e46c..41efd882b8 100755 --- a/ush/rocoto/setup_workflow.py +++ b/ush/rocoto/setup_workflow.py @@ -54,7 +54,7 @@ def main(): #wav_steps_awips = ['waveawipssbs', 'waveawips'] # From gfsv16b latest # gfs_steps = ['prep', 'anal', 'gldas', 'fcst', 'postsnd', 'post', 'awips', 'gempak', 'vrfy', 'metp', 'arch'] - hyb_steps = ['eobs', 'ediag', 'eomg', 'eupd', 'ecen', 'esfc', 'efcs', 'epos', 'earc'] + hyb_steps = ['eobs', 'ediag', 'eomg', 'eupd', 'ecen', 'esfc', 'efcs', 'echgres', 'epos', 'earc'] steps = gfs_steps + hyb_steps if _base.get('DOHYBVAR', 'NO') == 'YES' else gfs_steps steps = steps + metp_steps if _base.get('DO_METP', 'NO') == 'YES' else steps @@ -308,9 +308,9 @@ def get_hyb_resources(dict_configs): # These tasks can be run in either or both cycles if lobsdiag_forenkf in ['.T.', '.TRUE.']: - tasks1 = ['eobs', 'ediag', 'eupd'] + tasks1 = ['eobs', 'ediag', 'eupd', 'echgres'] else: - tasks1 = ['eobs', 'eomg', 'eupd'] + tasks1 = ['eobs', 'eomg', 'eupd', 'echgres'] if eupd_cyc in ['BOTH']: cdumps = ['gfs', 'gdas'] @@ -403,7 +403,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'): deps = [] dep_dict = {'type': 'metatask', 'name': '%spost' % 'gdas', 'offset': '-06:00:00'} deps.append(rocoto.add_dependency(dep_dict)) - data = '&ROTDIR;/gdas.@Y@m@d/@H/gdas.t@Hz.atmf009%s' % (gridsuffix) + data = '&ROTDIR;/gdas.@Y@m@d/@H/atmos/gdas.t@Hz.atmf009%s' % (gridsuffix) dep_dict = {'type': 'data', 'data': data, 'offset': '-06:00:00'} deps.append(rocoto.add_dependency(dep_dict)) data = '&DMPDIR;/%s%s.@Y@m@d/@H/%s.t@Hz.updated.status.tm00.bufr_d' % (cdump, dumpsuffix, cdump) @@ -468,12 +468,17 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'): # analcalc deps = [] - data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.loginc.txt' % (cdump, cdump) + data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.loginc.txt' % (cdump, cdump) dep_dict = {'type': 'data', 'data': data} deps.append(rocoto.add_dependency(dep_dict)) dep_dict = {'type': 'task', 'name': '%sanal' % cdump} deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep_condition='or', dep=deps) + if dohybvar in ['y', 'Y', 'yes', 'YES'] and cdump == 'gdas': + dep_dict = {'type': 'task', 'name': '%sechgres' % 'gdas', 'offset': '-06:00:00'} + deps.append(rocoto.add_dependency(dep_dict)) + dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) + else: + dependencies = rocoto.create_dependency(dep_condition='or', dep=deps) task = wfu.create_wf_task('analcalc', cdump=cdump, envar=envars, dependency=dependencies) dict_tasks['%sanalcalc' % cdump] = task @@ -481,7 +486,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'): # analdiag if cdump in ['gdas']: deps = [] - data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.loginc.txt' % (cdump, cdump) + data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.loginc.txt' % (cdump, cdump) dep_dict = {'type': 'data', 'data': data} deps.append(rocoto.add_dependency(dep_dict)) dep_dict = {'type': 'task', 'name': '%sanal' % cdump} @@ -494,7 +499,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'): # gldas if cdump in ['gdas'] and do_gldas in ['Y', 'YES']: deps = [] - data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.loginc.txt' % (cdump, cdump) + data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.loginc.txt' % (cdump, cdump) dep_dict = {'type': 'data', 'data': data} deps.append(rocoto.add_dependency(dep_dict)) dep_dict = {'type': 'task', 'name': '%sanal' % cdump} @@ -506,7 +511,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'): # fcst deps = [] - #data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.loginc.txt' % (cdump, cdump) + #data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.loginc.txt' % (cdump, cdump) #dep_dict = {'type': 'data', 'data': data} # #deps.append(rocoto.add_dependency(dep_dict)) if do_wave in ['Y', 'YES'] and cdump in cdumps: @@ -532,7 +537,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'): # post deps = [] - data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.log#dep#.txt' % (cdump, cdump) + data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.log#dep#.txt' % (cdump, cdump) dep_dict = {'type': 'data', 'data': data} deps.append(rocoto.add_dependency(dep_dict)) dep_dict = {'type': 'task', 'name': '%sfcst' % cdump} @@ -553,13 +558,13 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'): # wavepostsbs if do_wave in ['Y', 'YES'] and cdump in cdumps: deps = [] - data = '&ROTDIR;/%swave.@Y@m@d/@H/rundata/%swave.out_grd.gnh_10m.@Y@m@d.@H0000' % (cdump,cdump) + data = '&ROTDIR;/%s.@Y@m@d/@H/wave/rundata/%swave.out_grd.gnh_10m.@Y@m@d.@H0000' % (cdump,cdump) dep_dict = {'type': 'data', 'data': data} deps.append(rocoto.add_dependency(dep_dict)) - data = '&ROTDIR;/%swave.@Y@m@d/@H/rundata/%swave.out_grd.aoc_9km.@Y@m@d.@H0000' % (cdump,cdump) + data = '&ROTDIR;/%s.@Y@m@d/@H/wave/rundata/%swave.out_grd.aoc_9km.@Y@m@d.@H0000' % (cdump,cdump) dep_dict = {'type': 'data', 'data': data} deps.append(rocoto.add_dependency(dep_dict)) - data = '&ROTDIR;/%swave.@Y@m@d/@H/rundata/%swave.out_grd.gsh_15m.@Y@m@d.@H0000' % (cdump,cdump) + data = '&ROTDIR;/%s.@Y@m@d/@H/wave/rundata/%swave.out_grd.gsh_15m.@Y@m@d.@H0000' % (cdump,cdump) dep_dict = {'type': 'data', 'data': data} deps.append(rocoto.add_dependency(dep_dict)) dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) @@ -569,13 +574,13 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'): # wavegempaksbs #if do_wave in ['Y', 'YES'] and do_gempak in ['Y', 'YES'] and cdump in ['gfs']: # deps = [] - # data = '&ROTDIR;/%swave.@Y@m@d/@H/%swave.t@Hz.gnh_10m.f000.grib2' % (cdump,cdump) + # data = '&ROTDIR;/%s.@Y@m@d/@H/wave/%swave.t@Hz.gnh_10m.f000.grib2' % (cdump,cdump) # dep_dict = {'type': 'data', 'data': data} # deps.append(rocoto.add_dependency(dep_dict)) - # data = '&ROTDIR;/%swave.@Y@m@d/@H/%swave.t@Hz.aoc_9km.f000.grib2' % (cdump,cdump) + # data = '&ROTDIR;/%s.@Y@m@d/@H/wave/%swave.t@Hz.aoc_9km.f000.grib2' % (cdump,cdump) # dep_dict = {'type': 'data', 'data': data} # deps.append(rocoto.add_dependency(dep_dict)) - # data = '&ROTDIR;/%swave.@Y@m@d/@H/%swave.t@Hz.gsh_15m.f000.grib2' % (cdump,cdump) + # data = '&ROTDIR;/%s.@Y@m@d/@H/wave/%swave.t@Hz.gsh_15m.f000.grib2' % (cdump,cdump) # dep_dict = {'type': 'data', 'data': data} # deps.append(rocoto.add_dependency(dep_dict)) # dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) @@ -585,13 +590,13 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'): # waveawipssbs #if do_wave in ['Y', 'YES'] and do_awips in ['Y', 'YES'] and cdump in ['gfs']: # deps = [] - # data = '&ROTDIR;/%swave.@Y@m@d/@H/%swave.t@Hz.gnh_10m.f000.grib2' % (cdump,cdump) + # data = '&ROTDIR;/%s.@Y@m@d/@H/wave/%swave.t@Hz.gnh_10m.f000.grib2' % (cdump,cdump) # dep_dict = {'type': 'data', 'data': data} # deps.append(rocoto.add_dependency(dep_dict)) - # data = '&ROTDIR;/%swave.@Y@m@d/@H/%swave.t@Hz.aoc_9km.f000.grib2' % (cdump,cdump) + # data = '&ROTDIR;/%s.@Y@m@d/@H/wave/%swave.t@Hz.aoc_9km.f000.grib2' % (cdump,cdump) # dep_dict = {'type': 'data', 'data': data} # deps.append(rocoto.add_dependency(dep_dict)) - # data = '&ROTDIR;/%swave.@Y@m@d/@H/%swave.t@Hz.gsh_15m.f000.grib2' % (cdump,cdump) + # data = '&ROTDIR;/%s.@Y@m@d/@H/wave/%swave.t@Hz.gsh_15m.f000.grib2' % (cdump,cdump) # dep_dict = {'type': 'data', 'data': data} # deps.append(rocoto.add_dependency(dep_dict)) # dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) @@ -665,7 +670,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'): # awips if cdump in ['gfs'] and do_awips in ['Y', 'YES']: deps = [] - data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.sfluxgrb#dep#.grib2.idx' % (cdump, cdump) + data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.pgrb2b.0p25.#dep#.idx' % (cdump, cdump) dep_dict = {'type': 'data', 'data': data} deps.append(rocoto.add_dependency(dep_dict)) dep_dict = {'type': 'metatask', 'name': '%spost' % cdump} @@ -813,7 +818,7 @@ def get_hyb_tasks(dict_configs, cycledef='enkf'): # ecmn, ecen deps1 = [] - data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.loganl.txt' % (cdump, cdump) + data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.loganl.txt' % (cdump, cdump) dep_dict = {'type': 'data', 'data': data} deps1.append(rocoto.add_dependency(dep_dict)) dep_dict = {'type': 'task', 'name': '%sanalcalc' % cdump} @@ -839,7 +844,7 @@ def get_hyb_tasks(dict_configs, cycledef='enkf'): # esfc deps1 = [] - data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.loganl.txt' % (cdump, cdump) + data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.loganl.txt' % (cdump, cdump) dep_dict = {'type': 'data', 'data': data} deps1.append(rocoto.add_dependency(dep_dict)) dep_dict = {'type': 'task', 'name': '%sanalcalc' % cdump} @@ -855,7 +860,6 @@ def get_hyb_tasks(dict_configs, cycledef='enkf'): dict_tasks['%sesfc' % cdump] = task - # efmn, efcs deps1 = [] dep_dict = {'type': 'metatask', 'name': '%secmn' % cdump} @@ -876,6 +880,17 @@ def get_hyb_tasks(dict_configs, cycledef='enkf'): dict_tasks['%sefmn' % cdump] = task + # echgres + deps1 = [] + dep_dict = {'type': 'task', 'name': '%sfcst' % cdump} + deps1.append(rocoto.add_dependency(dep_dict)) + dep_dict = {'type': 'metatask', 'name': '%sefmn' % cdump} + deps1.append(rocoto.add_dependency(dep_dict)) + dependencies1 = rocoto.create_dependency(dep_condition='and', dep=deps1) + task = wfu.create_wf_task('echgres', cdump=cdump, envar=envars1, dependency=dependencies1, cycledef=cycledef) + + dict_tasks['%sechgres' % cdump] = task + # epmn, epos deps = [] dep_dict = {'type': 'metatask', 'name': '%sefmn' % cdump} @@ -1098,7 +1113,16 @@ def create_xml(dict_configs): dict_hyb_tasks = get_hyb_tasks(dict_configs) # Removes &MEMORY_JOB_DUMP post mortem from hyb tasks - hyp_tasks = {'gdaseobs':'gdaseobs', 'gdasediag':'gdasediag', 'gdaseomg':'gdaseomn', 'gdaseupd':'gdaseupd','gdasecen':'gdasecmn','gdasesfc':'gdasesfc','gdasefcs':'gdasefmn','gdasepos':'gdasepmn','gdasearc':'gdaseamn'} + hyp_tasks = {'gdaseobs':'gdaseobs', + 'gdasediag':'gdasediag', + 'gdaseomg':'gdaseomn', + 'gdaseupd':'gdaseupd', + 'gdasecen':'gdasecmn', + 'gdasesfc':'gdasesfc', + 'gdasefcs':'gdasefmn', + 'gdasepos':'gdasepmn', + 'gdasearc':'gdaseamn', + 'gdasechgres':'gdasechgres'} for each_task, each_resource_string in dict_hyb_resources.iteritems(): #print each_task,hyp_tasks[each_task] #print dict_hyb_tasks[hyp_tasks[each_task]] diff --git a/ush/rocoto/setup_workflow_fcstonly.py b/ush/rocoto/setup_workflow_fcstonly.py index 168c9f08ae..8a308bb760 100755 --- a/ush/rocoto/setup_workflow_fcstonly.py +++ b/ush/rocoto/setup_workflow_fcstonly.py @@ -295,7 +295,7 @@ def get_workflow(dict_configs, cdump='gdas'): # waveinit if do_wave in ['Y', 'YES']: - task = wfu.create_wf_task('%swaveinit', cdump=cdump, envar=envars) + task = wfu.create_wf_task('waveinit', cdump=cdump, envar=envars) tasks.append(task) tasks.append('\n') @@ -327,7 +327,7 @@ def get_workflow(dict_configs, cdump='gdas'): # post deps = [] - data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.log#dep#.txt' % (cdump, cdump) + data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.log#dep#.txt' % (cdump, cdump) dep_dict = {'type': 'data', 'data': data} deps.append(rocoto.add_dependency(dep_dict)) dependencies = rocoto.create_dependency(dep=deps) @@ -346,16 +346,16 @@ def get_workflow(dict_configs, cdump='gdas'): # wavepostsbs if do_wave in ['Y', 'YES']: deps = [] - data = '&ROTDIR;/%swave.@Y@m@d/@H/rundata/%swave.out_grd.gnh_10m.@Y@m@d.@H0000' % (cdump,cdump) + data = '&ROTDIR;/%s.@Y@m@d/@H/wave/rundata/%swave.out_grd.gnh_10m.@Y@m@d.@H0000' % (cdump,cdump) dep_dict = {'type': 'data', 'data': data} deps.append(rocoto.add_dependency(dep_dict)) - data = '&ROTDIR;/%swave.@Y@m@d/@H/rundata/%swave.out_grd.aoc_9km.@Y@m@d.@H0000' % (cdump,cdump) + data = '&ROTDIR;/%s.@Y@m@d/@H/wave/rundata/%swave.out_grd.aoc_9km.@Y@m@d.@H0000' % (cdump,cdump) dep_dict = {'type': 'data', 'data': data} deps.append(rocoto.add_dependency(dep_dict)) - data = '&ROTDIR;/%swave.@Y@m@d/@H/rundata/%swave.out_grd.gsh_15m.@Y@m@d.@H0000' % (cdump,cdump) + data = '&ROTDIR;/%s.@Y@m@d/@H/wave/rundata/%swave.out_grd.gsh_15m.@Y@m@d.@H0000' % (cdump,cdump) dep_dict = {'type': 'data', 'data': data} deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) + dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) task = wfu.create_wf_task('wavepostsbs', cdump=cdump, envar=envars, dependency=dependencies) tasks.append(task) tasks.append('\n') @@ -395,13 +395,13 @@ def get_workflow(dict_configs, cdump='gdas'): # wavegempaksbs #if do_wave in ['Y', 'YES'] and do_gempak in ['Y', 'YES']: # deps = [] - # data = '&ROTDIR;/wave.@Y@m@d/@H/wave.t@Hz.gnh_10m.f000.grib2' + # data = '&ROTDIR;/wave.@Y@m@d/@H/wave/wave.t@Hz.gnh_10m.f000.grib2' # dep_dict = {'type': 'data', 'data': data} # deps.append(rocoto.add_dependency(dep_dict)) - # data = '&ROTDIR;/wave.@Y@m@d/@H/wave.t@Hz.aoc_9km.f000.grib2' + # data = '&ROTDIR;/wave.@Y@m@d/@H/wave/wave.t@Hz.aoc_9km.f000.grib2' # dep_dict = {'type': 'data', 'data': data} # deps.append(rocoto.add_dependency(dep_dict)) - # data = '&ROTDIR;/wave.@Y@m@d/@H/wave.t@Hz.gsh_15m.f000.grib2' + # data = '&ROTDIR;/wave.@Y@m@d/@H/wave/wave.t@Hz.gsh_15m.f000.grib2' # dep_dict = {'type': 'data', 'data': data} # deps.append(rocoto.add_dependency(dep_dict)) # dependencies = rocoto.create_dependency(dep=deps) @@ -412,13 +412,13 @@ def get_workflow(dict_configs, cdump='gdas'): # waveawipssbs #if do_wave in ['Y', 'YES'] and do_awips in ['Y', 'YES']: # deps = [] - # data = '&ROTDIR;/wave.@Y@m@d/@H/wave.t@Hz.gnh_10m.f000.grib2' + # data = '&ROTDIR;/wave.@Y@m@d/@H/wave/wave.t@Hz.gnh_10m.f000.grib2' # dep_dict = {'type': 'data', 'data': data} # deps.append(rocoto.add_dependency(dep_dict)) - # data = '&ROTDIR;/wave.@Y@m@d/@H/wave.t@Hz.aoc_9km.f000.grib2' + # data = '&ROTDIR;/wave.@Y@m@d/@H/wave/wave.t@Hz.aoc_9km.f000.grib2' # dep_dict = {'type': 'data', 'data': data} # deps.append(rocoto.add_dependency(dep_dict)) - # data = '&ROTDIR;/wave.@Y@m@d/@H/wave.t@Hz.gsh_15m.f000.grib2' + # data = '&ROTDIR;/wave.@Y@m@d/@H/wave/wave.t@Hz.gsh_15m.f000.grib2' # dep_dict = {'type': 'data', 'data': data} # deps.append(rocoto.add_dependency(dep_dict)) # dependencies = rocoto.create_dependency(dep=deps) diff --git a/ush/wave_grib2_sbs.sh b/ush/wave_grib2_sbs.sh index 2afec2c65e..0c04f0fcb2 100755 --- a/ush/wave_grib2_sbs.sh +++ b/ush/wave_grib2_sbs.sh @@ -11,6 +11,7 @@ # # Script history log: # 2019-11-02 J-Henrique Alves Ported to global-workflow. +# 2020-06-10 J-Henrique Alves Ported to R&D machine Hera # # $Id$ # diff --git a/ush/wave_grid_interp.sh b/ush/wave_grid_interp.sh index 273d8a813d..0d90b9c56c 100755 --- a/ush/wave_grid_interp.sh +++ b/ush/wave_grid_interp.sh @@ -11,6 +11,7 @@ # # Script history log: # 2019-11-02 J-Henrique Alves Ported to global-workflow. +# 2020-06-10 J-Henrique Alves Ported to R&D machine Hera # # $Id$ ############################################################################### diff --git a/ush/wave_grid_interp_sbs.sh b/ush/wave_grid_interp_sbs.sh index f2e0855331..d810564f9f 100755 --- a/ush/wave_grid_interp_sbs.sh +++ b/ush/wave_grid_interp_sbs.sh @@ -11,6 +11,7 @@ # # Script history log: # 2019-11-02 J-Henrique Alves Ported to global-workflow. +# 2020-06-10 J-Henrique Alves Ported to R&D machine Hera # # $Id$ # diff --git a/ush/wave_grid_moddef.sh b/ush/wave_grid_moddef.sh index 2b82e8570e..640769f991 100755 --- a/ush/wave_grid_moddef.sh +++ b/ush/wave_grid_moddef.sh @@ -11,6 +11,7 @@ # # Script history log: # 2019-11-02 J-Henrique Alves Ported to global-workflow. +# 2020-06-10 J-Henrique Alves Ported to R&D machine Hera # # $Id$ # # @@ -108,7 +109,7 @@ if [ -f mod_def.ww3 ] then - cp mod_def.ww3 $COMOUT/rundata/${COMPONENTwave}.mod_def.${grdID} + cp mod_def.ww3 $COMOUT/rundata/${CDUMP}wave.mod_def.${grdID} mv mod_def.ww3 ../mod_def.$grdID else set +x @@ -126,7 +127,7 @@ # 3. Clean up cd .. - #rm -rf moddef_$grdID + rm -rf moddef_$grdID set +x echo ' ' diff --git a/ush/wave_outp_spec.sh b/ush/wave_outp_spec.sh index 2e902bc212..5ec718efab 100755 --- a/ush/wave_outp_spec.sh +++ b/ush/wave_outp_spec.sh @@ -11,6 +11,7 @@ # # Script history log: # 2019-11-02 J-Henrique Alves Ported to global-workflow. +# 2020-06-10 J-Henrique Alves Ported to R&D machine Hera # # $Id$ # @@ -245,8 +246,8 @@ # 3.b Clean up the rest -# rm -f ww3_outp.inp -# rm -f mod_def.ww3 out_pnt.ww3 + rm -f ww3_outp.inp + rm -f mod_def.ww3 out_pnt.ww3 cd .. rm -rf ${specdir}_${bloc} diff --git a/ush/wave_prnc_cur.sh b/ush/wave_prnc_cur.sh index 848088540c..4c731e5ddd 100755 --- a/ush/wave_prnc_cur.sh +++ b/ush/wave_prnc_cur.sh @@ -10,6 +10,9 @@ # Abstract: Creates current binary data for forcing WW3 # # Script history log: +# 2019-10-02 J-Henrique Alves: origination, first version +# 2019-11-02 J-Henrique Alves Ported to global-workflow. +# 2020-06-10 J-Henrique Alves Ported R&D machine Hera # # $Id$ # diff --git a/ush/wave_prnc_ice.sh b/ush/wave_prnc_ice.sh index c7a0a1a720..254edc8b03 100755 --- a/ush/wave_prnc_ice.sh +++ b/ush/wave_prnc_ice.sh @@ -16,6 +16,7 @@ # Update record : # # # # - Origination: Hendrik Tolman 01-Mar-2007 # +# 2019-11-02 J-Henrique Alves Ported to global-workflow. # # # Update log # # Nov2019 JHAlves - Merging wave scripts to global workflow # @@ -45,7 +46,7 @@ echo '! Make ice fields |' echo '+--------------------------------+' echo " Model TAG : $WAV_MOD_TAG" - echo " Model ID : $COMPONENTwave" + echo " Model ID : ${CDUMP}wave" echo " Ice grid ID : $WAVEICE_FID" echo " Ice file : $WAVICEFILE" echo ' ' @@ -55,7 +56,7 @@ if [ -z "$YMDH" ] || [ -z "$cycle" ] || \ [ -z "$COMOUT" ] || [ -z "$FIXwave" ] || [ -z "$EXECwave" ] || \ [ -z "$WAV_MOD_TAG" ] || [ -z "$WAVEICE_FID" ] || [ -z "$SENDCOM" ] || \ - [ -z "$COMIN_WAV_ICE" ] || [ -z "$COMPONENTwave" ] + [ -z "$COMIN_WAV_ICE" ] then set $setoff echo ' ' @@ -171,7 +172,7 @@ icefile=${WAV_MOD_TAG}.${WAVEICE_FID}.$cycle.ice elif [ "${WW3ATMIENS}" = "F" ] then - icefile=${COMPONENTwave}.${WAVEICE_FID}.$cycle.ice + icefile=${CDUMP}wave.${WAVEICE_FID}.$cycle.ice fi set $setoff diff --git a/ush/wave_tar.sh b/ush/wave_tar.sh index b5550b6fd4..e367a01414 100755 --- a/ush/wave_tar.sh +++ b/ush/wave_tar.sh @@ -17,6 +17,7 @@ # Origination: Hendrik Tolman March 13, 2007 # # Update log # # Nov2019 JHAlves - Merging wave scripts to global workflow # +# 2020-06-10 J-Henrique Alves Ported R&D machine Hera # # ############################################################################### # @@ -220,7 +221,7 @@ cd $DATA set +x; [[ "$LOUD" = YES ]] && set -v - rm -f ${STA_DIR}/${type} + rm -rf ${STA_DIR}/${type} set +v echo ' '