Skip to content

Commit

Permalink
Merge branch 'feature/gfsv16b' into port2orion
Browse files Browse the repository at this point in the history 
Conflicts:
	parm/config/config.base.emc.dyn
	ush/rocoto/rocoto_viewer.py
  • Loading branch information
@KateFriedman-NOAA
KateFriedman-NOAA committed Apr 1, 2020
2 parents 8513e6c + 49faf67 commit 1aeda04
Show file tree
Hide file tree
Showing 315 changed files with 8,711 additions and 8,746 deletions.
4 changes: 2 additions & 2 deletions Externals.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ protocol = git
required = True

[EMC_verif-global]
tag = verif_global_v1.5.0
tag = verif_global_v1.6.0
local_path = sorc/verif-global.fd
repo_url = ssh://vlab.ncep.noaa.gov:29418/EMC_verif-global
repo_url = https://github.com/NOAA-EMC/EMC_verif-global.git
protocol = git
required = True

Expand Down
5 changes: 4 additions & 1 deletion env/WCOSS_DELL_P3.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ fi
step=$1

# WCOSS_DELL_P3 information
export npe_node_max=28
export launcher="mpirun -n"
export npe_node_max=28
if [ "$QUEUE" = "dev2" -o "$QUEUE" = "devonprod2" -o "$QUEUE" = "devmax2" ]; then # WCOSS Dell 3.5
export npe_node_max=40
fi

# Configure MPI environment
#export MPI_BUFS_PER_PROC=2048
Expand Down
2 changes: 1 addition & 1 deletion jobs/rocoto/arch.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ while [ $GDATE -le $GDATEEND ]; do
rm -rf $COMIN/$file
done
for file in `ls $COMIN/RESTART |grep -v sfcanl `; do
rm -rf $COMIN/$file
rm -rf $COMIN/RESTART/$file
done
fi
fi
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/module_base.wcoss_dell_p3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module load EnvVars/1.0.2

module load HPSS/5.0.2.5
module load prod_util/1.1.0
module load prod_envir/1.0.2
module load prod_envir/1.1.0
#module load ESMF/7_1_0r
module unload grib_util/1.0.6
module load grib_util/1.1.0
Expand Down
116 changes: 17 additions & 99 deletions parm/config/config.base.emc.dyn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,10 @@ export machine="@MACHINE@"
export RUN_ENVIR="emc"

# Account, queue, etc.
if [ $machine = "HERA" ]; then

export ACCOUNT="fv3-cpu"
export QUEUE="batch"
export QUEUE_SERVICE="service"

elif [ $machine = "ORION" ]; then

export ACCOUNT="noaatest"
export QUEUE="batch"
export QUEUE_SERVICE="service"
export PARTITION_BATCH="orion"

elif [ $machine = "WCOSS_C" -o $machine = "WCOSS_DELL_P3" ]; then

export ACCOUNT="GFS-DEV"
export QUEUE="dev"
export QUEUE_SERVICE="dev_transfer"

fi
export ACCOUNT="@ACCOUNT@"
export QUEUE="@QUEUE@"
export QUEUE_SERVICE="@QUEUE_SERVICE@"
export PARTITION_BATCH="@PARTITION_BATCH"

# Project to use in mass store:
HPSS_PROJECT=emc-global
Expand All @@ -48,85 +32,19 @@ export SCRgfs=$HOMEgfs/scripts
########################################################################

# GLOBAL static environment parameters
if [ $machine = "HERA" ]; then

#export NWPROD="/scratch1/NCEPDEV/global/glopara/nwpara"
export DMPDIR="/scratch1/NCEPDEV/global/glopara/dump"
export RTMFIX=$CRTM_FIX

elif [ $machine = "ORION" ]; then

export DMPDIR="/work/noaa/noaatest/kfriedma/glopara/dump"
export RTMFIX=$CRTM_FIX

elif [ $machine = "WCOSS_C" ]; then

export NWPROD="/gpfs/hps/nco/ops/nwprod"
export DMPDIR="/gpfs/dell3/emc/global/dump"
[[ $(hostname |cut -c 1) = l ]] && export SITE="LUNA"
[[ $(hostname |cut -c 1) = s ]] && export SITE="SURGE"
export RTMFIX=$CRTM_FIX

elif [ $machine = "WCOSS_DELL_P3" ]; then

