Merge remote-tracking branch 'remotes/upstream/dev/ufs-weather-model' into feature/hafsv2p2_baseline

Author: BinLiu-NOAA

CMakeLists.txt

@@ -16,6 +16,13 @@ if(hasParent)
   # Unset flags that come from Parent (ie UFS or other coupled build)
   # for potential (-r8/-r4) conflict
   set(CMAKE_Fortran_FLAGS "")
+  if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
+    set(CMAKE_Fortran_FLAGS_DEBUG "-check all -check noarg_temp_created -ftrapuv")
+  elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(IntelLLVM)$")
+    set(CMAKE_Fortran_FLAGS_DEBUG "-check all -check noarg_temp_created -ftrapuv")
+  else()
+    message(WARNING "Fortran compiler with ID ${CMAKE_Fortran_COMPILER_ID} will be used with CMake default options")
+  endif()
   set(CMAKE_C_FLAGS "")
   remove_definitions(-DDEBUG)
 endif()

cmake/FindSCOTCH.cmake

@@ -77,8 +77,46 @@ find_package_handle_standard_args(
     REQUIRED_VARS ptscotchparmetis_lib
     ptscotchparmetis_inc)
 
+
+## Find version of scotch if possible
+if( EXISTS "${scotch_inc}/scotch.h" )
+  
+  file(READ "${scotch_inc}/scotch.h" header_content)
+
+  # Extract the major version number using regex
+  string(REGEX MATCH "SCOTCH_VERSION ([0-9]+)" VERSION_MAJOR_MATCH "${header_content}")
+  if(VERSION_MAJOR_MATCH)
+    set(SCOTCH_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    message(STATUS "SCOTCH_VERSION_MAJOR: ${SCOTCH_VERSION_MAJOR}")
+  else()
+    message(WARNING "Could not find SCOTCH_VERSION in scotch.h")
+  endif()
+
+  # Extract the minor version number using regex
+  string(REGEX MATCH "SCOTCH_RELEASE ([0-9]+)" VERSION_MINOR_MATCH "${header_content}")
+  if(VERSION_MINOR_MATCH)
+    set(SCOTCH_RELEASE "${CMAKE_MATCH_1}")
+    message(STATUS "SCOTCH_RELEASE: ${SCOTCH_RELEASE}")
+  else()
+    message(WARNING "Could not find SCOTCH_RELEASE in scotch.h")
+  endif()
+
+  # Extract the patch version number using regex
+  string(REGEX MATCH "SCOTCH_PATCHLEVEL ([0-9]+)" VERSION_PATCH_MATCH "${header_content}")
+  if(VERSION_PATCH_MATCH)
+    set(SCOTCH_PATCHLEVEL "${CMAKE_MATCH_1}")
+    message(STATUS "SCOTCH_PATCHLEVEL: ${SCOTCH_PATCHLEVEL}")
+  else()
+    message(WARNING "Could not find VERSION_PATCH in scotch.h")
+  endif()
+  set(SCOTCH_VERSION "${SCOTCH_VERSION_MAJOR}.${SCOTCH_RELEASE}.${SCOTCH_PATCHLEVEL}")
+endif()
+
 message(STATUS "Found SCOTCH: ${scotch_lib}")
 message(STATUS "Found PTSCOTCH: ${ptscotch_lib}")
 message(STATUS "Found SCOTCHerr: ${scotcherr_lib}")
 message(STATUS "Found PTSCOTCHerr: ${ptscotcherr_lib}")
 message(STATUS "Found PTSCOTCHparmetis: ${ptscotchparmetis_lib}")
+message(STATUS "SCOTCH version: ${SCOTCH_VERSION}")
+
+

model/inp/ww3_grid.inp

@@ -528,6 +528,10 @@ $                           P2SF   : ......
 $                           CALTYPE: Calendar type. The only accepted
 $                                    values are 'standard' (default),
 $                                    '365_day', or '360_day'.
+$                           IC_NUMERICS: Logical variable (T/F). Set to T to
+$                                      allow the user to place the 'sea ice'
+$                                      source terms with other source terms
+$                                      Default is F (PR_1294)
 $
 $ Diagnostic Sea-state Dependent Stress- - - - - - - - - - - - - - - - -
 $   Reichl et al. 2014  : Namelist FLD1

model/inp/ww3_strt.inp

@@ -67,6 +67,12 @@ $ ITYPE = 5 ---------------------------------------------------------- $
 $ Starting from calm conditions.
 $ - No additional data.
 $
+$ ITYPE = 6 ---------------------------------------------------------- $
+$ Similar to ITYPE = 3, but with manually specified fetch.
+$ - assumed fetch (m):
+$ 
+$ 5000
+$ 
 $ -------------------------------------------------------------------- $
 $ End of input file                                                    $
 $ -------------------------------------------------------------------- $

model/src/CMakeLists.txt

@@ -105,10 +105,6 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Cray")
   set(compile_flags_debug -O0 -Rbcps -Ktrap=fp)
 endif()
 
-target_compile_options(ww3_lib PUBLIC "$<$<COMPILE_LANGUAGE:Fortran>:${compile_flags}>")
-target_compile_options(ww3_lib PUBLIC "$<$<AND:$<CONFIG:Debug>,$<COMPILE_LANGUAGE:Fortran>>:${compile_flags_debug}>")
-target_compile_options(ww3_lib PUBLIC "$<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:Fortran>>:${compile_flags_release}>")
-
 # Executables to always build
 set(programs ww3_strt ww3_grid ww3_bound ww3_outf ww3_outp ww3_trck ww3_grib
   ww3_gint gx_outf gx_outp ww3_uprstr ww3_shel ww3_prep ww3_gspl ww3_multi ww3_systrk)
@@ -119,6 +115,8 @@ set(netcdf_programs ww3_ounf ww3_ounp ww3_bounc ww3_trnc ww3_prnc)
 if("OASIS" IN_LIST switches)
   find_package(OASIS REQUIRED)
   target_link_libraries(ww3_lib PUBLIC OASIS::OASIS)
+  find_package(MPI REQUIRED COMPONENTS Fortran)
+  target_link_libraries(ww3_lib PUBLIC MPI::MPI_Fortran)
 endif()
 
 if(NETCDF)
@@ -169,28 +167,35 @@ if("OMPG" IN_LIST switches)
   target_link_libraries(ww3_lib PUBLIC OpenMP::OpenMP_Fortran)
 endif()
 
-if("MPI" IN_LIST switches)
-  find_package(MPI REQUIRED COMPONENTS Fortran)
-  target_link_libraries(ww3_lib PUBLIC MPI::MPI_Fortran)
-endif()
-
 if("PIO" IN_LIST switches)
   target_sources(ww3_lib PRIVATE ${pio_src})
 endif()
 
 # Handle PDLIB, SCRIP, SCRIPNC build files directly instead of through configuration file
 if("PDLIB" IN_LIST switches)
   if("SCOTCH" IN_LIST switches)
-  find_package(SCOTCH REQUIRED)
-  target_sources(ww3_lib PRIVATE ${pdlib_src})
-  target_link_libraries(ww3_lib PUBLIC PTSCOTCHparmetis::PTSCOTCHparmetis)
-elseif("METIS"  IN_LIST switches)
-  find_package(ParMETIS REQUIRED)
-  target_sources(ww3_lib PRIVATE ${pdlib_src})
-  target_link_libraries(ww3_lib PUBLIC ParMETIS::ParMETIS)
+    find_package(SCOTCH REQUIRED)
+    target_sources(ww3_lib PRIVATE ${pdlib_src})
+    target_link_libraries(ww3_lib PUBLIC PTSCOTCHparmetis::PTSCOTCHparmetis)
+    if(SCOTCH_VERSION VERSION_GREATER "7.0.6")
+      list(APPEND compile_flags -DSCOTCH_707)
+      list(APPEND compile_flags_release -DSCOTCH_707)
+      list(APPEND compile_flags_debug -DSCOTCH_707)
+    else()
+      message(STATUS "SOCTCH version 7.06 or lower")
+    endif()
+  elseif("METIS"  IN_LIST switches)
+    find_package(ParMETIS REQUIRED)
+    target_sources(ww3_lib PRIVATE ${pdlib_src})
+    target_link_libraries(ww3_lib PUBLIC ParMETIS::ParMETIS)
   else()
     message(FATAL_ERROR "PDLIB requires METIS or SCOTCH library for domain decomposition")
- endif()
+  endif()
+endif()
+
+if("MPI" IN_LIST switches)
+  find_package(MPI REQUIRED COMPONENTS Fortran)
+  target_link_libraries(ww3_lib PUBLIC MPI::MPI_Fortran)
 endif()
 
 if("SCRIP" IN_LIST switches)
@@ -224,6 +229,10 @@ foreach(program ${programs})
   target_link_libraries(${program} PRIVATE ww3_lib)
 endforeach()
 
+target_compile_options(ww3_lib PUBLIC "$<$<COMPILE_LANGUAGE:Fortran>:${compile_flags}>")
+target_compile_options(ww3_lib PUBLIC "$<$<AND:$<CONFIG:Debug>,$<COMPILE_LANGUAGE:Fortran>>:${compile_flags_debug}>")
+target_compile_options(ww3_lib PUBLIC "$<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:Fortran>>:${compile_flags_release}>")
+
 install(
   TARGETS ${programs} ww3_lib
   EXPORT WW3Exports

model/src/PDLIB/yowpdlibmain.F90

@@ -629,13 +629,23 @@ subroutine runParmetis(MNP)
 
     !if(debugParmetis) write(710+myrank,*) "Run ParMETIS now..."
 #ifdef W3_SCOTCH
+#ifdef SCOTCH_707 
+! Starting with SCOTCH 7.0.7 need ot explicitly call the SCOTCHF
+    call SCOTCHFParMETIS_V3_PartGeomKway(vtxdist, xadj, adjncy, &
+         vwgt, & !vwgt - ignore weights
+         adjwgt, & ! adjwgt - ignore weights
+         wgtflag, &
+         numflag,ndims,xyz,ncon,nparts,tpwgts,ubvec,options, &
+         edgecut,part, comm,ref)
+#else 
     call SCOTCH_ParMETIS_V3_PartGeomKway(vtxdist, xadj, adjncy, &
          vwgt, & !vwgt - ignore weights
          adjwgt, & ! adjwgt - ignore weights
          wgtflag, &
          numflag,ndims,xyz,ncon,nparts,tpwgts,ubvec,options, &
          edgecut,part, comm,ref)
 #endif
+#endif
 
 #ifdef W3_METIS
     call ParMETIS_V3_PartGeomKway(vtxdist, xadj, adjncy, &