Merge branch 'dev/ufs-weather-model' into feature/addflds4schism

NOAA-EMC · Nov 14, 2024 · 1b78c31 · 1b78c31
2 parents cb2e58b + abe1e79
commit 1b78c31
Show file tree

Hide file tree

Showing 18 changed files with 2,569 additions and 1,428 deletions.
diff --git a/model/src/CMakeLists.txt b/model/src/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 # Open switch file
 file(STRINGS ${CMAKE_BINARY_DIR}/switch switch_strings)
 separate_arguments(switches UNIX_COMMAND ${switch_strings})
@@ -66,11 +65,26 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
     set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -c <TARGET>")
   endif()
 
+elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(IntelLLVM)$")
+  set(compile_flags -no-fma -g -traceback -i4 -real-size 32 -fp-model precise -assume byterecl -fno-alias)
+  set(compile_flags_release -O3)
+  # SHELL: prefix fixes CMake attempting to de-duplicate the repeated uses of 'all' in -warn, -debug, -check
+  # See https://cmake.org/cmake/help/latest/command/target_compile_options.html#option-de-duplication
+  set(compile_flags_debug -O0 "SHELL:-debug all" "SHELL:-warn all" "SHELL:-check all" -check noarg_temp_created -fp-stack-check -heap-arrays -traceback -fpe0)
+
+  if(APPLE)
+    # The linker on macOS does not include `common symbols` (usually module variables without a default value) by default
+    # Passing the -c flag includes them and fixes an error with undefined symbols
+    # Only ifort marks these symbols as common, compared to GCC
+    set(CMAKE_Fortran_ARCHIVE_FINISH "<CMAKE_RANLIB> -c <TARGET>")
+    set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -c <TARGET>")
+  endif()
+
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$")
   set(compile_flags -g -fno-second-underscore -ffree-line-length-none)
   set(compile_flags_release -O3)
   set(compile_flags_debug -Wall -fcheck=all -ffpe-trap=invalid,zero,overflow -frecursive -fbacktrace)
-  
+
   if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
     target_compile_options(ww3_lib PUBLIC -fallow-argument-mismatch)
   endif()
@@ -79,7 +93,7 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "PGI")
   set(compile_flags -g -i4 -r4 -Kieee)
   set(compile_flags_release -O3)
   set(compile_flags_debug -O0 -Mbounds -Mchkfpstk -Mchkstk -Mdalign -Mdclchk -Mdepchk -Miomutex -Ktrap=fp -Mrecursive -traceback)
-  
+
   if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
     target_compile_options(ww3_lib PUBLIC -fallow-argument-mismatch -fallow-invalid-boz)
   endif()
@@ -137,7 +151,7 @@ if(UFS_CAP)
   elseif(UFS_CAP STREQUAL "NUOPC_MESH")
     set(cap_src ${nuopc_mesh_cap_src})
   endif()
-  
+
   target_sources(ww3_lib PRIVATE ${cap_src})
   target_link_libraries(ww3_lib PUBLIC esmf)
   # Don't build executables when building WW3 ESMF library
@@ -216,7 +230,7 @@ install(
 
 install(FILES ${CMAKE_BINARY_DIR}/switch DESTINATION ${CMAKE_INSTALL_PREFIX})
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod DESTINATION ${CMAKE_INSTALL_PREFIX})
-  
+
 
 export(EXPORT WW3Exports
   NAMESPACE WW3::

diff --git a/model/src/cmake/src_list.cmake b/model/src/cmake/src_list.cmake
@@ -55,8 +55,7 @@ set(ftn_src
   wmupdtmd.F90
   wmwavemd.F90
   w3tidemd.F90
-  wav_grdout.F90
-  w3iogoncdmd.F90
+  wav_history_mod.F90
   wav_shr_flags.F90
   )
 
@@ -67,6 +66,8 @@ set(nuopc_mesh_cap_src
   wav_comp_nuopc.F90
   wav_import_export.F90
   wav_wrapper_mod.F90
+  wav_pio_mod.F90
+  wav_restart_mod.F90
   )
 
 set(esmf_multi_cap_src

diff --git a/model/src/w3gridmd.F90 b/model/src/w3gridmd.F90
@@ -836,7 +836,7 @@ MODULE W3GRIDMD
   !
 #ifdef W3_ST4
   INTEGER                 :: SWELLFPAR, SDSISO, SDSBRFDF
-  REAL 		   :: SDSBCHOICE
+  REAL                    :: SDSBCHOICE
   REAL                    :: ZWND, ALPHA0, Z0MAX, BETAMAX, SINTHP,&
        ZALP, Z0RAT, TAUWSHELTER, SWELLF,    &
        SWELLF2,SWELLF3,SWELLF4, SWELLF5,    &
@@ -3280,7 +3280,7 @@ SUBROUTINE W3GRID()
            JGS_TERMINATE_DIFFERENCE,                   &
            JGS_TERMINATE_NORM,                         &
            JGS_LIMITER,                                &
-           JGS_LIMITER_FUNC,                           & 
+           JGS_LIMITER_FUNC,                           &
            JGS_USE_JACOBI,                             &
            JGS_BLOCK_GAUSS_SEIDEL,                     &
            JGS_MAXITER,                                &
@@ -3617,7 +3617,7 @@ SUBROUTINE W3GRID()
       END SELECT
 
       IF (FSTOTALIMP .or. FSTOTALEXP) THEN
-        LPDLIB = .TRUE. 
+        LPDLIB = .TRUE.
       ENDIF
       !
       IF (SUM(UNSTSCHEMES).GT.1) WRITE(NDSO,1035)