Merge remote-tracking branch 'origin/feature/GQM' into prod/forecast

umr-lops · Oct 10, 2023 · 70b15ae · 70b15ae
2 parents 35297c3 + 5fd254d
commit 70b15ae
Show file tree

Hide file tree

Showing 16 changed files with 7 additions and 1,196 deletions.
diff --git a/model/src/w3snl2md.F90 b/model/src/w3snl2md.F90
@@ -227,7 +227,6 @@ SUBROUTINE W3SNL2 (  A, CG, WN, DEPTH, S, D )
 #endif
     REAL                    :: A2(NK,NTH), S2(NK,NTH), D2(NK,NTH)
     REAL                    :: CONX
-    REAL, INTENT(IN)        :: A(NTH,NK), CG(NK), WN(NK), DEPTH
 #ifdef W3_T0
     REAL                    :: SOUT(NK,NK), DOUT(NK,NK)
 #endif

diff --git a/regtests/bin/matrix.base b/regtests/bin/matrix.base
@@ -915,7 +915,8 @@
     echo "$rtst -g Romero   -w work_Romero  -i input_10ms -N   $ww3 ww3_ts1" >> matrix.body
     echo "$rtst -g ST4_T701 -w work_T701    -i input_10ms -N   $ww3 ww3_ts1" >> matrix.body
     echo "$rtst -g ST4_T702 -w work_T702    -i input_10ms -N   $ww3 ww3_ts1" >> matrix.body
-
+    echo "$rtst -g ST4_T707 -w work_T707GQM -i input_10ms -N  $ww3 ww3_ts1" >> matrix.body
+    echo "$rtst -g ST4_T713 -w work_T713GQM -i input_10ms -N  $ww3 ww3_ts1" >> matrix.body
   fi
 
 # fetch limited growth, no switch sharing here

diff --git a/regtests/bin/matrix_cmake_datarmor b/regtests/bin/matrix_cmake_datarmor
@@ -129,7 +129,7 @@ main_dir="`cd $main_dir 1>/dev/null 2>&1 && pwd`"
   export mpi='$MPI_LAUNCH'
 
 # Compile option
-  opt="-f -N -S -T"
+  opt="-f -N -S -T -o both"
 
 # Base run_test command line
   export rtst="./bin/run_cmake_test $opt"

diff --git a/regtests/ww3_ts1/input/namelists_ST4_T707.nml b/regtests/ww3_ts1/input/namelists_ST4_T707.nml
@@ -2,7 +2,7 @@
        TAILNL=-5.0, GQMTHRSAT=5E-5, GQMTHRCOU = 0.05, GQAMP1=1., 
        GQAMP2=0.0022, GQAMP3=1., GQAMP4=1.0 / 
  &SIN4 BETAMAX = 1.6, TAUWSHELTER = 0.0 / 
- &SDS4 SDSBCHOICE=3, SDSC2 = -2.3, SDSBR = 0.005, CUMSIGP =2.0,  
+ &SDS4 SDSBCHOICE=3, SDSC2 = -2.3, SDSBR = 0.005,  
        FXFM3 = 20, SDSFACMTF = 400., 
        SDSMWD = 2., SDSCUM = 0.35, SDSNUW =0, SDSC5=1., SDSBRF1=0.5 /
 &SIC2 IC2ROUGH  =  0.001000, IC2VISC = 2.000, IC2DMAX =0.300 /

diff --git a/regtests/ww3_ts1/input_10ms/namelists_Romero.nml b/regtests/ww3_ts1/input_10ms/namelists_Romero.nml
diff --git a/regtests/ww3_ts1/input_10ms/namelists_ST4_T471.nml b/regtests/ww3_ts1/input_10ms/namelists_ST4_T471.nml
diff --git a/regtests/ww3_ts1/input_10ms/namelists_ST4_T475.nml b/regtests/ww3_ts1/input_10ms/namelists_ST4_T475.nml
diff --git a/regtests/ww3_ts1/input_10ms/namelists_ST4_T701.nml b/regtests/ww3_ts1/input_10ms/namelists_ST4_T701.nml
diff --git a/regtests/ww3_ts1/input_10ms/namelists_ST4_T702.nml b/regtests/ww3_ts1/input_10ms/namelists_ST4_T702.nml
diff --git a/regtests/ww3_ts1/input_10ms/namelists_ST4_T707.nml b/regtests/ww3_ts1/input_10ms/namelists_ST4_T707.nml
@@ -2,7 +2,7 @@
        TAILNL=-5.0, GQMTHRSAT=5E-5, GQMTHRCOU = 0.05, GQAMP1=1., 
        GQAMP2=0.0022, GQAMP3=1., GQAMP4=1.0 / 
  &SIN4 BETAMAX = 1.6, TAUWSHELTER = 0.0 / 
- &SDS4 SDSBCHOICE=3, SDSC2 = -2.3, SDSBR = 0.005, CUMSIGP =2.0,  
+ &SDS4 SDSBCHOICE=3, SDSC2 = -2.3, SDSBR = 0.005,  
        FXFM3 = 20, SDSFACMTF = 400., 
        SDSMWD = 2., SDSCUM = 0.35, SDSNUW =0, SDSC5=1., SDSBRF1=0.5 /
 &SIC2 IC2ROUGH  =  0.001000, IC2VISC = 2.000, IC2DMAX =0.300 /

diff --git a/regtests/ww3_ts1/input_10ms/namelists_ST4_T713.nml b/regtests/ww3_ts1/input_10ms/namelists_ST4_T713.nml
@@ -1,9 +1,8 @@
  &SNL1 IQTYPE = -2, GQMNF1 = 11, GQMNT1 =  6, GQMNQ_OM2 =  6, 
        TAILNL=-5.0, GQMTHRSAT=5E-5, GQMTHRCOU = 0.05, GQAMP1=1., 
        GQAMP2=0.0022, GQAMP3=2. /
-&SIN4 BETAMAX = 1.1, TAUWSHELTER = 0.0, TAUWBUG = 0,
-      VISCSTRESS =1., SINTABLE=0 /
-&SDS4 SDSBCHOICE=3, SDSC2 = -2.5, SDSBR = 0.005, CUMSIGP =2.0, 
+&SIN4 BETAMAX = 1.1, TAUWSHELTER = 0.0 /
+&SDS4 SDSBCHOICE=3, SDSC2 = -2.5, SDSBR = 0.005, 
       SDSSTRAIN2 =1.,SDSCUMP=1., FXFM3 = 20, SDSFACMTF = 200.,
       SDSMWD = 0.9, SDSCUM = 0.3, SDSNUW =0, SDSC5=0.5, SDSBRF1=0.5 /
 &SIC2 IC2ROUGH  =  0.001000, IC2VISC = 2.000, IC2DMAX =0.300 /

diff --git a/regtests/ww3_ts1/input_10ms/ww3_grid_Romero.nml b/regtests/ww3_ts1/input_10ms/ww3_grid_Romero.nml