Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port UPP develop branch on wcoss2 #439

Merged
merged 8 commits into from
Feb 2, 2022
Merged

Port UPP develop branch on wcoss2 #439

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
68c691d
Add changes for WCOSS2 Acorn.
WenMeng-NOAA Oct 25, 2021
e321009
Merge remote-tracking branch 'upstream/develop' into post_develop_wcoss2
WenMeng-NOAA Dec 31, 2021
e71681d
Add changes for Dogwood.
WenMeng-NOAA Jan 18, 2022
e7572ec
Merge remote-tracking branch 'upstream/develop' into
WenMeng-NOAA Jan 18, 2022
9a69e12
Merge remote-tracking branch 'upstream/develop' into post_develop_wcoss2
WenMeng-NOAA Jan 19, 2022
ec2be2a
Add changes for WCOSS2.
WenMeng-NOAA Jan 19, 2022
2dd8482
Change modulefile on wcoss2 in LUA format based on Kate's comments.
WenMeng-NOAA Jan 24, 2022
503d561
Add machine recognition for cactus and WCOSS1 P3.5 based on Eric's co…
WenMeng-NOAA Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions jobs/JGLOBAL_ATMOS_NCEPPOST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@ export g2tmpl_ver=${g2tmpl_ver:-v1.5.0}
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


##############################################
Expand All @@ -77,17 +74,12 @@ export APRUNP=${APRUN:-$APRUN_NP}
export RERUN=${RERUN:-NO}
export HOMECRTM=${HOMECRTM:-${NWROOT}/lib/crtm/${crtm_ver}}
export FIXCRTM=${CRTM_FIX:-${HOMECRTM}/fix}
#export FIXCRTM=${FIXCRTM:-${NWROOThps}/hwrf.${hwrf_ver}/fix/hwrf-crtm-2.0.6}
export PARMpost=${PARMpost:-$HOMEgfs/parm/post}
export INLINE_POST=${WRITE_DOPOST:-".false."}

if [ $RUN_ENVIR = "nco" ]; then
export COMIN=${COMIN:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
export COMOUT=${COMOUT:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
else
export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
fi
export COMIN=${COMIN:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
export COMOUT=${COMOUT:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}

[[ ! -d $COMOUT ]] && mkdir -m 775 -p $COMOUT

if [ $RUN = gfs ];then
Expand Down
2 changes: 1 addition & 1 deletion jobs/JGLOBAL_ATMOS_POST_MANAGER
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export EXT_FCST=NO
###########################################
export cycle=t${cyc}z
setpdy.sh
. PDY
. ./PDY

export ROTDIR=${ROTDIR:-${COMROOT:?}/$NET/$envir}
export COMIN=${COMIN:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
Expand Down
39 changes: 39 additions & 0 deletions modulefiles/wcoss2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#%Module######################################################################
# Wen Meng 01/2021, Set up config. with the hpc-stack NCEPLIBS.
##############################################################################

proc ModulesHelp { } {
puts stderr "Loads modules required for building upp"
}
module-whatis "Loads UPP prerequisites on WCOSS2"

module load PrgEnv-intel/8.1.0
module load intel/19.1.3.304
module load craype/2.7.8
module load cray-mpich/8.1.7

module load cmake/3.20.2

module load jasper/2.0.25
module load zlib/1.2.11
module load libpng/1.6.37

module load hdf5/1.10.6
module load netcdf/4.7.4

module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.4
module load g2tmpl/1.10.0
module load ip/3.3.3
module load nemsio/2.5.2
module load sfcio/1.4.1
module load sigio/2.3.2
module load sp/2.3.3
module load w3nco/2.4.1
module load w3emc/2.7.3
module load wrf_io/1.2.0

setenv CC cc
setenv CXX CC
setenv FC ftn
6 changes: 5 additions & 1 deletion tests/compile_upp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ PATHTR=${PATHTR:-$( cd ${MYDIR}/.. && pwd )}

#Load required modulefiles
if [[ $MACHINE_ID != "unknown" ]]; then
module purge
if [[ $MACHINE_ID == "wcoss2" ]]; then
module reset
else
module purge
fi
module use $PATHTR/modulefiles
modulefile=${MACHINE_ID}
module load $modulefile
Expand Down
15 changes: 13 additions & 2 deletions tests/detect_machine.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,19 @@ case $(hostname -f) in
m72a2.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### mars
m72a3.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### mars

alogin01) MACHINE_ID=wcoss2 ;; ### acorn
alogin02) MACHINE_ID=wcoss2 ;; ### acorn
alogin01.acorn.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2_a ;; ### acorn
alogin02.acorn.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2_a ;; ### acorn
adecflow01.acorn.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### acorn
adecflow02.acorn.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### acorn
dlogin01.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dogwood
dlogin02.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dogwood
dlogin03.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dogwood
dlogin04.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dogwood
dlogin05.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dogwood
dlogin06.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dogwood
dlogin07.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dogwood
dlogin08.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dogwood
dlogin09.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dogwood

gaea9) MACHINE_ID=gaea ;; ### gaea9
gaea10) MACHINE_ID=gaea ;; ### gaea10
Expand Down