Skip to content

Commit

Permalink
Issue #5 - sync merge with feature/gfsv16b after COMPONENT update
Browse files Browse the repository at this point in the history
  • Loading branch information
KateFriedman-NOAA committed Aug 19, 2020
2 parents c2a4f04 + d586155 commit 41d146f
Show file tree
Hide file tree
Showing 117 changed files with 674 additions and 742 deletions.
4 changes: 2 additions & 2 deletions Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ protocol = git
required = True

[GLDAS]
tag = gldas_gfsv16_release.v1.3.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.10
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
Expand Down
2 changes: 1 addition & 1 deletion docs/Release_Notes.gfs_downstream.v16.0.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
###########################################
Expand Down
2 changes: 1 addition & 1 deletion driver/gdas/test_gdas_gldas.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
###########################################
Expand Down
11 changes: 2 additions & 9 deletions driver/product/change_gfs_downstream_date.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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







17 changes: 5 additions & 12 deletions driver/product/change_gfs_downstream_envir.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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







18 changes: 7 additions & 11 deletions driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_00
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand All @@ -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
###########################################
Expand Down Expand Up @@ -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}
Expand Down
18 changes: 8 additions & 10 deletions driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_06
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand All @@ -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
###########################################
Expand Down Expand Up @@ -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}
Expand Down
22 changes: 10 additions & 12 deletions driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_12
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand All @@ -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
###########################################
Expand Down Expand Up @@ -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}
Expand Down
19 changes: 9 additions & 10 deletions driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_18
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand All @@ -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
###########################################
Expand Down Expand Up @@ -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}
Expand Down
12 changes: 4 additions & 8 deletions driver/product/run_JGDAS_GEMPAK_dell.sh_00
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand All @@ -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
###########################################
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions driver/product/run_JGDAS_GEMPAK_dell.sh_06
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand All @@ -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
###########################################
Expand Down Expand Up @@ -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
Expand Down
9 changes: 4 additions & 5 deletions driver/product/run_JGDAS_GEMPAK_dell.sh_12
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand All @@ -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
###########################################
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit 41d146f

Please sign in to comment.