CMAKE for WW3 (#1089)

* Use WW3 CMake build Co-authored-by: kgerheiser <kgerheiser@icloud.com>
ufs-community · Mar 16, 2022 · e028578 · e028578
1 parent 10a616d
commit e028578
Show file tree

Hide file tree

Showing 20 changed files with 3,045 additions and 3,240 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -155,27 +155,10 @@ endif()
 ### Wave components [WW3]
 ###############################################################################
 if(WW3)
-  if(CMAKE_Platform)
-    if(${CMAKE_Platform} MATCHES "linux*" OR ${CMAKE_Platform} MATCHES "macosx*")
-      if (CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
-        set(WW3_COMP "gnu")
-      elseif (CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
-        set(WW3_COMP "intel")
-      endif()
-    else()
-      set(WW3_COMP ${CMAKE_Platform})
-    endif()
-  endif()
-  message("Build WW3:")
-  message("   run: ${CMAKE_BUILD_TOOL} WW3_PARCOMPN=4 WW3_COMP=${WW3_COMP} ww3_nemslibonly")
-  message("   in:  ${CMAKE_CURRENT_SOURCE_DIR}/WW3/model/esmf")
-  message("")
-
-  add_custom_target(ww3_nems
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/WW3/model/esmf
-    COMMAND ${CMAKE_BUILD_TOOL} WW3_PARCOMPN=4 WW3_COMP=${WW3_COMP} ww3_nemslibonly > ${CMAKE_CURRENT_BINARY_DIR}/ww3_make.log 2>&1)
-
-  set(WW3_LIBS ${CMAKE_CURRENT_SOURCE_DIR}/WW3/model/obj/libww3_multi_esmf.a)
+  # Set options for WW3 build
+  set(SWITCH "multi_esmf" CACHE STRING "Default to switch_multi_esmf")
+  set(MULTI_ESMF ON CACHE BOOL "Enable ESMF for WW3")
+  add_subdirectory(WW3)
 endif()
 
 ###############################################################################
@@ -227,10 +210,8 @@ if(UFS_GOCART)
 endif()
 
 if(WW3)
-  add_dependencies(ufs ww3_nems)
   list(APPEND _ufs_defs_private FRONT_WW3=WMESMFMD)
-  target_include_directories(ufs PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/WW3/model/mod)
-  list(APPEND _ufs_libs_public ${WW3_LIBS})
+  target_link_libraries(ufs PUBLIC WW3::WW3)
 endif()
 
 list(APPEND _ufs_libs_public esmf)

diff --git a/WW3 b/WW3
diff --git a/modulefiles/ufs_cheyenne.gnu b/modulefiles/ufs_cheyenne.gnu
@@ -6,7 +6,7 @@ proc ModulesHelp {} {
 
 module-whatis "loads UFS Model prerequisites for Cheyenne/GNU"
 
-module load cmake/3.18.2
+module load cmake/3.22.0
 module load python/3.7.9
 
 # load programming environment

diff --git a/modulefiles/ufs_cheyenne.gnu_debug b/modulefiles/ufs_cheyenne.gnu_debug
@@ -6,7 +6,7 @@ proc ModulesHelp {} {
 
 module-whatis "loads UFS Model prerequisites for Cheyenne/GNU"
 
-module load cmake/3.18.2
+module load cmake/3.22.0
 module load python/3.7.9
 
 # load programming environment

diff --git a/modulefiles/ufs_cheyenne.intel b/modulefiles/ufs_cheyenne.intel
@@ -6,7 +6,7 @@ proc ModulesHelp {} {
 
 module-whatis "loads UFS Model prerequisites for Cheyenne/Intel"
 
-module load cmake/3.18.2
+module load cmake/3.22.0
 module load python/3.7.9
 
 # load programming environment

diff --git a/modulefiles/ufs_cheyenne.intel_debug b/modulefiles/ufs_cheyenne.intel_debug
@@ -6,7 +6,7 @@ proc ModulesHelp {} {
 
 module-whatis "loads UFS Model prerequisites for Cheyenne/Intel"
 
-module load cmake/3.18.2
+module load cmake/3.22.0
 module load python/3.7.9
 
 # load programming environment

diff --git a/modulefiles/ufs_orion.intel b/modulefiles/ufs_orion.intel
@@ -8,7 +8,7 @@ module-whatis "loads UFS Model prerequisites for Orion/Intel"
 
 module load contrib noaatools
 
-module load cmake/3.18.1
+module load cmake/3.22.1
 module load python/3.7.5
 
 module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack

diff --git a/modulefiles/ufs_orion.intel_debug b/modulefiles/ufs_orion.intel_debug
@@ -8,7 +8,7 @@ module-whatis "loads UFS Model prerequisites for Orion/Intel"
 
 module load contrib noaatools
 
-module load cmake/3.18.1
+module load cmake/3.22.1
 module load python/3.7.5
 
 module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack