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 all 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
56 changes: 56 additions & 0 deletions modulefiles/wcoss2.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
help([[
Load environment to build post on WCOSS2
]])

PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0"
intel_ver=os.getenv("intel_ver") or "19.1.3.304"
craype_ver=os.getenv("craype_ver") or "2.7.10"
cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.9"
load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver))
load(pathJoin("intel", intel_ver))
load(pathJoin("craype", craype_ver))
load(pathJoin("cray-mpich", cray_mpich_ver))

hdf5_ver=os.getenv("hdf5_ver") or "1.10.6"
netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
load(pathJoin("hdf5", hdf5_ver))
load(pathJoin("netcdf", netcdf_ver))

jasper_ver=os.getenv("jasper_ver") or "2.0.25"
libpng_ver=os.getenv("libpng_ver") or "1.6.37"
zlib_ver=os.getenv("zlib_ver") or "1.2.11"
load(pathJoin("jasper", jasper_ver))
load(pathJoin("libpng", libpng_ver))
load(pathJoin("zlib", zlib_ver))

g2_ver=os.getenv("g2_ver") or "3.4.5"
g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.0"
w3nco_ver=os.getenv("w3nco_ver") or "2.4.1"
bacio_ver=os.getenv("bacio_ver") or "2.4.1"
ip_ver=os.getenv("ip_ver") or "3.3.3"
sp_ver=os.getenv("sp_ver") or "2.3.3"
crtm_ver=os.getenv("crtm_ver") or "2.3.0"
w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
load(pathJoin("g2", g2_ver))
load(pathJoin("g2tmpl", g2tmpl_ver))
load(pathJoin("w3nco", w3nco_ver))
load(pathJoin("bacio", bacio_ver))
load(pathJoin("ip", ip_ver))
load(pathJoin("sp", sp_ver))
load(pathJoin("crtm", crtm_ver))
load(pathJoin("w3emc", w3emc_ver))

nemsio_ver=os.getenv("nemsio_ver") or "2.5.2"
sigio_ver=os.getenv("sigio_ver") or "2.3.2"
sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
wrf_io_ver=os.getenv("wrf_io_ver") or "1.2.0"
load(pathJoin("nemsio", nemsio_ver))
load(pathJoin("sigio", sigio_ver))
load(pathJoin("sfcio", sfcio_ver))
load(pathJoin("wrf_io", wrf_io_ver))

setenv("CC","cc")
setenv("CXX","CC")
setenv("FC","ftn")

whatis("Description: post build environment")
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
38 changes: 35 additions & 3 deletions tests/detect_machine.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,48 @@ case $(hostname -f) in
v72a1.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### venus
v72a2.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### venus
v72a3.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### venus
v109a1.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### venus
v109a2.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### venus
v109a3.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### venus
v110a1.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### venus
v110a2.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### venus
v110a3.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### venus

m71a1.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### mars
m71a2.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### mars
m71a3.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### mars
m72a1.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### mars
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
m109a1.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### mars
m110a2.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### mars
m109a3.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### mars
m110a1.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### mars
m110a2.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### mars
m110a3.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### mars

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 ;; ### cactus
dlogin02.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
dlogin03.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
dlogin04.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
dlogin05.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
dlogin06.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
dlogin07.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cattus
dlogin08.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
dlogin09.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
clogin01.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
clogin02.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
clogin03.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
clogin04.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
clogin05.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
clogin06.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
clogin07.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
clogin08.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
clogin09.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus

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