diff --git a/model/bin/cmplr.env b/model/bin/cmplr.env index 81a553bd2..77c344fdb 100644 --- a/model/bin/cmplr.env +++ b/model/bin/cmplr.env @@ -109,7 +109,7 @@ fi if [ "$cmplr" == "intel" ] || [ "$cmplr" == "intel_debug" ] || [ "$cmplr" == "intel_prof" ] || \ [ "$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" == "wcoss_phase2" ] || [ "$cmplr" == "wcoss_cray" ] || [ "$cmplr" == "wcoss_dell_p3" ] || [ "$cmplr" == "wcoss2" ] || \ [ "$cmplr" == "theia" ] || [ "$cmplr" == "hera" ] || [ "$cmplr" == "orion" ] ; then @@ -125,6 +125,11 @@ if [ "$cmplr" == "intel" ] || [ "$cmplr" == "intel_debug" ] || [ "$c comp_mpi='ftn' fi + if [ ! -z "$(echo $cmplr | grep wcoss2)" ] ; then + comp_seq='ftn' + comp_mpi='ftn' + fi + # OPTIONS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -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" + optl="$optl" else optc="$optc -xhost" optl="$optl -xhost" @@ -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" == "orion" ] || [ "$cmplr" == "wcoss_cray" ] || [ "$cmplr" == "wcoss_dell_p3" ]; then + if [ "$cmplr" == "hera" ] || [ "$cmplr" == "orion" ] || [ "$cmplr" == "wcoss_cray" ] || [ "$cmplr" == "wcoss_dell_p3" ] || [ "$cmplr" == "wcoss2" ] ; then optomp="-qopenmp" else optomp="-openmp" @@ -179,6 +187,9 @@ if [ "$cmplr" == "intel" ] || [ "$cmplr" == "intel_debug" ] || [ "$c if [ ! -z "$(echo $cmplr | grep datarmor)" ] ; then optc="$optc -xcore-avx2" optl="$optl -xcore-avx2" + elif [ ! -z "$(echo $cmplr | grep wcoss2)" ] ; then + optc="$optc" + optl="$optl" else optc="$optc -xhost" optl="$optl -xhost" diff --git a/model/bin/w3_setup b/model/bin/w3_setup index 2010a62b2..f5f7fe353 100755 --- a/model/bin/w3_setup +++ b/model/bin/w3_setup @@ -417,6 +417,7 @@ then [ "$cmplr" == "theia" ] || [ "$cmplr" == "wcoss_cray" ] || \ [ "$cmplr" == "hera" ] || [ "$cmplr" == "orion" ] || \ [ "$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" ] || \ @@ -443,6 +444,7 @@ then [ "$cmplr" == "theia" ] || [ "$cmplr" == "wcoss_cray" ] || \ [ "$cmplr" == "hera" ] || [ "$cmplr" == "orion" ] || \ [ "$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" ] || \ diff --git a/model/esmf/Makefile b/model/esmf/Makefile index 4043663fd..8d6ba88dd 100644 --- a/model/esmf/Makefile +++ b/model/esmf/Makefile @@ -39,6 +39,10 @@ else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)","theia" "Intel" "hera" "orion")) 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