Merge pull request #648 from JessicaMeixner-NOAA/merge-dev-to-ufs-202…

…20324

Merge develop to dev/ufs-weather-model branch  20220324

CMakeLists.txt

@@ -13,10 +13,11 @@ project(
 
 get_directory_property(hasParent PARENT_DIRECTORY)
 if(hasParent)
-  # Unset flags that come from UFS because they (-r8/-r4) conflict
-  # with Ww3
+  # Unset flags that come from Parent (ie UFS or other coupled build) 
+  # for potential (-r8/-r4) conflict
   set(CMAKE_Fortran_FLAGS "")
   set(CMAKE_C_FLAGS "")
+  remove_definitions(-DDEBUG)
 endif()
 
 set(MULTI_ESMF OFF CACHE BOOL "Build ww3_multi_esmf library")

manual/eqs/output.tex

@@ -232,7 +232,7 @@ \subsection{~Output parameters} \label{sub:outpars}
       where
       \begin{equation} n = \frac{1}{2} + \frac{kd}{\sinh 2kd}
       \: . \label{eq:n} \end{equation}
-\item \textbf{TWO} Wave to ocean momentum flux
+\item \textbf{TWO} Wave to ocean momentum flux (m$^2$/s$^2$)
 \item \textbf{BHD} Bernoulli head (m$^2$/s$^2$)
       \begin{equation} J =  g \int \!\!\!\! \int  \frac{k}
         {\sinh 2kd}  \: F(k,\theta) \: dk d\theta
@@ -265,6 +265,9 @@ \subsection{~Output parameters} \label{sub:outpars}
         {\sinh^2 kd}  \: F(k,\theta) \: dk d\theta
       \: . \label{eq:Ussp} \end{equation}
 The number $n$ and the central wavenumbers for the partitions $k_n$ are `run-time' in the sense that they are defined in the model definition file generated from ww3\_grid.inp (see the sample input file for details on setting these quantities).  The wavenumber integral bounds for each $n$ partition divide the model wave spectra to accomodate the prescribed values of $k_n$.
+\item \textbf{TOC} Total ocean stress (Pa)
+      \begin{equation} \tau_{oc} = \tau_a - \tau_{aw} + \tau_{woc}
+      \: . \label{eq:Toc} \end{equation}
 \end{list}
 
 \item{Wave-bottom layer}

model/inp/ww3_shel.inp

@@ -197,6 +197,7 @@ $  F  F  6     9   P2SMS      P2L   Micro seism  source term
 $  F  F  6    10   TAUICE     TWI   Wave to sea ice stress
 $  F  F  6    11   PHICE      FIC   Wave to sea ice energy flux
 $  F  F  6    12   USSP       USP   Partitioned surface Stokes drift
+$  F  F  6    13   TAUOC[X,Y] TOC   Total momentum to the ocean
 $   -------------------------------------------------
 $        7                          Wave-bottom layer 
 $   -------------------------------------------------

model/nml/ww3_multi.nml

@@ -199,7 +199,7 @@
 !  EF TH1M STH1M TH2M STH2M WN
 !  PHS PTP PLP PDIR PSPR PWS PDP PQP PPE PGW PSW PTM10 PT01 PT02 PEP TWS PNR
 !  UST CHA CGE FAW TAW TWA WCC WCF WCH WCM FWS
-!  SXY TWO BHD FOC TUS USS P2S USF P2L TWI FIC
+!  SXY TWO BHD FOC TUS USS P2S USF P2L TWI FIC USP TOC
 !  ABR UBR BED FBB TBB
 !  MSS MSC WL02 AXT AYT AXY
 !  DTD FC CFX CFD CFK

model/nml/ww3_shel.nml

@@ -187,6 +187,7 @@
 !  F  F  6    10   TAUICE     TWI   Wave to sea ice stress
 !  F  F  6    11   PHICE      FIC   Wave to sea ice energy flux
 !  F  F  6    12   USSP       USP   Partitioned surface Stokes drift
+!  F  F  6    13   TAUOC[X,Y] TOC   Total momentum to the ocean
 !   -------------------------------------------------
 !        7                          Wave-bottom layer 
 !   -------------------------------------------------

model/tools/bash/ww3_multi_inp2nml.sh

@@ -672,7 +672,7 @@ cat >> $nmlfile << EOF
 !  EF TH1M STH1M TH2M STH2M WN
 !  PHS PTP PLP PDIR PSPR PWS PDP PQP PPE PGW PSW PTM10 PT01 PT02 PEP TWS PNR
 !  UST CHA CGE FAW TAW TWA WCC WCF WCH WCM FWS
-!  SXY TWO BHD FOC TUS USS P2S USF P2L TWI FIC
+!  SXY TWO BHD FOC TUS USS P2S USF P2L TWI FIC USP TOC
 !  ABR UBR BED FBB TBB
 !  MSS MSC WL02 AXT AYT AXY
 !  DTD FC CFX CFD CFK

model/tools/bash/ww3_ounf_inp2nml.sh

@@ -183,7 +183,7 @@ cat >> $nmlfile << EOF
 !  EF TH1M STH1M TH2M STH2M WN
 !  PHS PTP PLP PDIR PSPR PWS PDP PQP PPE PGW PSW PTM10 PT01 PT02 PEP TWS PNR
 !  UST CHA CGE FAW TAW TWA WCC WCF WCH WCM FWS
-!  SXY TWO BHD FOC TUS USS P2S USF P2L TWI FIC
+!  SXY TWO BHD FOC TUS USS P2S USF P2L TWI FIC USP TOC
 !  ABR UBR BED FBB TBB
 !  MSS MSC WL02 AXT AYT AXY
 !  DTD FC CFX CFD CFK

model/tools/bash/ww3_shel_inp2nml.sh

@@ -829,6 +829,8 @@ cat >> $nmlfile << EOF
 !  F  F  6     9   P2SMS      P2L   Micro seism  source term
 !  F  F  6    10   TAUICE     TWI   Wave to sea ice stress
 !  F  F  6    11   PHICE      FIC   Wave to sea ice energy flux
+!  F  F  6    12   USSP       USP   Partitioned surface Stokes drift
+!  F  F  6    13   TAUOC[X,Y] TOC   Total momentum to the ocean
 !   -------------------------------------------------
 !        7                          Wave-bottom layer
 !   -------------------------------------------------
@@ -869,7 +871,7 @@ cat >> $nmlfile << EOF
 !
 ! * coupling fields exchanged list is :
 !   - Sent fields by ww3:
-!       - Ocean model : T0M1 OCHA OHS DIR BHD TWO UBR FOC TAW TUS USS LM DRY
+!       - Ocean model : T0M1 OCHA OHS DIR BHD TWO UBR FOC TAW TUS USS LM DRY TOC
 !       - Atmospheric model : ACHA AHS TP (or FP) FWS
 !       - Ice model : IC5 TWI
 !   - Received fields by ww3:

regtests/bin/matrix_cmake_ncep

@@ -165,10 +165,11 @@ main_dir="`cd $main_dir 1>/dev/null 2>&1 && pwd`"
 # Compile option
   if [ "$cmplOption" = 'y' ]
   then
-     opt="-c $cmplr -S -T"
+     opt="-o all -c $cmplr -S -T"
   else
-     opt="-S"
+     opt="-o all -S"
   fi
+
 # Batch queue option
   if [ "$batchq" = 'slurm' ]
   then

regtests/bin/run_cmake_test

@@ -367,6 +367,15 @@ fi
 
 mkdir -p $path_w
 
+cd $path_w
+
+if [ $stub ] && [ -f finished ]
+then
+  echo " Test already finished, skipping ..."
+  echo ' '
+  exit 0
+fi
+
 if [ $multi -eq 0 ] && [ $coupl = "OASIS" ]
 then
   ww3_dir=${path_s}/..
@@ -406,7 +415,7 @@ then
   if [[ "$outopt" = "all" ]] || [[ "$outopt" = "grib" ]] ; 
   then 
     cat $file_c | sed 's/DIST/SHRD/' | sed 's/MPI //'   | \
-                  sed 's/OMPG //'    | sed 's/NOGRB/NCEP2/' \
+                  sed 's/OMPG //'    | sed 's/NOGRB/NCEP2/' | \
                   sed 's/OMPH //'    | sed 's/PDLIB //' | \
                   sed 's/B4B //' > $path_build/switch
   else 
@@ -547,13 +556,6 @@ echo " Input directory: $path_i"
 echo " Switch file: $file_c"
 echo ' '
 
-if [ $stub ] && [ -f finished ]
-then
-  echo " Test already finished, skipping ..."
-  echo ' '
-  exit 0
-fi
-
 # 3.b2 Preprocess cdl files into nc files ----------------------------------- #
 
 for f in $(find $path_i/ -type f -name "*.cdl")