Merge pull request #116 from grantfirl/ufs-dev-PR110

UFS-dev PR#110
NCAR · Feb 7, 2024 · 1065763 · 1065763
2 parents 7c294c1 + ee0f618
commit 1065763
Show file tree

Hide file tree

Showing 6 changed files with 1,746 additions and 1,746 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/bl_date.ncar.conf b/tests/bl_date.ncar.conf
@@ -1,2 +1,2 @@
-export BL_DATE=20240205
+export BL_DATE=20240207
+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
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		export BL_DATE=20240205
		export BL_DATE=20240207