export NWPROD="/gpfs/dell1/nco/ops/nwprod"
export DMPDIR="/gpfs/dell3/emc/global/dump"
[[ $(hostname |cut -c 1) = m ]] && export SITE="MARS"
[[ $(hostname |cut -c 1) = v ]] && export SITE="VENUS"
export RTMFIX=$CRTM_FIX
fi


# Machine specific paths used everywhere
if [ $machine = "HERA" ]; then

# USER specific paths
export HOMEDIR="/scratch1/NCEPDEV/global/$USER"
export STMP="/scratch1/NCEPDEV/stmp2/$USER"
export PTMP="/scratch1/NCEPDEV/stmp4/$USER"
export NOSCRUB="$HOMEDIR"

# Base directories for various builds
export BASE_GIT="/scratch1/NCEPDEV/global/glopara/git"
export BASE_SVN="/scratch1/NCEPDEV/global/glopara/svn"

elif [ $machine = "ORION" ]; then

# USER specific paths
export HOMEDIR="/work/noaa/noaatest/$USER"
export STMP="/work/noaa/noaatest/$USER/stmp"
export PTMP="/work/noaa/noaatest/$USER/ptmp"
export NOSCRUB="$HOMEDIR"

# Base directories for various builds
export BASE_GIT="/work/noaa/noaatest/kfriedma/glopara/git"
export BASE_SVN="/work/noaa/noaatest/kfriedma/glopara/svn"

elif [ $machine = "WCOSS_C" ]; then

# USER specific paths
export HOMEDIR="/gpfs/hps3/emc/global/noscrub/$USER"
export STMP="/gpfs/hps2/stmp/$USER"
export PTMP="/gpfs/hps2/ptmp/$USER"
export NOSCRUB="/gpfs/hps3/emc/global/noscrub/$USER"

# Base directories for various builds
export BASE_GIT="/gpfs/hps3/emc/global/noscrub/emc.glopara/git"
export BASE_SVN="/gpfs/hps3/emc/global/noscrub/emc.glopara/svn"

elif [ $machine = "WCOSS_DELL_P3" ]; then

# USER specific paths
export HOMEDIR="/gpfs/dell2/emc/modeling/noscrub/$USER"
export STMP="/gpfs/dell3/stmp/$USER"
export PTMP="/gpfs/dell3/ptmp/$USER"
export NOSCRUB="/gpfs/dell2/emc/modeling/noscrub/$USER"

# 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"

fi
export NWPROD="@NWPROD@"
export DMPDIR="@DMPDIR@"
export RTMFIX=$CRTM_FIX

# USER specific paths
export HOMEDIR="@HOMEDIR@"
export STMP="@STMP@"
export PTMP="@PTMP@"
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"
Expand Down
3 changes: 3 additions & 0 deletions parm/config/config.resources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ echo "BEGIN: config.resources"

if [[ "$machine" = "WCOSS_DELL_P3" ]]; then
export npe_node_max=28
if [ "$QUEUE" = "dev2" -o "$QUEUE" = "devonprod2" -o "$QUEUE" = "devmax2" ]; then # WCOSS Dell 3.5
export npe_node_max=40
fi
elif [[ "$machine" = "WCOSS_C" ]]; then
export npe_node_max=24
elif [[ "$machine" = "JET" ]]; then
Expand Down
4 changes: 3 additions & 1 deletion parm/config/config.wave
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
########## config.wave ##########
# Wave steps specific

echo "BEGIN: config.wave"

# Parameters that are common to all wave model steps

# System and version
Expand Down Expand Up @@ -128,4 +130,4 @@ export WW3ATMIENS='F'
export WW3ICEIENS='F'
export WW3CURIENS='F'

echo "END: config.waveprep"
echo "END: config.wave"
106 changes: 0 additions & 106 deletions parm/wmo/bulls_wkeysb
View file

This file was deleted.

