cmake in the FV3 dycore (ufs-community#812)

* Move the CMake build of the dycore from fv3atm into GFDL_atmos_cubed_sphere. * Updates for S4. Co-authored-by: David Huber <[email protected]>
DeniseWorthen · Sep 23, 2021 · f04a30c · f04a30c
1 parent 814470c
commit f04a30c
Show file tree

Hide file tree

Showing 24 changed files with 1,909 additions and 1,741 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,6 +56,7 @@ message("CMEPS ............ ${CMEPS}")
 ###############################################################################
 set(32BIT           OFF CACHE BOOL "Enable 32BIT (single precision arithmetic in dycore)")
 set(AVX2            ON  CACHE BOOL "Enable AVX2 instruction set")
+set(AVX             OFF CACHE BOOL "Enable AVX-I instruction set")
 set(SIMDMULTIARCH   OFF CACHE BOOL "Enable multi-target SIMD instruction sets")
 set(DEBUG           OFF CACHE BOOL "Enable DEBUG mode")
 set(DEBUG_LINKMPI   ON  CACHE BOOL "Enable linkmpi option when DEBUG mode is on")

diff --git a/FV3 b/FV3
diff --git a/cmake/Intel.cmake b/cmake/Intel.cmake
@@ -36,6 +36,10 @@ else()
         set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -axSSE4.2,CORE-AVX2")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -axSSE4.2,CORE-AVX2")
         set(CMAKE_Fortran_FLAGS_OPT "-no-prec-div -no-prec-sqrt -axSSE4.2,CORE-AVX2")
+     elseif(AVX)
+        set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -march=core-avx-i")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=core-avx-i")
+        set(CMAKE_Fortran_FLAGS_OPT "-no-prec-div -no-prec-sqrt -xCORE-AVX-I")
     endif()
 endif()
 

diff --git a/cmake/configure_s4.intel.cmake b/cmake/configure_s4.intel.cmake
@@ -0,0 +1,4 @@
+set(INLINE_POST     ON CACHE BOOL "Enable inline post" FORCE)
+set(AVX2            OFF CACHE BOOL "Enable AVX2 instruction set" FORCE)
+set(AVX             ON CACHE BOOL "Enable AVX2 instruction set" FORCE)
+set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
diff --git a/modulefiles/ufs_s4.intel b/modulefiles/ufs_s4.intel
@@ -1,41 +1,20 @@
-#%Module######################################################################
-##
-##    NEMS FV3 Prerequisites: S4
+#%Module
 
 proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running FV3 under NEMS on S4"
+  puts stderr "\tcit - loads modules required for building and running UFS Model on S4"
 }
 
-module-whatis "loads NEMS FV3 prerequisites for S4"
+module-whatis "loads UFS Model prerequisites for S4"
 
-# NOTE: the "module purge" and loading of the module command are
-# handled by the module-setup.sh (or .csh) script.
-
-##
-## load programming environment
-## this typically includes compiler, MPI and job scheduler
-##
 module load license_intel/S4
-module load intel/18.0.3
-module load hdf/4.2.14
-module load hdf5/1.8.21
-module load netcdf4/4.6.2
+module use /data/prod/hpc-stack/modulefiles/stack
+module load hpc/1.1.0
+module load hpc-intel/18.0.4
+module load hpc-impi/18.0.4
 
-##
-## load nwprod libraries
-##
-module use -a /data/prod/ncep_libs/intel/18.0.3/modulefiles
-module load bacio/v2.0.2
-module load sp/v2.0.2
-module load ip/v3.0.0
-module load w3nco/v2.0.6
-module load w3emc/v2.3.0
-module load nemsio/v2.2.3
-module load g2/v3.1.0
-module load g2tmpl/v1.5.0
-module load crtm/v2.3.0
-module load jasper/v1.900.1
-module load png/v1.2.44
-module load z/v1.2.6
+module load ufs_common
 
-module load esmf/v8.0.0
+setenv CC mpiicc
+setenv CXX mpiicpc
+setenv FC mpiifort
+setenv CMAKE_Platform s4.intel
diff --git a/modulefiles/ufs_s4.intel_debug b/modulefiles/ufs_s4.intel_debug
@@ -0,0 +1,21 @@
+#%Module
+
+proc ModulesHelp {} {
+  puts stderr "\tcit - loads modules required for building and running UFS Model on S4"
+}
+
+module-whatis "loads UFS Model prerequisites for S4"
+
+
+module load license_intel/S4
+module use /data/prod/hpc-stack/modulefiles/stack
+module load hpc/1.1.0
+module load hpc-intel/18.0.4
+module load hpc-impi/18.0.4
+
+module load ufs_common_debug
+
+setenv CC mpiicc
+setenv CXX mpiicpc
+setenv FC mpiifort
+setenv CMAKE_Platform s4.intel
+8 −2		.gitignore
+9 −9		.gitmodules
+11 −97		CMakeLists.txt
+1 −1		atmos_cubed_sphere
+14 −1		ccpp/CMakeLists.txt