Merge branch 'fb_stvp' of github.com:CarstenHansen/WW3 into fb_xsmf

Author: CarstenHansen

.github/workflows/gnu.yml

@@ -8,9 +8,9 @@ concurrency:
 
 env:
   cache_key: gnu11
-  CC: gcc-10
-  FC: gfortran-10
-  CXX: g++-10
+  CC: gcc-14
+  FC: gfortran-14
+  CXX: g++-14
 
 
 # Split into a steup step, and a WW3 build step which
@@ -45,7 +45,8 @@ jobs:
         run: |
           # Install NetCDF, ESMF, g2, etc using Spack
           sudo apt install cmake
-          git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git
+          #git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git
+          git clone -c feature.manyFiles=true --depth=2 --branch=spack-stack-1.9.3 https://github.com/JCSDA/spack.git
           source spack/share/spack/setup-env.sh
           spack env create ww3-gnu ww3/model/ci/spack_gnu.yaml
           spack env activate ww3-gnu

.github/workflows/intel.yml

@@ -26,7 +26,7 @@ env:
 
 jobs:
   setup:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
 

.github/workflows/regtest_gnu.yml

@@ -8,9 +8,9 @@ concurrency:
 
 env:
   cache_key: gnu11-1
-  CC: gcc-10
-  FC: gfortran-10
-  CXX: g++-10
+  CC: gcc-14
+  FC: gfortran-14
+  CXX: g++-14
 
 
 # Split into a steup step, and a WW3 build step which
@@ -45,7 +45,7 @@ jobs:
         run: |
           # Install NetCDF, ESMF, g2, etc using Spack
           sudo apt install cmake
-          git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git
+          git clone -c feature.manyFiles=true --depth=2 --branch=spack-stack-1.9.3 https://github.com/JCSDA/spack.git
           source spack/share/spack/setup-env.sh
           spack env create ww3-gnu ww3/model/ci/spack_gnu.yaml
           spack env activate ww3-gnu

manual/eqs/output.tex

@@ -128,7 +128,7 @@ \subsection{~Output parameters} \label{sub:outpars}
       \frac{a_1(f)^2+b_1(f)^2}{E(f)^2} \right )^{1/2} \right \} \right ]^{1/2}
       \: , \label{eq:sig_th1} \end{equation}
 \item \textbf{TH2M} Mean direction from $a_2$ and $b_2$ (degr.)
-       \begin{equation} \theta_2 (f)= \mbox{atan} \left ( \frac{b_2(f)}{a_2(f)} \right )
+       \begin{equation} \theta_2 (f)= 0.5 \mbox{atan} \left ( \frac{b_2(f)}{a_2(f)} \right )
       \: , \label{eq:theta_2} \end{equation} \begin{equation}
       a_2(f) = 2 \pi \int_0^{2\pi} \int_0^\infty \cos(2 \theta) F(\sigma,\theta) \:
        \mathrm{d}\theta \: , \end{equation} \begin{equation}

model/bin/switch_NCEP_rwps

@@ -0,0 +1 @@
+NCO PDLIB SCOTCH NOGRB BIN2NC DIST MPI PR3 UQ FLX0 SEED ST4 STAB0 NL1 BT1 DB1 MLIM TR1 BS0 RWND WNX1 WNT1 CRX1 CRT1 O0 O1 O2 O3 O4 O5 O6 O7 O14 O15 IC0 IS0 REF0

model/ci/spack_gnu.yaml

@@ -7,12 +7,12 @@ spack:
   - metis@5.1.0~shared
   - parmetis@4.0.3~shared
   - scotch@7.0.1+mpi+metis~shared
-  - netcdf-c@4.7.4~dap
-  - netcdf-fortran@4.5.3
+  - netcdf-c@4.9.2~dap
+  - netcdf-fortran@4.6.1
   - jasper@2.0.32
   - g2@3.4.5
   - bacio@2.4.1