24 changes: 12 additions & 12 deletions parm/wmo/grib2_awpgfs000.003
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
&GRIBIDS DESC=' TMP 200 mb ',WMOHEAD='YTPA20 KWBC',PDTN= 0 ,PDT= 0 0 2 0 81 0 0 1 0 100 0 20000 255 0 0 /
&GRIBIDS DESC=' TMP 150 mb ',WMOHEAD='YTPA15 KWBC',PDTN= 0 ,PDT= 0 0 2 0 81 0 0 1 0 100 0 15000 255 0 0 /
&GRIBIDS DESC=' TMP 100 mb ',WMOHEAD='YTPA10 KWBC',PDTN= 0 ,PDT= 0 0 2 0 81 0 0 1 0 100 0 10000 255 0 0 /
&GRIBIDS DESC=' V VEL 1000 mb ',WMOHEAD='YOPA99 KWBC',PDTN= 0 ,PDT= 2 8 2 0 81 0 0 1 0 100 0 100000 255 0 0 /
&GRIBIDS DESC=' V VEL 850 mb ',WMOHEAD='YOPA85 KWBC',PDTN= 0 ,PDT= 2 8 2 0 81 0 0 1 0 100 0 85000 255 0 0 /
&GRIBIDS DESC=' V VEL 700 mb ',WMOHEAD='YOPA70 KWBC',PDTN= 0 ,PDT= 2 8 2 0 81 0 0 1 0 100 0 70000 255 0 0 /
&GRIBIDS DESC=' V VEL 500 mb ',WMOHEAD='YOPA50 KWBC',PDTN= 0 ,PDT= 2 8 2 0 81 0 0 1 0 100 0 50000 255 0 0 /
&GRIBIDS DESC=' V VEL 400 mb ',WMOHEAD='YOPA40 KWBC',PDTN= 0 ,PDT= 2 8 2 0 81 0 0 1 0 100 0 40000 255 0 0 /
&GRIBIDS DESC=' V VEL 300 mb ',WMOHEAD='YOPA30 KWBC',PDTN= 0 ,PDT= 2 8 2 0 81 0 0 1 0 100 0 30000 255 0 0 /
&GRIBIDS DESC=' V VEL 250 mb ',WMOHEAD='YOPA25 KWBC',PDTN= 0 ,PDT= 2 8 2 0 81 0 0 1 0 100 0 25000 255 0 0 /
&GRIBIDS DESC=' V VEL 200 mb ',WMOHEAD='YOPA20 KWBC',PDTN= 0 ,PDT= 2 8 2 0 81 0 0 1 0 100 0 20000 255 0 0 /
&GRIBIDS DESC=' V VEL 150 mb ',WMOHEAD='YOPA15 KWBC',PDTN= 0 ,PDT= 2 8 2 0 81 0 0 1 0 100 0 15000 255 0 0 /
&GRIBIDS DESC=' V VEL 100 mb ',WMOHEAD='YOPA10 KWBC',PDTN= 0 ,PDT= 2 8 2 0 81 0 0 1 0 100 0 10000 255 0 0 /
&GRIBIDS DESC=' DZDT 1000 mb ',WMOHEAD='YOPA99 KWBC',PDTN= 0 ,PDT= 2 9 2 0 81 0 0 1 0 100 0 100000 255 0 0 /
&GRIBIDS DESC=' DZDT 850 mb ',WMOHEAD='YOPA85 KWBC',PDTN= 0 ,PDT= 2 9 2 0 81 0 0 1 0 100 0 85000 255 0 0 /
&GRIBIDS DESC=' DZDT 700 mb ',WMOHEAD='YOPA70 KWBC',PDTN= 0 ,PDT= 2 9 2 0 81 0 0 1 0 100 0 70000 255 0 0 /
&GRIBIDS DESC=' DZDT 500 mb ',WMOHEAD='YOPA50 KWBC',PDTN= 0 ,PDT= 2 9 2 0 81 0 0 1 0 100 0 50000 255 0 0 /
&GRIBIDS DESC=' DZDT 400 mb ',WMOHEAD='YOPA40 KWBC',PDTN= 0 ,PDT= 2 9 2 0 81 0 0 1 0 100 0 40000 255 0 0 /
&GRIBIDS DESC=' DZDT 300 mb ',WMOHEAD='YOPA30 KWBC',PDTN= 0 ,PDT= 2 9 2 0 81 0 0 1 0 100 0 30000 255 0 0 /
&GRIBIDS DESC=' DZDT 250 mb ',WMOHEAD='YOPA25 KWBC',PDTN= 0 ,PDT= 2 9 2 0 81 0 0 1 0 100 0 25000 255 0 0 /
&GRIBIDS DESC=' DZDT 200 mb ',WMOHEAD='YOPA20 KWBC',PDTN= 0 ,PDT= 2 9 2 0 81 0 0 1 0 100 0 20000 255 0 0 /
&GRIBIDS DESC=' DZDT 150 mb ',WMOHEAD='YOPA15 KWBC',PDTN= 0 ,PDT= 2 9 2 0 81 0 0 1 0 100 0 15000 255 0 0 /
&GRIBIDS DESC=' DZDT 100 mb ',WMOHEAD='YOPA10 KWBC',PDTN= 0 ,PDT= 2 9 2 0 81 0 0 1 0 100 0 10000 255 0 0 /
&GRIBIDS DESC=' R H 1000 mb ',WMOHEAD='YRPA99 KWBC',PDTN= 0 ,PDT= 1 1 2 0 81 0 0 1 0 100 0 100000 255 0 0 /
&GRIBIDS DESC=' R H 850 mb ',WMOHEAD='YRPA85 KWBC',PDTN= 0 ,PDT= 1 1 2 0 81 0 0 1 0 100 0 85000 255 0 0 /
&GRIBIDS DESC=' R H 700 mb ',WMOHEAD='YRPA70 KWBC',PDTN= 0 ,PDT= 1 1 2 0 81 0 0 1 0 100 0 70000 255 0 0 /
Expand Down Expand Up @@ -84,7 +84,7 @@
&GRIBIDS DESC=' HGT 600 mb ',WMOHEAD='YHPA60 KWBC',PDTN= 0 ,PDT= 3 5 2 0 81 0 0 1 0 100 0 60000 255 0 0 /
&GRIBIDS DESC=' HGT Max wind ',WMOHEAD='YHPA96 KWBC',PDTN= 0 ,PDT= 3 5 2 0 81 0 0 1 0 6 0 0 255 0 0 /
&GRIBIDS DESC=' HGT Tropopause ',WMOHEAD='YHPA97 KWBC',PDTN= 0 ,PDT= 3 5 2 0 81 0 0 1 0 7 0 0 255 0 0 /
&GRIBIDS DESC=' V VEL 600 mb ',WMOHEAD='YOPA60 KWBC',PDTN= 0 ,PDT= 2 8 2 0 81 0 0 1 0 100 0 60000 255 0 0 /
&GRIBIDS DESC=' DZDT 600 mb ',WMOHEAD='YOPA60 KWBC',PDTN= 0 ,PDT= 2 9 2 0 81 0 0 1 0 100 0 60000 255 0 0 /
&GRIBIDS DESC=' PRES Max wind lvl ',WMOHEAD='YPPA96 KWBC',PDTN= 0 ,PDT= 3 0 2 0 81 0 0 1 0 6 0 0 255 0 0 /
&GRIBIDS DESC=' R H 600 mb ',WMOHEAD='YRPA60 KWBC',PDTN= 0 ,PDT= 1 1 2 0 81 0 0 1 0 100 0 60000 255 0 0 /
&GRIBIDS DESC=' R H 2 m above ground ',WMOHEAD='YRPA98 KWBC',PDTN= 0 ,PDT= 1 1 2 0 81 0 0 1 0 103 0 2 255 0 0 /
Expand All @@ -100,7 +100,7 @@
&GRIBIDS DESC=' MSLET Mean Sea Level ',WMOHEAD='YPPA89 KWBC',PDTN= 0 ,PDT= 3 192 2 0 81 0 0 1 0 101 0 0 255 0 0 /
&GRIBIDS DESC=' HGT 925 mb ',WMOHEAD='YHPA92 KWBC',PDTN= 0 ,PDT= 3 5 2 0 81 0 0 1 0 100 0 92500 255 0 0 /
&GRIBIDS DESC=' TMP 925 mb ',WMOHEAD='YTPA92 KWBC',PDTN= 0 ,PDT= 0 0 2 0 81 0 0 1 0 100 0 92500 255 0 0 /
&GRIBIDS DESC=' V VEL 925 mb ',WMOHEAD='YOPA92 KWBC',PDTN= 0 ,PDT= 2 8 2 0 81 0 0 1 0 100 0 92500 255 0 0 /
&GRIBIDS DESC=' DZDT 925 mb ',WMOHEAD='YOPA92 KWBC',PDTN= 0 ,PDT= 2 9 2 0 81 0 0 1 0 100 0 92500 255 0 0 /
&GRIBIDS DESC=' R H 925 mb ',WMOHEAD='YRPA92 KWBC',PDTN= 0 ,PDT= 1 1 2 0 81 0 0 1 0 100 0 92500 255 0 0 /
&GRIBIDS DESC=' U GRD 925 mb ',WMOHEAD='YUPA92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT= 2 2 2 0 81 0 0 1 0 100 0 92500 255 0 0 /
&GRIBIDS DESC=' V GRD 925 mb ',WMOHEAD='YVPA92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT= 2 3 2 0 81 0 0 1 0 100 0 92500 255 0 0 /
Loading

0 comments on commit 1aeda04

Please sign in to comment.