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

Jump to bottom

Port WW3 to expanse #485

Closed
wants to merge 3 commits into from
Closed

Port WW3 to expanse #485

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7143456
First commit to bring Expanse even with develop
MinsukJi-NOAA Jul 22, 2021
7cf3c47
Fix error
MinsukJi-NOAA Jul 29, 2021
b427489
Update to the branch pointed to by ufs 7c (b26a896f2c)
MinsukJi-NOAA Sep 1, 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
Next Next commit
First commit to bring Expanse even with develop
  • Loading branch information
@MinsukJi-NOAA
MinsukJi-NOAA committed Jul 22, 2021
commit 7143456eec291f660d000992e3f0bb60df6497bc
5 changes: 3 additions & 2 deletions model/bin/cmplr.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ if [ "$cmplr" == "intel" ] || [ "$cmplr" == "intel_debug" ] || [ "$c
[ "$cmplr" == "wcoss_cray" ] || [ "$cmplr" == "wcoss_dell_p3" ] || [ "$cmplr" == "cheyenne.intel" ] || \
[ "$cmplr" == "gaea.intel" ] || [ "$cmplr" == "jet.intel" ] || \
[ "$cmplr" == "wcoss2" ] || \
[ "$cmplr" == "expanse.intel" ] || \
[ "$cmplr" == "hera.intel" ] || [ "$cmplr" == "orion.intel" ] || [ "$cmplr" == "stampede.intel" ] ; then


Expand Down Expand Up @@ -161,10 +162,10 @@ if [ "$cmplr" == "intel" ] || [ "$cmplr" == "intel_debug" ] || [ "$c
if [ ! -z "$(echo $cmplr | grep datarmor)" ] || [ "$cmplr" == "hera.intel" ] || [ "$cmplr" == "orion.intel" ] || \
[ "$cmplr" == "wcoss_cray" ] || [ "$cmplr" == "wcoss_dell_p3" ] || [ "$cmplr" == "cheyenne.intel" ] || \
[ "$cmplr" == "gaea.intel" ] || [ "$cmplr" == "jet.intel" ] || [ "$cmplr" == "wcoss2" ] \
[ "$cmplr" == "stampede.intel" ]; then
[ "$cmplr" == "expanse.intel" ] || [ "$cmplr" == "stampede.intel" ]; then
optomp="-qopenmp"
else
optomp="-openmp"
optomp="-qopenmp"
fi

# optimized options
Expand Down
6 changes: 4 additions & 2 deletions model/bin/w3_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,8 @@ then
[ "$cmplr" == "hera.intel" ] || [ "$cmplr" == "orion.intel" ] || \
[ "$cmplr" == "hera.gnu" ] || [ "$cmplr" == "jet.intel" ] || \
[ "$cmplr" == "stampede.intel" ] || [ "$cmplr" == "gaea.intel" ] || \
[ "$cmplr" == "wcoss2" ] || \
[ "$cmplr" == "wcoss2" ] || \
[ "$cmplr" == "expanse.intel" ] || \
[ "$cmplr" == "cheyenne.intel" ] || [ "$cmplr" == "cheyenne.gnu" ] || \
[ "$cmplr" == "wcoss_cray" ] || [ "$cmplr" == "wcoss_dell_p3" ] || \
[ "$cmplr" == "datarmor_gnu" ] || [ "$cmplr" == "datarmor_gnu_debug" ] || \
Expand Down Expand Up @@ -446,7 +447,8 @@ then
[ "$cmplr" == "hera.intel" ] || [ "$cmplr" == "orion.intel" ] || \
[ "$cmplr" == "hera.gnu" ] || [ "$cmplr" == "jet.intel" ] || \
[ "$cmplr" == "stampede.intel" ] || [ "$cmplr" == "gaea.intel" ] || \
[ "$cmplr" == "wcoss2" ] || \
[ "$cmplr" == "wcoss2" ] || \
[ "$cmplr" == "expanse.intel" ] || \
[ "$cmplr" == "cheyenne.intel" ] || [ "$cmplr" == "cheyenne.gnu" ] || \
[ "$cmplr" == "wcoss_cray" ] || [ "$cmplr" == "wcoss_dell_p3" ] || \
[ "$cmplr" == "datarmor_gnu" ] || [ "$cmplr" == "datarmor_gnu_debug" ] || \
Expand Down
2 changes: 1 addition & 1 deletion model/esmf/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)","pgi" "datarmor_pgi" "datarmor_p
# intel
else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)","Intel" "hera.intel" "orion.intel" "jet.intel"))
ESMF_F90COMPILEOPTS := $(ESMF_F90COMPILEOPTS) -convert big_endian
else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)", "cheyenne.intel" "stampede.intel"))
else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)", "cheyenne.intel" "stampede.intel" "expanse.intel"))
ESMF_F90COMPILEOPTS := $(ESMF_F90COMPILEOPTS) -convert big_endian
else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)","wcoss_cray" "wcoss_dell_p3" "gaea.intel" "wcoss2"))
ESMF_F90COMPILEOPTS := $(ESMF_F90COMPILEOPTS) -convert big_endian
Expand Down