-  - w3emc@2.9.2
+  - w3emc@2.12.0
   - parallelio@2.5.9+fortran~pnetcdf
   - esmf@8.4.2~debug~xerces+external-parallelio
   view: true

model/ci/spack_intel.yaml

@@ -5,8 +5,8 @@ spack:
       providers:
         mpi: [intel-oneapi-mpi]
   specs:
-  - netcdf-c@4.7.4~dap
-  - netcdf-fortran@4.5.3
+  - netcdf-c@4.9.2~dap
+  - netcdf-fortran@4.6.1
   - bacio@2.4.1
   - g2@3.4.5
   - metis@5.1.0~shared

model/inp/ww3_grid.inp

@@ -358,6 +358,8 @@ $                           JGS_LIMITER  : TRUE: Use total (quasi-steady: limits
 $                                          FALSE: default 
 $                           JGS_LIMITER_FUNC  : 1 - old limiter (default)
 $                                               2 - alternatnive limiter
+$                           JGS_TRUNK_DIGITS  : [Only with switch TRNK] Number of digits of precision to truncate solution to at the end of iterative solver. 
+$                                               Can be used to force bit-for-bit reproducibility.
 $                           SETUP_APPLY_WLV  : Compute wave setup (TRUE/FALSE, default TRUE) 
 $                           SOLVERTHR_SETUP  : Solver threshold for setup computations (default 1E-6)
 $                           CRIT_DEP_SETUP  : Critical depth for setup computations (default 0.1) 

model/src/CMakeLists.txt

@@ -207,9 +207,17 @@ 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}>")
+if (UFS_CAP)
+  # Building as part of UFS (submodule)
+  set(WW3_FLAG_SCOPE PRIVATE)
+else()
+  # Standalone WW3 build
+  set(WW3_FLAG_SCOPE PUBLIC)
+endif()
+
+target_compile_options(ww3_lib ${WW3_FLAG_SCOPE} "$<$<COMPILE_LANGUAGE:Fortran>:${compile_flags}>")
+target_compile_options(ww3_lib ${WW3_FLAG_SCOPE} "$<$<AND:$<CONFIG:Debug>,$<COMPILE_LANGUAGE:Fortran>>:${compile_flags_debug}>")
+target_compile_options(ww3_lib ${WW3_FLAG_SCOPE} "$<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:Fortran>>:${compile_flags_release}>")
 
 install(
   TARGETS ${programs} ww3_lib

model/src/PDLIB/yowdatapool.F90

@@ -37,7 +37,8 @@
 !
 !> Has fancy data
 module yowDatapool
-  use MPI, only: MPI_COMM_WORLD, MPI_INTEGER, MPI_REAL4, MPI_REAL8, MPI_STATUS_SIZE
+  use mpi_f08, only: MPI_COMM_WORLD, MPI_INTEGER, MPI_REAL4, MPI_REAL8, &
+                     MPI_COMM, MPI_STATUS, MPI_Datatype
   implicit none
   !#ifdef USE_SINGLE
   !  !> single precision. Enable with compiler flag -DUSE_SINGLE
@@ -63,17 +64,17 @@ module yowDatapool
 
   !> MPI Communicator.
   !> Should be MPI_COMM_WORLD. If pdlib is run into a existing MPI enviroment, comm is set to a new communicator
-  integer,public,save :: comm
+  type(MPI_COMM),public,save :: comm
 
   !> MPI Integer Type.
   !> Should be MPI_INTEGER
-  integer,save :: itype = MPI_INTEGER
+  type(MPI_Datatype),save :: itype = MPI_INTEGER
 
   !> MPI Real Type
   !> Shpuld be MPI_REAL8
-  integer :: istatus(MPI_STATUS_SIZE)
+  type(MPI_STATUS) :: istatus
   !#ifdef USE_SINGLE
-  integer, save :: rtype = MPI_REAL4
+  type(MPI_Datatype), save :: rtype = MPI_REAL4
   !#else
   !  integer, save :: rtype = MPI_REAL8
   !#endif