Skip to content

Feature/gefs v12 port2acorn #508

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

Merged
JessicaMeixner-NOAA merged 7 commits into from
Nov 5, 2021
Merged

Feature/gefs v12 port2acorn #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3691464
Port to WCOSS2/Acorn
XianwuXue-NOAA Aug 10, 2021
22f0daf
update esmf makefile
JessicaMeixner-NOAA Sep 15, 2021
c0f0230
update cmplr.env to make sure we are using the right settings for wcoss2
JessicaMeixner-NOAA Sep 15, 2021
eccd4a8
make sure wcoss2 is not using any xhost
JessicaMeixner-NOAA Sep 15, 2021
7b09afc
try flags suggested for optimization
JessicaMeixner-NOAA Sep 15, 2021
63d7159
Merge remote-tracking branch 'jessica/gefsv12/wcoss2port_optimization…
XianwuXue-NOAA Sep 16, 2021
80ddef0
Fix typo in the added flags suggested for opt
XianwuXue-NOAA Sep 16, 2021
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
24 changes: 11 additions & 13 deletions model/bin/cmplr.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ if [ "$cmplr" == "intel" ] || [ "$cmplr" == "intel_debug" ] || [ "$c
[ "$cmplr" == "so_intel" ] || [ "$cmplr" == "so_intel_debug" ] || [ "$cmplr" == "so_intel_prof" ] || \
[ "$cmplr" == "datarmor_intel" ] || [ "$cmplr" == "datarmor_intel_debug" ] || [ "$cmplr" == "datarmor_intel_prof" ] || \
[ "$cmplr" == "wcoss_phase2" ] || [ "$cmplr" == "wcoss_cray" ] || [ "$cmplr" == "wcoss_dell_p3" ] || \
[ "$cmplr" == "theia" ] || [ "$cmplr" == "hera" ] ; then
[ "$cmplr" == "theia" ] || [ "$cmplr" == "hera" ] || [ "$cmplr" == "wcoss2" ]; then


# COMPILER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand All @@ -125,11 +125,16 @@ if [ "$cmplr" == "intel" ] || [ "$cmplr" == "intel_debug" ] || [ "$c
comp_mpi='ftn'
fi

# WCOSS2 compiler
if [ ! -z "$(echo $cmplr | grep wcoss2)" ] ; then
comp_seq='ftn'
comp_mpi='ftn'
fi

# OPTIONS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

# common options
optc='-c -module $path_m -no-fma -ip -g -i4 -real-size 32 -fp-model precise -assume byterecl -convert big_endian -fno-alias -fno-fnalias -sox'
optc='-c -module $path_m -no-fma -ip -g -traceback -i4 -real-size 32 -fp-model precise -assume byterecl -convert big_endian -fno-alias -fno-fnalias -sox'
optl='-o $prog -g'

if [ ! -z "$(echo $cmplr | grep datarmor)" ] ; then
Expand All @@ -141,6 +146,9 @@ if [ "$cmplr" == "intel" ] || [ "$cmplr" == "intel_debug" ] || [ "$c
elif [ ! -z "$(echo $cmplr | grep wcoss_dell_p3)" ] ; then
optc="$optc -xHOST"
optl="$optl -xHOST"
elif [ ! -z "$(echo $cmplr | grep wcoss2)" ] ; then
optc="$optc -fp-model precise -ftz -fast-transcendentals -no-prec-div -no-prec-sqrt -align array64byte"
optl="$optl"
else
optc="$optc -xhost"
optl="$optl -xhost"
Expand All @@ -151,7 +159,7 @@ if [ "$cmplr" == "intel" ] || [ "$cmplr" == "intel_debug" ] || [ "$c
if [ "$list" == 'yes' ] ; then optc="$optc -list"; fi

# omp options
if [ "$cmplr" == "hera" ] || [ "$cmplr" == "wcoss_dell_p3" ]; then
if [ "$cmplr" == "hera" ] || [ "$cmplr" == "wcoss_dell_p3" ] || [ "$cmplr" == "wcoss2" ]; then
optomp="-qopenmp"
else
optomp="-openmp"
Expand All @@ -175,15 +183,6 @@ if [ "$cmplr" == "intel" ] || [ "$cmplr" == "intel_debug" ] || [ "$c
optl="$optl -O0 -traceback"
fi

# system-dependant options
if [ ! -z "$(echo $cmplr | grep datarmor)" ] ; then
optc="$optc -xcore-avx2"
optl="$optl -xcore-avx2"
else
optc="$optc -xhost"
optl="$optl -xhost"
fi

if [ ! -z "$(echo $cmplr | grep so)" ] ; then
optc="$optc -fPIC"
optl='-o $prog -g'
Expand Down Expand Up @@ -213,7 +212,6 @@ if [ "$cmplr" == "gnu" ] || [ "$cmplr" == "gnu_debug" ] || [ "$cmplr" == "gnu_pr
comp_mpi='ftn'
fi


# OPTIONS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

# common options
Expand Down
2 changes: 2 additions & 0 deletions model/bin/w3_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,7 @@ then
[ "$cmplr" == "theia" ] || [ "$cmplr" == "wcoss_cray" ] || \
[ "$cmplr" == "hera" ] || \
[ "$cmplr" == "wcoss_phase2" ] || [ "$cmplr" == "wcoss_dell_p3" ] || \
[ "$cmplr" == "wcoss2" ] || \
[ "$cmplr" == "datarmor_gnu" ] || [ "$cmplr" == "datarmor_gnu_debug" ] || \
[ "$cmplr" == "pgi" ] || [ "$cmplr" == "pgi_debug" ] || \
[ "$cmplr" == "datarmor_pgi" ] || [ "$cmplr" == "datarmor_pgi_debug" ] || \
Expand All @@ -443,6 +444,7 @@ then
[ "$cmplr" == "theia" ] || [ "$cmplr" == "wcoss_cray" ] || \
[ "$cmplr" == "hera" ] || \
[ "$cmplr" == "wcoss_phase2" ] || [ "$cmplr" == "wcoss_dell_p3" ] || \
[ "$cmplr" == "wcoss2" ] || \
[ "$cmplr" == "datarmor_gnu" ] || [ "$cmplr" == "datarmor_gnu_debug" ] || \
[ "$cmplr" == "pgi" ] || [ "$cmplr" == "pgi_debug" ] || \
[ "$cmplr" == "datarmor_pgi" ] || [ "$cmplr" == "datarmor_pgi_debug" ] || \
Expand Down
6 changes: 5 additions & 1 deletion model/esmf/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)","theia" "Intel" "hera"))
ESMF_F90COMPILEOPTS := $(ESMF_F90COMPILEOPTS) -convert big_endian
else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)","wcoss_phase2" "wcoss_cray" "wcoss_dell_p3"))
ESMF_F90COMPILEOPTS := $(ESMF_F90COMPILEOPTS) -convert big_endian
else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)","wcoss2"))
ESMF_F90COMPILEOPTS := $(ESMF_F90COMPILEOPTS) -convert big_endian
WW3_CC := cc
WW3_F90 := ftn
else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)","intel" "datarmor_intel" "datarmor_intel_debug"))
ESMF_F90COMPILEOPTS := $(ESMF_F90COMPILEOPTS) -convert big_endian
# mpt
Expand Down Expand Up @@ -96,7 +100,7 @@ ww3_nemslibonly: env setup switch

ww3_multi_esmf: esmApp.o $(DEP_LINK_OBJS)
$(ESMF_F90LINKER) $(ESMF_F90LINKOPTS) -o $(EXE) $^ \
$(ESMF_F90LINKPATHS) $(ESMF_F90LINKRPATHS) $(ESMF_F90ESMFLINKLIBS)
$(ESMF_F90LINKPATHS) $(ESMF_F90LINKRPATHS) $(ESMF_F90ESMFLINKLIBS)

# module dependencies:
esmApp.o: macros.h utl.o esm.o
Expand Down