Merge pull request ufs-community#30 from climbfuji/update_gsd_develop…

…_from_dev_emc_20200625 Update gsd/develop from dev/emc 2020/06/25 and mods to MYNN sfc and PBL for fractional/coupled
ShanSunNOAA · Jun 25, 2020 · ecb9bda · ecb9bda
2 parents 150fc3f + e6af704
commit ecb9bda
Show file tree

Hide file tree

Showing 14 changed files with 3,037 additions and 1,816 deletions.
diff --git a/FV3 b/FV3
diff --git a/build.sh b/build.sh
@@ -3,8 +3,7 @@ set -eu
 
 MYDIR=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P)
 
-export COMPILER=${COMPILER:?"Please set COMPILER environment variable [gnu|intel]"}
-export CMAKE_Platform=linux.${COMPILER}
+export CMAKE_Platform=${CMAKE_Platform:?"Please set the CMAKE_Platform environment variable, e.g. [macosx.gnu|linux.gnu|linux.intel|hera.intel|...]"}
 export CMAKE_C_COMPILER=${CMAKE_C_COMPILER:-mpicc}
 export CMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER:-mpicxx}
 export CMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER:-mpif90}

diff --git a/cmake/configure_jet.intel.cmake b/cmake/configure_jet.intel.cmake
@@ -22,9 +22,11 @@ option(INLINE_POST "Enable inline post" OFF)
 
 include( cmake/${CMAKE_Fortran_COMPILER_ID}.cmake )
 
-message("AVX2 is   ENABLED on Jet (multi-tagret executable)")
+message("AVX2 is   ENABLED on Jet (multi-target executable)")
 string (REPLACE "-xHOST" "-axSSE4.2,AVX,CORE-AVX2" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
 string (REPLACE "-xHOST" "-axSSE4.2,AVX,CORE-AVX2" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+# For CCPP
+option(SIMDMULTIARCH "Enable multi-target SIMD instruction sets" ON)
 
 string(REPLACE "-i_dynamic" "-shared-intel"
        CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS

diff --git a/modulefiles/hera.gnu/fv3 b/modulefiles/hera.gnu/fv3
@@ -23,13 +23,12 @@ module load sutils
 ## this typically includes compiler, MPI and job scheduler
 ##
 module load gnu/9.2.0
-module load openmpi/3.1.4
-module load netcdf/4.7.2
+module use -a /scratch1/BMC/gmtb/software/modulefiles/gnu-9.2.0/mpich-3.3.2
+module load mpich/3.3.2
 
 ##
-## use pre-compiled EMSF library and NCEP libraries for above compiler / MPI combination
+## use pre-compiled netCDF, EMSF library and NCEP libraries for above compiler / MPI combination
 ##
-module use -a /scratch1/BMC/gmtb/software/modulefiles/gnu-9.2.0/openmpi-3.1.4
 module load NCEPlibs/1.0.0
 
 ##

diff --git a/tests/Compile_hera.gnu.log b/tests/Compile_hera.gnu.log
diff --git a/tests/Compile_hera.intel.log b/tests/Compile_hera.intel.log
diff --git a/tests/Compile_orion.intel.log b/tests/Compile_orion.intel.log
diff --git a/tests/Compile_wcoss_cray.log b/tests/Compile_wcoss_cray.log
diff --git a/tests/Compile_wcoss_dell_p3.log b/tests/Compile_wcoss_dell_p3.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log