Skip to content

Commit

Permalink
Comet porting for production/GFS.v16 (#333)
Browse files Browse the repository at this point in the history
  • Loading branch information
MinsukJi-NOAA authored Mar 17, 2021
1 parent e8bb5d6 commit c006c0e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions model/bin/cmplr.env
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" ] || [ "$cmplr" == "orion" ] ; then
[ "$cmplr" == "theia" ] || [ "$cmplr" == "hera" ] || [ "$cmplr" == "orion" ] || [ "$cmplr" == "comet" ] ; then


# COMPILER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand Down Expand Up @@ -151,7 +151,7 @@ if [ "$cmplr" == "intel" ] || [ "$cmplr" == "intel_debug" ] || [ "$c
if [ "$list" == 'yes' ] ; then optc="$optc -list"; fi

# omp options
if [ "$cmplr" == "hera" ] || [ "$cmplr" == "orion" ] || [ "$cmplr" == "wcoss_cray" ] || [ "$cmplr" == "wcoss_dell_p3" ]; then
if [ "$cmplr" == "hera" ] || [ "$cmplr" == "orion" ] || [ "$cmplr" == "wcoss_cray" ] || [ "$cmplr" == "wcoss_dell_p3" ] || [ "$cmplr" == "comet" ] ; then
optomp="-qopenmp"
else
optomp="-openmp"
Expand Down
2 changes: 2 additions & 0 deletions model/bin/w3_setup
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" == "orion" ] || \
[ "$cmplr" == "wcoss_phase2" ] || [ "$cmplr" == "wcoss_dell_p3" ] || \
[ "$cmplr" == "comet" ] || \
[ "$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" == "orion" ] || \
[ "$cmplr" == "wcoss_phase2" ] || [ "$cmplr" == "wcoss_dell_p3" ] || \
[ "$cmplr" == "comet" ] || \
[ "$cmplr" == "datarmor_gnu" ] || [ "$cmplr" == "datarmor_gnu_debug" ] || \
[ "$cmplr" == "pgi" ] || [ "$cmplr" == "pgi_debug" ] || \
[ "$cmplr" == "datarmor_pgi" ] || [ "$cmplr" == "datarmor_pgi_debug" ] || \
Expand Down
2 changes: 1 addition & 1 deletion model/esmf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ ifeq ($(WW3_COMP),Portland)
else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)","pgi" "datarmor_pgi" "datarmor_pgi_debug"))
ESMF_F90COMPILEOPTS := $(ESMF_F90COMPILEOPTS) -byteswapio
# intel
else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)","theia" "Intel" "hera" "orion"))
else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)","theia" "Intel" "hera" "orion" "comet"))
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
Expand Down

0 comments on commit c006c0e

Please sign in to comment.