Add 3-moment option for NSSL cloud microphysics (#1924)

* Add -mcmodel=medium for builds targeting multiple cores (prevents link failure on jet) * Updated FV3/ccpp/physics (NSSL MP)
ufs-community · Nov 6, 2023 · 4513c26 · 4513c26
1 parent 971cfc5
commit 4513c26
Show file tree

Hide file tree

Showing 10 changed files with 5,852 additions and 5,800 deletions.
diff --git a/FV3 b/FV3
diff --git a/cmake/Intel.cmake b/cmake/Intel.cmake
@@ -25,6 +25,7 @@ else()
     elseif(SIMDMULTIARCH)
         set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -axSSE4.2,CORE-AVX2")
         set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -axSSE4.2,CORE-AVX2")
+        set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -mcmodel=medium")
     elseif(AVX)
         set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -march=core-avx-i")
         set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -march=core-avx-i")

diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20231024
+export BL_DATE=20231102
diff --git a/tests/logs/RegressionTests_acorn.log b/tests/logs/RegressionTests_acorn.log
diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_hercules.log b/tests/logs/RegressionTests_hercules.log
diff --git a/tests/logs/RegressionTests_jet.log b/tests/logs/RegressionTests_jet.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/logs/RegressionTests_wcoss2.log b/tests/logs/RegressionTests_wcoss2.log
+6 −5		ccpp/data/CCPP_typedefs.F90
+38 −4		ccpp/data/GFS_typedefs.F90
+72 −0		ccpp/data/GFS_typedefs.meta
+1 −1		ccpp/physics