diff --git a/model/src/w3snl2md.F90 b/model/src/w3snl2md.F90
index cf867db8b..8452e6468 100644
--- 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
index cac401bff..aec155cde 100755
--- 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
index 4e635f3c2..16c31e47c 100755
--- 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
index b1d0a9727..16f81517d 100644
--- 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
deleted file mode 100644
index 919c786d9..000000000
--- a/regtests/ww3_ts1/input_10ms/namelists_Romero.nml
+++ /dev/null
@@ -1,20 +0,0 @@
-&SIN4 BETAMAX = 1.43, SWELLF = 0.66, TAUWSHELTER = 0.3, Z0MAX = 0.0008, 
-      SWELLF3 = 0.022,  SWELLF4 = 150000.0, SWELLF7 = 360000.00, ZALP = 0.006 /
-&SDS4 SDSBCHOICE = 3, SDSC2 = -3.80, FXFM3 = 20.00, WNMEANP = 1.0 , 
-      SDSSTRAINA = 0.00, SDSSTRAIN = 0.00, SDSSTRAIN2 = 0.00,
-      SDSBR = 0.005, SDSBT = 0.0011, SDSCUM = 0.300, SDSC5 = 1.0,
-      SDSMWD = 0.90, SDSFACMTF = 400 /
-&SNL1 NLPROP = 25000000.0 /
-
-&OUTS P2SF = 1, E3D = 1, I1P2SF = 1, I2P2SF = 36 /
-&PRO3 WDTHCG = 1.50, WDTHTH = 1.50  /
-&REF1 REFCOAST = 0.1, REFCOSP_STRAIGHT = 4, REFFREQ = 0., REFICEBERG = 0.4,
-      REFMAP = 0., REFSLOPE = 0., REFSUBGRID = 0.2, REFRMAX = 0.5 /
-&SIC2 IC2DISPER = F, IC2TURB = 0.5 , IC2ROUGH = 0.0001,
-      IC2REYNOLDS = 150000, IC2SMOOTH  = 200000., IC2VISC = 1.0  /
-&SIS2 ISC1 = 1., IS2C2 = 0.000000, IS2C3 = 0. , IS2BACKSCAT = 1. ,
-      IS2BREAK = T, IS2DUPDATE = F , IS2CREEPB = 5E8 , IS2CREEPD = 0.3 /
-&MISC ICEHINIT = 0.5, ICEHMIN = 0.1, CICE0 = 0.25, NOSW =6,
-      CICEN = 2.00, LICE = 40000., FACBERG = 0.2 ,
-      WCOR1=21., WCOR2=0.5  /
-END OF NAMELISTS
diff --git a/regtests/ww3_ts1/input_10ms/namelists_ST4_T471.nml b/regtests/ww3_ts1/input_10ms/namelists_ST4_T471.nml
deleted file mode 100644
index 5ab7abb58..000000000
--- a/regtests/ww3_ts1/input_10ms/namelists_ST4_T471.nml
+++ /dev/null
@@ -1,2 +0,0 @@
-! T471 corresponds to the default parameter values for ST4. 
-END OF NAMELISTS
diff --git a/regtests/ww3_ts1/input_10ms/namelists_ST4_T475.nml b/regtests/ww3_ts1/input_10ms/namelists_ST4_T475.nml
deleted file mode 100644
index e104247aa..000000000
--- a/regtests/ww3_ts1/input_10ms/namelists_ST4_T475.nml
+++ /dev/null
@@ -1,7 +0,0 @@
-&SIN4 BETAMAX = 1.75, SWELLF = 0.66, TAUWSHELTER = 0.3, 
-      SWELLF3 = 0.022,  SWELLF4 = 115000.0, SWELLF7 = 432000.00 /
-&SDS4 FXFM3 = 2.5 /
-&SIC2 IC2ROUGH  =  0.001000, IC2VISC = 2.000, IC2DMAX =0.300 /
-&SIS2 ISC1 =0.200E+00,  IS2BREAK =  T, IS2DUPDATE =  F, IS2CREEPB =  0.200E+08 /
-
-END OF NAMELISTS
diff --git a/regtests/ww3_ts1/input_10ms/namelists_ST4_T701.nml b/regtests/ww3_ts1/input_10ms/namelists_ST4_T701.nml
deleted file mode 100644
index b107fef73..000000000
--- a/regtests/ww3_ts1/input_10ms/namelists_ST4_T701.nml
+++ /dev/null
@@ -1,20 +0,0 @@
-&SIN4 BETAMAX = 1.7, SWELLF = 0.60, TAUWSHELTER = 0.3,
-      SWELLF3 = 0.022,  SWELLF4 = 115000.0, SWELLF7 = 432000.00 /
-&SDS4 SDSBCHOICE = 3, SDSC2 = -3.80, FXFM3 = 20.00, CUMSIGP = 2, 
-      SDSBR = 0.005, SDSBT = 0.0011, SDSCUM = 0.300, SDSC5 = 1.0,
-      SDSMWD = 2.00, SDSFACMTF = 400 /
-&SNL1 NLPROP = 25000000.0 /
-
-&OUTS P2SF = 1, E3D = 1, I1P2SF = 1, I2P2SF = 36 /
-&PRO3 WDTHCG = 1.50, WDTHTH = 1.50  /
-&REF1 REFCOAST = 0.1, REFCOSP_STRAIGHT = 4, REFFREQ = 0., REFICEBERG = 0.4,
-      REFMAP = 0., REFSLOPE = 0., REFSUBGRID = 0.2, REFRMAX = 0.5 /
-
-&SIC2 IC2ROUGH  =  0.001000, IC2VISC = 2.000, IC2DMAX =0.300 /
-&SIS2 ISC1 =0.200E+00,  IS2BREAK =  T, IS2DUPDATE =  F, IS2CREEPB =  0.200E+08, 
-      IS2CREEPD = 0.50 /
-
-&MISC ICEHINIT = 0.5, ICEHMIN = 0.1, CICE0 = 0.25, NOSW =6,
-      CICEN = 2.00, LICE = 40000., FACBERG = 0.2 ,
-      WCOR1=21., WCOR2=0.5  /
-END OF NAMELISTS
diff --git a/regtests/ww3_ts1/input_10ms/namelists_ST4_T702.nml b/regtests/ww3_ts1/input_10ms/namelists_ST4_T702.nml
deleted file mode 100644
index 1b673567a..000000000
--- a/regtests/ww3_ts1/input_10ms/namelists_ST4_T702.nml
+++ /dev/null
@@ -1,14 +0,0 @@
-&SIN4 BETAMAX = 1.7, SWELLF = 0.60, TAUWSHELTER = 0.2,
-      SWELLF3 = 0.022,  SWELLF4 = 115000.0, SWELLF7 = 432000.00 /
-&SDS4 SDSBCHOICE = 3, SDSC2 = -3.80, FXFM3 = 20.00, CUMSIGP = 2,
-      SDSSTRAINA = 0.00, SDSSTRAIN = 0.00, SDSSTRAIN2 = 0.00, 
-      SDSBR = 0.005, SDSBT = 0.0011, SDSCUM = 0.300, SDSC5 = 1.0,
-      SDSMWD = 0.00, SDSFACMTF = 400 /
-&SNL1 NLPROP = 25000000.0 /
-&SIC2 IC2ROUGH  =  0.001000, IC2VISC = 2.000, IC2DMAX =0.300 /
-&SIS2 ISC1 =0.200E+00,  IS2BREAK =  T, IS2DUPDATE =  F, IS2CREEPB =  0.200E+08 /
-! DO NOT FORGET TO ADD FLAGTR = 4 for real life runs ... 
-&MISC ICEHINIT = 0.5, ICEHMIN = 0.1, CICE0 = 0.25, NOSW =6,
-      CICEN = 2.00, LICE = 40000., FACBERG = 0.2 ,
-      WCOR1=21., WCOR2=0.5  /
-END OF NAMELISTS
diff --git a/regtests/ww3_ts1/input_10ms/namelists_ST4_T707.nml b/regtests/ww3_ts1/input_10ms/namelists_ST4_T707.nml
index 8d19dd444..0458cd775 100644
--- 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
index fa4a7eb78..878604430 100644
--- 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
deleted file mode 100644
index c510784c1..000000000
--- a/regtests/ww3_ts1/input_10ms/ww3_grid_Romero.nml
+++ /dev/null
@@ -1,225 +0,0 @@
-! -------------------------------------------------------------------- !
-! WAVEWATCH III - ww3_grid.nml - Grid pre-processing                   !
-! -------------------------------------------------------------------- !
-
-! -------------------------------------------------------------------- !
-! Define the spectrum parameterization via SPECTRUM_NML namelist
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     SPECTRUM%XFR         = 0.            ! frequency increment
-!     SPECTRUM%FREQ1       = 0.            ! first frequency (Hz)
-!     SPECTRUM%NK          = 0             ! number of frequencies (wavenumbers)
-!     SPECTRUM%NTH         = 0             ! number of direction bins
-!     SPECTRUM%THOFF       = 0.            ! relative offset of first direction [-0.5,0.5]
-! -------------------------------------------------------------------- !
-&SPECTRUM_NML
-  SPECTRUM%XFR       =  1.10
-  SPECTRUM%FREQ1     =  0.034
-  SPECTRUM%NK        =  36
-  SPECTRUM%NTH       =  36
-/
-
-! -------------------------------------------------------------------- !
-! Define the run parameterization via RUN_NML namelist
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     RUN%FLDRY            = F             ! dry run (I/O only, no calculation)
-!     RUN%FLCX             = F             ! x-component of propagation
-!     RUN%FLCY             = F             ! y-component of propagation
-!     RUN%FLCTH            = F             ! direction shift
-!     RUN%FLCK             = F             ! wavenumber shift
-!     RUN%FLSOU            = F             ! source terms
-! -------------------------------------------------------------------- !
-&RUN_NML
-  RUN%FLSOU        =  T
-/
-
-! -------------------------------------------------------------------- !
-! Define the timesteps parameterization via TIMESTEPS_NML namelist
-!
-! * It is highly recommended to set up time steps which are multiple 
-!   between them. 
-!
-! * The first time step to calculate is the maximum CFL time step
-!   which depend on the lowest frequency FREQ1 previously set up and the
-!   lowest spatial grid resolution in meters DXY.
-!   reminder : 1 degree=60minutes // 1minute=1mile // 1mile=1.852km
-!   The formula for the CFL time is :
-!   Tcfl = DXY / (G / (FREQ1*4*Pi) ) with the constants Pi=3,14 and G=9.8m/s²;
-!   DTXY  ~= 90% Tcfl
-!   DTMAX ~= 3 * DTXY   (maximum global time step limit)
-!
-! * The refraction time step depends on how strong can be the current velocities
-!   on your grid :
-!   DTKTH ~= DTMAX / 2   ! in case of no or light current velocities
-!   DTKTH ~= DTMAX / 10  ! in case of strong current velocities
-!
-! * The source terms time step is usually defined between 1s and 60s.
-!   A common value is 10s.
-!   DTMIN = 10
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     TIMESTEPS%DTMAX      = 0.         ! maximum global time step (s)
-!     TIMESTEPS%DTXY       = 0.         ! maximum CFL time step for x-y (s)
-!     TIMESTEPS%DTKTH      = 0.         ! maximum CFL time step for k-th (s)
-!     TIMESTEPS%DTMIN      = 0.         ! minimum source term time step (s)
-! -------------------------------------------------------------------- !
-&TIMESTEPS_NML
-  TIMESTEPS%DTMAX        =  900.
-  TIMESTEPS%DTXY         =  900.
-  TIMESTEPS%DTKTH        =  900.
-  TIMESTEPS%DTMIN        =  15.
-/
-
-! -------------------------------------------------------------------- !
-! Define the grid to preprocess via GRID_NML namelist
-!
-! * the tunable parameters for source terms, propagation schemes, and 
-!    numerics are read using namelists. 
-! * Any namelist found in the folowing sections is temporarily written
-!   to param.scratch, and read from there if necessary. 
-! * The order of the namelists is immaterial.
-! * Namelists not needed for the given switch settings will be skipped
-!   automatically
-!
-! * grid type can be : 
-!    'RECT' : rectilinear
-!    'CURV' : curvilinear
-!    'UNST' : unstructured (triangle-based)
-!
-! * coordinate system can be : 
-!    'SPHE' : Spherical (degrees)
-!    'CART' : Cartesian (meters)
-!
-! * grid closure can only be applied in spherical coordinates
-!
-! * grid closure can be : 
-!    'NONE' : No closure is applied
-!    'SMPL' : Simple grid closure. Grid is periodic in the
-!           : i-index and wraps at i=NX+1. In other words,
-!           : (NX+1,J) => (1,J). A grid with simple closure
-!           : may be rectilinear or curvilinear.
-!    'TRPL' : Tripole grid closure : Grid is periodic in the
-!           : i-index and wraps at i=NX+1 and has closure at
-!           : j=NY+1. In other words, (NX+1,J<=NY) => (1,J)
-!           : and (I,NY+1) => (NX-I+1,NY). Tripole
-!           : grid closure requires that NX be even. A grid
-!           : with tripole closure must be curvilinear.
-!
-! * The coastline limit depth is the value which distinguish the sea 
-!   points to the land points. All the points with depth values (ZBIN)
-!   greater than this limit (ZLIM) will be considered as excluded points
-!   and will never be wet points, even if the water level grows over.
-!   It can only overwrite the status of a sea point to a land point.
-!   The value must have a negative value under the mean sea level
-!
-! * The minimum water depth allowed to compute the model is the absolute
-!   depth value (DMIN) used in the model if the input depth is lower to 
-!   avoid the model to blow up.
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     GRID%NAME             = 'unset'            ! grid name (30 char)
-!     GRID%NML              = 'namelists.nml'    ! namelists filename
-!     GRID%TYPE             = 'unset'            ! grid type
-!     GRID%COORD            = 'unset'            ! coordinate system
-!     GRID%CLOS             = 'unset'            ! grid closure
-!
-!     GRID%ZLIM             = 0.        ! coastline limit depth (m)
-!     GRID%DMIN             = 0.        ! abs. minimum water depth (m)
-! -------------------------------------------------------------------- !
-&GRID_NML
-  GRID%NAME         =  'HOMOGENEOUS SOURCE TERM TEST'
-  GRID%NML          =  '../input_10ms/namelists_Romero.nml'
-  GRID%TYPE         =  'RECT'
-  GRID%COORD        =  'SPHE'
-  GRID%CLOS         =  'NONE'
-  GRID%ZLIM         =  -5.
-  GRID%DMIN         =  5.75
-/
-
-! -------------------------------------------------------------------- !
-! Define the rectilinear grid type via RECT_NML namelist
-! - only for RECT grids -
-!
-! * The minimum grid size is 3x3.
-!
-! * If the grid increments SX and SY are given in minutes of arc, the scaling
-!   factor SF must be set to 60. to provide an increment factor in degree.
-!
-! * If CSTRG='SMPL', then SX is forced to 360/NX.
-!
-! * value <= value_read / scale_fac
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     RECT%NX               = 0        ! number of points along x-axis
-!     RECT%NY               = 0        ! number of points along y-axis
-!
-!     RECT%SX               = 0.       ! grid increment along x-axis
-!     RECT%SY               = 0.       ! grid increment along y-axis
-!     RECT%SF               = 1.       ! scaling division factor for x-y axis
-!
-!     RECT%X0               = 0.       ! x-coordinate of lower-left corner (deg)
-!     RECT%Y0               = 0.       ! y-coordinate of lower-left corner (deg)
-!     RECT%SF0              = 1.       ! scaling division factor for x0,y0 coord
-! -------------------------------------------------------------------- !
-&RECT_NML
-  RECT%NX           =  3
-  RECT%NY           =  3
-  RECT%SX           =  1.
-  RECT%SY           =  1.
-  RECT%SF           =  1.E-2
-  RECT%X0           =  -1.
-  RECT%Y0           =  -1.
-  RECT%SF0          =  1.E-2
-/
-
-! -------------------------------------------------------------------- !
-! Define the depth to preprocess via DEPTH_NML namelist
-! - for RECT and CURV grids -
-!
-! * if no obstruction subgrid, need to set &MISC FLAGTR = 0
-!
-! * The depth value must have negative values under the mean sea level
-!
-! * value <= value_read * scale_fac
-!
-! * IDLA : Layout indicator :
-!                  1   : Read line-by-line bottom to top.  (default)
-!                  2   : Like 1, single read statement.
-!                  3   : Read line-by-line top to bottom.
-!                  4   : Like 3, single read statement.
-! * IDFM : format indicator :
-!                  1   : Free format.  (default)
-!                  2   : Fixed format.
-!                  3   : Unformatted.
-! * FORMAT : element format to read :
-!               '(....)'  : auto detected  (default)
-!               '(f10.6)' : float type
-!
-! * Example :
-!      IDF  SF     IDLA  IDFM   FORMAT    FILENAME
-!      50   0.001  1     1     '(....)'  'GLOB-30M.bot'
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     DEPTH%SF             = 1.       ! scale factor
-!     DEPTH%FILENAME       = 'unset'  ! filename
-!     DEPTH%IDF            = 50       ! file unit number
-!     DEPTH%IDLA           = 1        ! layout indicator
-!     DEPTH%IDFM           = 1        ! format indicator
-!     DEPTH%FORMAT         = '(....)' ! formatted read format
-! -------------------------------------------------------------------- !
-&DEPTH_NML
-  DEPTH%SF        =  -2500.
-  DEPTH%FILENAME  =  '../input/HOMOGENEOUS.depth'
-  DEPTH%IDLA      =  3
-/
-
-! -------------------------------------------------------------------- !
-! WAVEWATCH III - end of namelist                                      !
-! -------------------------------------------------------------------- !
diff --git a/regtests/ww3_ts1/input_10ms/ww3_grid_ST4_T471.nml b/regtests/ww3_ts1/input_10ms/ww3_grid_ST4_T471.nml
deleted file mode 100644
index 80069e4a1..000000000
--- a/regtests/ww3_ts1/input_10ms/ww3_grid_ST4_T471.nml
+++ /dev/null
@@ -1,225 +0,0 @@
-! -------------------------------------------------------------------- !
-! WAVEWATCH III - ww3_grid.nml - Grid pre-processing                   !
-! -------------------------------------------------------------------- !
-
-! -------------------------------------------------------------------- !
-! Define the spectrum parameterization via SPECTRUM_NML namelist
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     SPECTRUM%XFR         = 0.            ! frequency increment
-!     SPECTRUM%FREQ1       = 0.            ! first frequency (Hz)
-!     SPECTRUM%NK          = 0             ! number of frequencies (wavenumbers)
-!     SPECTRUM%NTH         = 0             ! number of direction bins
-!     SPECTRUM%THOFF       = 0.            ! relative offset of first direction [-0.5,0.5]
-! -------------------------------------------------------------------- !
-&SPECTRUM_NML
-  SPECTRUM%XFR       =  1.10
-  SPECTRUM%FREQ1     =  0.034
-  SPECTRUM%NK        =  36
-  SPECTRUM%NTH       =  36
-/
-
-! -------------------------------------------------------------------- !
-! Define the run parameterization via RUN_NML namelist
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     RUN%FLDRY            = F             ! dry run (I/O only, no calculation)
-!     RUN%FLCX             = F             ! x-component of propagation
-!     RUN%FLCY             = F             ! y-component of propagation
-!     RUN%FLCTH            = F             ! direction shift
-!     RUN%FLCK             = F             ! wavenumber shift
-!     RUN%FLSOU            = F             ! source terms
-! -------------------------------------------------------------------- !
-&RUN_NML
-  RUN%FLSOU        =  T
-/
-
-! -------------------------------------------------------------------- !
-! Define the timesteps parameterization via TIMESTEPS_NML namelist
-!
-! * It is highly recommended to set up time steps which are multiple 
-!   between them. 
-!
-! * The first time step to calculate is the maximum CFL time step
-!   which depend on the lowest frequency FREQ1 previously set up and the
-!   lowest spatial grid resolution in meters DXY.
-!   reminder : 1 degree=60minutes // 1minute=1mile // 1mile=1.852km
-!   The formula for the CFL time is :
-!   Tcfl = DXY / (G / (FREQ1*4*Pi) ) with the constants Pi=3,14 and G=9.8m/s²;
-!   DTXY  ~= 90% Tcfl
-!   DTMAX ~= 3 * DTXY   (maximum global time step limit)
-!
-! * The refraction time step depends on how strong can be the current velocities
-!   on your grid :
-!   DTKTH ~= DTMAX / 2   ! in case of no or light current velocities
-!   DTKTH ~= DTMAX / 10  ! in case of strong current velocities
-!
-! * The source terms time step is usually defined between 1s and 60s.
-!   A common value is 10s.
-!   DTMIN = 10
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     TIMESTEPS%DTMAX      = 0.         ! maximum global time step (s)
-!     TIMESTEPS%DTXY       = 0.         ! maximum CFL time step for x-y (s)
-!     TIMESTEPS%DTKTH      = 0.         ! maximum CFL time step for k-th (s)
-!     TIMESTEPS%DTMIN      = 0.         ! minimum source term time step (s)
-! -------------------------------------------------------------------- !
-&TIMESTEPS_NML
-  TIMESTEPS%DTMAX        =  900.
-  TIMESTEPS%DTXY         =  900.
-  TIMESTEPS%DTKTH        =  900.
-  TIMESTEPS%DTMIN        =  15.
-/
-
-! -------------------------------------------------------------------- !
-! Define the grid to preprocess via GRID_NML namelist
-!
-! * the tunable parameters for source terms, propagation schemes, and 
-!    numerics are read using namelists. 
-! * Any namelist found in the folowing sections is temporarily written
-!   to param.scratch, and read from there if necessary. 
-! * The order of the namelists is immaterial.
-! * Namelists not needed for the given switch settings will be skipped
-!   automatically
-!
-! * grid type can be : 
-!    'RECT' : rectilinear
-!    'CURV' : curvilinear
-!    'UNST' : unstructured (triangle-based)
-!
-! * coordinate system can be : 
-!    'SPHE' : Spherical (degrees)
-!    'CART' : Cartesian (meters)
-!
-! * grid closure can only be applied in spherical coordinates
-!
-! * grid closure can be : 
-!    'NONE' : No closure is applied
-!    'SMPL' : Simple grid closure. Grid is periodic in the
-!           : i-index and wraps at i=NX+1. In other words,
-!           : (NX+1,J) => (1,J). A grid with simple closure
-!           : may be rectilinear or curvilinear.
-!    'TRPL' : Tripole grid closure : Grid is periodic in the
-!           : i-index and wraps at i=NX+1 and has closure at
-!           : j=NY+1. In other words, (NX+1,J<=NY) => (1,J)
-!           : and (I,NY+1) => (NX-I+1,NY). Tripole
-!           : grid closure requires that NX be even. A grid
-!           : with tripole closure must be curvilinear.
-!
-! * The coastline limit depth is the value which distinguish the sea 
-!   points to the land points. All the points with depth values (ZBIN)
-!   greater than this limit (ZLIM) will be considered as excluded points
-!   and will never be wet points, even if the water level grows over.
-!   It can only overwrite the status of a sea point to a land point.
-!   The value must have a negative value under the mean sea level
-!
-! * The minimum water depth allowed to compute the model is the absolute
-!   depth value (DMIN) used in the model if the input depth is lower to 
-!   avoid the model to blow up.
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     GRID%NAME             = 'unset'            ! grid name (30 char)
-!     GRID%NML              = 'namelists.nml'    ! namelists filename
-!     GRID%TYPE             = 'unset'            ! grid type
-!     GRID%COORD            = 'unset'            ! coordinate system
-!     GRID%CLOS             = 'unset'            ! grid closure
-!
-!     GRID%ZLIM             = 0.        ! coastline limit depth (m)
-!     GRID%DMIN             = 0.        ! abs. minimum water depth (m)
-! -------------------------------------------------------------------- !
-&GRID_NML
-  GRID%NAME         =  'HOMOGENEOUS SOURCE TERM TEST'
-  GRID%NML          =  '../input_10ms/namelists_ST4_T471.nml'
-  GRID%TYPE         =  'RECT'
-  GRID%COORD        =  'SPHE'
-  GRID%CLOS         =  'NONE'
-  GRID%ZLIM         =  -5.
-  GRID%DMIN         =  5.75
-/
-
-! -------------------------------------------------------------------- !
-! Define the rectilinear grid type via RECT_NML namelist
-! - only for RECT grids -
-!
-! * The minimum grid size is 3x3.
-!
-! * If the grid increments SX and SY are given in minutes of arc, the scaling
-!   factor SF must be set to 60. to provide an increment factor in degree.
-!
-! * If CSTRG='SMPL', then SX is forced to 360/NX.
-!
-! * value <= value_read / scale_fac
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     RECT%NX               = 0        ! number of points along x-axis
-!     RECT%NY               = 0        ! number of points along y-axis
-!
-!     RECT%SX               = 0.       ! grid increment along x-axis
-!     RECT%SY               = 0.       ! grid increment along y-axis
-!     RECT%SF               = 1.       ! scaling division factor for x-y axis
-!
-!     RECT%X0               = 0.       ! x-coordinate of lower-left corner (deg)
-!     RECT%Y0               = 0.       ! y-coordinate of lower-left corner (deg)
-!     RECT%SF0              = 1.       ! scaling division factor for x0,y0 coord
-! -------------------------------------------------------------------- !
-&RECT_NML
-  RECT%NX           =  3
-  RECT%NY           =  3
-  RECT%SX           =  1.
-  RECT%SY           =  1.
-  RECT%SF           =  1.E-2
-  RECT%X0           =  -1.
-  RECT%Y0           =  -1.
-  RECT%SF0          =  1.E-2
-/
-
-! -------------------------------------------------------------------- !
-! Define the depth to preprocess via DEPTH_NML namelist
-! - for RECT and CURV grids -
-!
-! * if no obstruction subgrid, need to set &MISC FLAGTR = 0
-!
-! * The depth value must have negative values under the mean sea level
-!
-! * value <= value_read * scale_fac
-!
-! * IDLA : Layout indicator :
-!                  1   : Read line-by-line bottom to top.  (default)
-!                  2   : Like 1, single read statement.
-!                  3   : Read line-by-line top to bottom.
-!                  4   : Like 3, single read statement.
-! * IDFM : format indicator :
-!                  1   : Free format.  (default)
-!                  2   : Fixed format.
-!                  3   : Unformatted.
-! * FORMAT : element format to read :
-!               '(....)'  : auto detected  (default)
-!               '(f10.6)' : float type
-!
-! * Example :
-!      IDF  SF     IDLA  IDFM   FORMAT    FILENAME
-!      50   0.001  1     1     '(....)'  'GLOB-30M.bot'
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     DEPTH%SF             = 1.       ! scale factor
-!     DEPTH%FILENAME       = 'unset'  ! filename
-!     DEPTH%IDF            = 50       ! file unit number
-!     DEPTH%IDLA           = 1        ! layout indicator
-!     DEPTH%IDFM           = 1        ! format indicator
-!     DEPTH%FORMAT         = '(....)' ! formatted read format
-! -------------------------------------------------------------------- !
-&DEPTH_NML
-  DEPTH%SF        =  -2500.
-  DEPTH%FILENAME  =  '../input/HOMOGENEOUS.depth'
-  DEPTH%IDLA      =  3
-/
-
-! -------------------------------------------------------------------- !
-! WAVEWATCH III - end of namelist                                      !
-! -------------------------------------------------------------------- !
diff --git a/regtests/ww3_ts1/input_10ms/ww3_grid_ST4_T475.nml b/regtests/ww3_ts1/input_10ms/ww3_grid_ST4_T475.nml
deleted file mode 100644
index 7d41e0b7d..000000000
--- a/regtests/ww3_ts1/input_10ms/ww3_grid_ST4_T475.nml
+++ /dev/null
@@ -1,225 +0,0 @@
-! -------------------------------------------------------------------- !
-! WAVEWATCH III - ww3_grid.nml - Grid pre-processing                   !
-! -------------------------------------------------------------------- !
-
-! -------------------------------------------------------------------- !
-! Define the spectrum parameterization via SPECTRUM_NML namelist
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     SPECTRUM%XFR         = 0.            ! frequency increment
-!     SPECTRUM%FREQ1       = 0.            ! first frequency (Hz)
-!     SPECTRUM%NK          = 0             ! number of frequencies (wavenumbers)
-!     SPECTRUM%NTH         = 0             ! number of direction bins
-!     SPECTRUM%THOFF       = 0.            ! relative offset of first direction [-0.5,0.5]
-! -------------------------------------------------------------------- !
-&SPECTRUM_NML
-  SPECTRUM%XFR       =  1.10
-  SPECTRUM%FREQ1     =  0.0485
-  SPECTRUM%NK        =  36
-  SPECTRUM%NTH       =  24
-/
-
-! -------------------------------------------------------------------- !
-! Define the run parameterization via RUN_NML namelist
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     RUN%FLDRY            = F             ! dry run (I/O only, no calculation)
-!     RUN%FLCX             = F             ! x-component of propagation
-!     RUN%FLCY             = F             ! y-component of propagation
-!     RUN%FLCTH            = F             ! direction shift
-!     RUN%FLCK             = F             ! wavenumber shift
-!     RUN%FLSOU            = F             ! source terms
-! -------------------------------------------------------------------- !
-&RUN_NML
-  RUN%FLSOU        =  T
-/
-
-! -------------------------------------------------------------------- !
-! Define the timesteps parameterization via TIMESTEPS_NML namelist
-!
-! * It is highly recommended to set up time steps which are multiple 
-!   between them. 
-!
-! * The first time step to calculate is the maximum CFL time step
-!   which depend on the lowest frequency FREQ1 previously set up and the
-!   lowest spatial grid resolution in meters DXY.
-!   reminder : 1 degree=60minutes // 1minute=1mile // 1mile=1.852km
-!   The formula for the CFL time is :
-!   Tcfl = DXY / (G / (FREQ1*4*Pi) ) with the constants Pi=3,14 and G=9.8m/s²;
-!   DTXY  ~= 90% Tcfl
-!   DTMAX ~= 3 * DTXY   (maximum global time step limit)
-!
-! * The refraction time step depends on how strong can be the current velocities
-!   on your grid :
-!   DTKTH ~= DTMAX / 2   ! in case of no or light current velocities
-!   DTKTH ~= DTMAX / 10  ! in case of strong current velocities
-!
-! * The source terms time step is usually defined between 5s and 60s.
-!   A common value is 10s.
-!   DTMIN ~= 10
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     TIMESTEPS%DTMAX      = 0.         ! maximum global time step (s)
-!     TIMESTEPS%DTXY       = 0.         ! maximum CFL time step for x-y (s)
-!     TIMESTEPS%DTKTH      = 0.         ! maximum CFL time step for k-th (s)
-!     TIMESTEPS%DTMIN      = 0.         ! minimum source term time step (s)
-! -------------------------------------------------------------------- !
-&TIMESTEPS_NML
-  TIMESTEPS%DTMAX        =  900.
-  TIMESTEPS%DTXY         =  900.
-  TIMESTEPS%DTKTH        =  900.
-  TIMESTEPS%DTMIN        =  15.
-/
-
-! -------------------------------------------------------------------- !
-! Define the grid to preprocess via GRID_NML namelist
-!
-! * the tunable parameters for source terms, propagation schemes, and 
-!    numerics are read using namelists. 
-! * Any namelist found in the folowing sections is temporarily written
-!   to param.scratch, and read from there if necessary. 
-! * The order of the namelists is immaterial.
-! * Namelists not needed for the given switch settings will be skipped
-!   automatically
-!
-! * grid type can be : 
-!    'RECT' : rectilinear
-!    'CURV' : curvilinear
-!    'UNST' : unstructured (triangle-based)
-!
-! * coordinate system can be : 
-!    'SPHE' : Spherical (degrees)
-!    'CART' : Cartesian (meters)
-!
-! * grid closure can only be applied in spherical coordinates
-!
-! * grid closure can be : 
-!    'NONE' : No closure is applied
-!    'SMPL' : Simple grid closure. Grid is periodic in the
-!           : i-index and wraps at i=NX+1. In other words,
-!           : (NX+1,J) => (1,J). A grid with simple closure
-!           : may be rectilinear or curvilinear.
-!    'TRPL' : Tripole grid closure : Grid is periodic in the
-!           : i-index and wraps at i=NX+1 and has closure at
-!           : j=NY+1. In other words, (NX+1,J<=NY) => (1,J)
-!           : and (I,NY+1) => (NX-I+1,NY). Tripole
-!           : grid closure requires that NX be even. A grid
-!           : with tripole closure must be curvilinear.
-!
-! * The coastline limit depth is the value which distinguish the sea 
-!   points to the land points. All the points with depth values (ZBIN)
-!   greater than this limit (ZLIM) will be considered as excluded points
-!   and will never be wet points, even if the water level grows over.
-!   It can only overwrite the status of a sea point to a land point.
-!   The value must have a negative value under the mean sea level
-!
-! * The minimum water depth allowed to compute the model is the absolute
-!   depth value (DMIN) used in the model if the input depth is lower to 
-!   avoid the model to blow up.
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     GRID%NAME             = 'unset'            ! grid name (30 char)
-!     GRID%NML              = 'namelists.nml'    ! namelists filename
-!     GRID%TYPE             = 'unset'            ! grid type
-!     GRID%COORD            = 'unset'            ! coordinate system
-!     GRID%CLOS             = 'unset'            ! grid closure
-!
-!     GRID%ZLIM             = 0.        ! coastline limit depth (m)
-!     GRID%DMIN             = 0.        ! abs. minimum water depth (m)
-! -------------------------------------------------------------------- !
-&GRID_NML
-  GRID%NAME         =  'HOMOGENEOUS SOURCE TERM TEST'
-  GRID%NML          =  '../input_10ms/namelists_ST4_T475.nml'
-  GRID%TYPE         =  'RECT'
-  GRID%COORD        =  'SPHE'
-  GRID%CLOS         =  'NONE'
-  GRID%ZLIM         =  -5.
-  GRID%DMIN         =  5.75
-/
-
-! -------------------------------------------------------------------- !
-! Define the rectilinear grid type via RECT_NML namelist
-! - only for RECT grids -
-!
-! * The minimum grid size is 3x3.
-!
-! * If the grid increments SX and SY are given in minutes of arc, the scaling
-!   factor SF must be set to 60. to provide an increment factor in degree.
-!
-! * If CSTRG='SMPL', then SX is forced to 360/NX.
-!
-! * value <= value_read / scale_fac
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     RECT%NX               = 0        ! number of points along x-axis
-!     RECT%NY               = 0        ! number of points along y-axis
-!
-!     RECT%SX               = 0.       ! grid increment along x-axis
-!     RECT%SY               = 0.       ! grid increment along y-axis
-!     RECT%SF               = 1.       ! scaling division factor for x-y axis
-!
-!     RECT%X0               = 0.       ! x-coordinate of lower-left corner (deg)
-!     RECT%Y0               = 0.       ! y-coordinate of lower-left corner (deg)
-!     RECT%SF0              = 1.       ! scaling division factor for x0,y0 coord
-! -------------------------------------------------------------------- !
-&RECT_NML
-  RECT%NX           =  3
-  RECT%NY           =  3
-  RECT%SX           =  1.
-  RECT%SY           =  1.
-  RECT%SF           =  1.E-2
-  RECT%X0           =  -1.
-  RECT%Y0           =  -1.
-  RECT%SF0          =  1.E-2
-/
-
-! -------------------------------------------------------------------- !
-! Define the depth to preprocess via DEPTH_NML namelist
-! - for RECT and CURV grids -
-!
-! * if no obstruction subgrid, need to set &MISC FLAGTR = 0
-!
-! * The depth value must have negative values under the mean sea level
-!
-! * value <= value_read * scale_fac
-!
-! * IDLA : Layout indicator :
-!                  1   : Read line-by-line bottom to top.  (default)
-!                  2   : Like 1, single read statement.
-!                  3   : Read line-by-line top to bottom.
-!                  4   : Like 3, single read statement.
-! * IDFM : format indicator :
-!                  1   : Free format.  (default)
-!                  2   : Fixed format.
-!                  3   : Unformatted.
-! * FORMAT : element format to read :
-!               '(....)'  : auto detected  (default)
-!               '(f10.6)' : float type
-!
-! * Example :
-!      IDF  SF     IDLA  IDFM   FORMAT    FILENAME
-!      50   0.001  1     1     '(....)'  'GLOB-30M.bot'
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     DEPTH%SF             = 1.       ! scale factor
-!     DEPTH%FILENAME       = 'unset'  ! filename
-!     DEPTH%IDF            = 50       ! file unit number
-!     DEPTH%IDLA           = 1        ! layout indicator
-!     DEPTH%IDFM           = 1        ! format indicator
-!     DEPTH%FORMAT         = '(....)' ! formatted read format
-! -------------------------------------------------------------------- !
-&DEPTH_NML
-  DEPTH%SF        =  -2500.
-  DEPTH%FILENAME  =  '../input/HOMOGENEOUS.depth'
-  DEPTH%IDLA      =  3
-/
-
-! -------------------------------------------------------------------- !
-! WAVEWATCH III - end of namelist                                      !
-! -------------------------------------------------------------------- !
diff --git a/regtests/ww3_ts1/input_10ms/ww3_grid_ST4_T701.nml b/regtests/ww3_ts1/input_10ms/ww3_grid_ST4_T701.nml
deleted file mode 100644
index d7aca045c..000000000
--- a/regtests/ww3_ts1/input_10ms/ww3_grid_ST4_T701.nml
+++ /dev/null
@@ -1,225 +0,0 @@
-! -------------------------------------------------------------------- !
-! WAVEWATCH III - ww3_grid.nml - Grid pre-processing                   !
-! -------------------------------------------------------------------- !
-
-! -------------------------------------------------------------------- !
-! Define the spectrum parameterization via SPECTRUM_NML namelist
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     SPECTRUM%XFR         = 0.            ! frequency increment
-!     SPECTRUM%FREQ1       = 0.            ! first frequency (Hz)
-!     SPECTRUM%NK          = 0             ! number of frequencies (wavenumbers)
-!     SPECTRUM%NTH         = 0             ! number of direction bins
-!     SPECTRUM%THOFF       = 0.            ! relative offset of first direction [-0.5,0.5]
-! -------------------------------------------------------------------- !
-&SPECTRUM_NML
-  SPECTRUM%XFR       =  1.10
-  SPECTRUM%FREQ1     =  0.034
-  SPECTRUM%NK        =  36
-  SPECTRUM%NTH       =  36
-/
-
-! -------------------------------------------------------------------- !
-! Define the run parameterization via RUN_NML namelist
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     RUN%FLDRY            = F             ! dry run (I/O only, no calculation)
-!     RUN%FLCX             = F             ! x-component of propagation
-!     RUN%FLCY             = F             ! y-component of propagation
-!     RUN%FLCTH            = F             ! direction shift
-!     RUN%FLCK             = F             ! wavenumber shift
-!     RUN%FLSOU            = F             ! source terms
-! -------------------------------------------------------------------- !
-&RUN_NML
-  RUN%FLSOU        =  T
-/
-
-! -------------------------------------------------------------------- !
-! Define the timesteps parameterization via TIMESTEPS_NML namelist
-!
-! * It is highly recommended to set up time steps which are multiple 
-!   between them. 
-!
-! * The first time step to calculate is the maximum CFL time step
-!   which depend on the lowest frequency FREQ1 previously set up and the
-!   lowest spatial grid resolution in meters DXY.
-!   reminder : 1 degree=60minutes // 1minute=1mile // 1mile=1.852km
-!   The formula for the CFL time is :
-!   Tcfl = DXY / (G / (FREQ1*4*Pi) ) with the constants Pi=3,14 and G=9.8m/s²;
-!   DTXY  ~= 90% Tcfl
-!   DTMAX ~= 3 * DTXY   (maximum global time step limit)
-!
-! * The refraction time step depends on how strong can be the current velocities
-!   on your grid :
-!   DTKTH ~= DTMAX / 2   ! in case of no or light current velocities
-!   DTKTH ~= DTMAX / 10  ! in case of strong current velocities
-!
-! * The source terms time step is usually defined between 1s and 60s.
-!   A common value is 10s.
-!   DTMIN = 10
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     TIMESTEPS%DTMAX      = 0.         ! maximum global time step (s)
-!     TIMESTEPS%DTXY       = 0.         ! maximum CFL time step for x-y (s)
-!     TIMESTEPS%DTKTH      = 0.         ! maximum CFL time step for k-th (s)
-!     TIMESTEPS%DTMIN      = 0.         ! minimum source term time step (s)
-! -------------------------------------------------------------------- !
-&TIMESTEPS_NML
-  TIMESTEPS%DTMAX        =  900.
-  TIMESTEPS%DTXY         =  900.
-  TIMESTEPS%DTKTH        =  900.
-  TIMESTEPS%DTMIN        =  15.
-/
-
-! -------------------------------------------------------------------- !
-! Define the grid to preprocess via GRID_NML namelist
-!
-! * the tunable parameters for source terms, propagation schemes, and 
-!    numerics are read using namelists. 
-! * Any namelist found in the folowing sections is temporarily written
-!   to param.scratch, and read from there if necessary. 
-! * The order of the namelists is immaterial.
-! * Namelists not needed for the given switch settings will be skipped
-!   automatically
-!
-! * grid type can be : 
-!    'RECT' : rectilinear
-!    'CURV' : curvilinear
-!    'UNST' : unstructured (triangle-based)
-!
-! * coordinate system can be : 
-!    'SPHE' : Spherical (degrees)
-!    'CART' : Cartesian (meters)
-!
-! * grid closure can only be applied in spherical coordinates
-!
-! * grid closure can be : 
-!    'NONE' : No closure is applied
-!    'SMPL' : Simple grid closure. Grid is periodic in the
-!           : i-index and wraps at i=NX+1. In other words,
-!           : (NX+1,J) => (1,J). A grid with simple closure
-!           : may be rectilinear or curvilinear.
-!    'TRPL' : Tripole grid closure : Grid is periodic in the
-!           : i-index and wraps at i=NX+1 and has closure at
-!           : j=NY+1. In other words, (NX+1,J<=NY) => (1,J)
-!           : and (I,NY+1) => (NX-I+1,NY). Tripole
-!           : grid closure requires that NX be even. A grid
-!           : with tripole closure must be curvilinear.
-!
-! * The coastline limit depth is the value which distinguish the sea 
-!   points to the land points. All the points with depth values (ZBIN)
-!   greater than this limit (ZLIM) will be considered as excluded points
-!   and will never be wet points, even if the water level grows over.
-!   It can only overwrite the status of a sea point to a land point.
-!   The value must have a negative value under the mean sea level
-!
-! * The minimum water depth allowed to compute the model is the absolute
-!   depth value (DMIN) used in the model if the input depth is lower to 
-!   avoid the model to blow up.
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     GRID%NAME             = 'unset'            ! grid name (30 char)
-!     GRID%NML              = 'namelists.nml'    ! namelists filename
-!     GRID%TYPE             = 'unset'            ! grid type
-!     GRID%COORD            = 'unset'            ! coordinate system
-!     GRID%CLOS             = 'unset'            ! grid closure
-!
-!     GRID%ZLIM             = 0.        ! coastline limit depth (m)
-!     GRID%DMIN             = 0.        ! abs. minimum water depth (m)
-! -------------------------------------------------------------------- !
-&GRID_NML
-  GRID%NAME         =  'HOMOGENEOUS SOURCE TERM TEST'
-  GRID%NML          =  '../input_10ms/namelists_ST4_T701.nml'
-  GRID%TYPE         =  'RECT'
-  GRID%COORD        =  'SPHE'
-  GRID%CLOS         =  'NONE'
-  GRID%ZLIM         =  -5.
-  GRID%DMIN         =  5.75
-/
-
-! -------------------------------------------------------------------- !
-! Define the rectilinear grid type via RECT_NML namelist
-! - only for RECT grids -
-!
-! * The minimum grid size is 3x3.
-!
-! * If the grid increments SX and SY are given in minutes of arc, the scaling
-!   factor SF must be set to 60. to provide an increment factor in degree.
-!
-! * If CSTRG='SMPL', then SX is forced to 360/NX.
-!
-! * value <= value_read / scale_fac
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     RECT%NX               = 0        ! number of points along x-axis
-!     RECT%NY               = 0        ! number of points along y-axis
-!
-!     RECT%SX               = 0.       ! grid increment along x-axis
-!     RECT%SY               = 0.       ! grid increment along y-axis
-!     RECT%SF               = 1.       ! scaling division factor for x-y axis
-!
-!     RECT%X0               = 0.       ! x-coordinate of lower-left corner (deg)
-!     RECT%Y0               = 0.       ! y-coordinate of lower-left corner (deg)
-!     RECT%SF0              = 1.       ! scaling division factor for x0,y0 coord
-! -------------------------------------------------------------------- !
-&RECT_NML
-  RECT%NX           =  3
-  RECT%NY           =  3
-  RECT%SX           =  1.
-  RECT%SY           =  1.
-  RECT%SF           =  1.E-2
-  RECT%X0           =  -1.
-  RECT%Y0           =  -1.
-  RECT%SF0          =  1.E-2
-/
-
-! -------------------------------------------------------------------- !
-! Define the depth to preprocess via DEPTH_NML namelist
-! - for RECT and CURV grids -
-!
-! * if no obstruction subgrid, need to set &MISC FLAGTR = 0
-!
-! * The depth value must have negative values under the mean sea level
-!
-! * value <= value_read * scale_fac
-!
-! * IDLA : Layout indicator :
-!                  1   : Read line-by-line bottom to top.  (default)
-!                  2   : Like 1, single read statement.
-!                  3   : Read line-by-line top to bottom.
-!                  4   : Like 3, single read statement.
-! * IDFM : format indicator :
-!                  1   : Free format.  (default)
-!                  2   : Fixed format.
-!                  3   : Unformatted.
-! * FORMAT : element format to read :
-!               '(....)'  : auto detected  (default)
-!               '(f10.6)' : float type
-!
-! * Example :
-!      IDF  SF     IDLA  IDFM   FORMAT    FILENAME
-!      50   0.001  1     1     '(....)'  'GLOB-30M.bot'
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     DEPTH%SF             = 1.       ! scale factor
-!     DEPTH%FILENAME       = 'unset'  ! filename
-!     DEPTH%IDF            = 50       ! file unit number
-!     DEPTH%IDLA           = 1        ! layout indicator
-!     DEPTH%IDFM           = 1        ! format indicator
-!     DEPTH%FORMAT         = '(....)' ! formatted read format
-! -------------------------------------------------------------------- !
-&DEPTH_NML
-  DEPTH%SF        =  -2500.
-  DEPTH%FILENAME  =  '../input/HOMOGENEOUS.depth'
-  DEPTH%IDLA      =  3
-/
-
-! -------------------------------------------------------------------- !
-! WAVEWATCH III - end of namelist                                      !
-! -------------------------------------------------------------------- !
diff --git a/regtests/ww3_ts1/input_10ms/ww3_grid_ST4_T702.nml b/regtests/ww3_ts1/input_10ms/ww3_grid_ST4_T702.nml
deleted file mode 100644
index 7669b24c6..000000000
--- a/regtests/ww3_ts1/input_10ms/ww3_grid_ST4_T702.nml
+++ /dev/null
@@ -1,225 +0,0 @@
-! -------------------------------------------------------------------- !
-! WAVEWATCH III - ww3_grid.nml - Grid pre-processing                   !
-! -------------------------------------------------------------------- !
-
-! -------------------------------------------------------------------- !
-! Define the spectrum parameterization via SPECTRUM_NML namelist
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     SPECTRUM%XFR         = 0.            ! frequency increment
-!     SPECTRUM%FREQ1       = 0.            ! first frequency (Hz)
-!     SPECTRUM%NK          = 0             ! number of frequencies (wavenumbers)
-!     SPECTRUM%NTH         = 0             ! number of direction bins
-!     SPECTRUM%THOFF       = 0.            ! relative offset of first direction [-0.5,0.5]
-! -------------------------------------------------------------------- !
-&SPECTRUM_NML
-  SPECTRUM%XFR       =  1.10
-  SPECTRUM%FREQ1     =  0.034
-  SPECTRUM%NK        =  36
-  SPECTRUM%NTH       =  36
-/
-
-! -------------------------------------------------------------------- !
-! Define the run parameterization via RUN_NML namelist
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     RUN%FLDRY            = F             ! dry run (I/O only, no calculation)
-!     RUN%FLCX             = F             ! x-component of propagation
-!     RUN%FLCY             = F             ! y-component of propagation
-!     RUN%FLCTH            = F             ! direction shift
-!     RUN%FLCK             = F             ! wavenumber shift
-!     RUN%FLSOU            = F             ! source terms
-! -------------------------------------------------------------------- !
-&RUN_NML
-  RUN%FLSOU        =  T
-/
-
-! -------------------------------------------------------------------- !
-! Define the timesteps parameterization via TIMESTEPS_NML namelist
-!
-! * It is highly recommended to set up time steps which are multiple 
-!   between them. 
-!
-! * The first time step to calculate is the maximum CFL time step
-!   which depend on the lowest frequency FREQ1 previously set up and the
-!   lowest spatial grid resolution in meters DXY.
-!   reminder : 1 degree=60minutes // 1minute=1mile // 1mile=1.852km
-!   The formula for the CFL time is :
-!   Tcfl = DXY / (G / (FREQ1*4*Pi) ) with the constants Pi=3,14 and G=9.8m/s²;
-!   DTXY  ~= 90% Tcfl
-!   DTMAX ~= 3 * DTXY   (maximum global time step limit)
-!
-! * The refraction time step depends on how strong can be the current velocities
-!   on your grid :
-!   DTKTH ~= DTMAX / 2   ! in case of no or light current velocities
-!   DTKTH ~= DTMAX / 10  ! in case of strong current velocities
-!
-! * The source terms time step is usually defined between 5s and 60s.
-!   A common value is 10s.
-!   DTMIN = 10
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     TIMESTEPS%DTMAX      = 0.         ! maximum global time step (s)
-!     TIMESTEPS%DTXY       = 0.         ! maximum CFL time step for x-y (s)
-!     TIMESTEPS%DTKTH      = 0.         ! maximum CFL time step for k-th (s)
-!     TIMESTEPS%DTMIN      = 0.         ! minimum source term time step (s)
-! -------------------------------------------------------------------- !
-&TIMESTEPS_NML
-  TIMESTEPS%DTMAX        =  900.
-  TIMESTEPS%DTXY         =  900.
-  TIMESTEPS%DTKTH        =  900.
-  TIMESTEPS%DTMIN        =  15.
-/
-
-! -------------------------------------------------------------------- !
-! Define the grid to preprocess via GRID_NML namelist
-!
-! * the tunable parameters for source terms, propagation schemes, and 
-!    numerics are read using namelists. 
-! * Any namelist found in the folowing sections is temporarily written
-!   to param.scratch, and read from there if necessary. 
-! * The order of the namelists is immaterial.
-! * Namelists not needed for the given switch settings will be skipped
-!   automatically
-!
-! * grid type can be : 
-!    'RECT' : rectilinear
-!    'CURV' : curvilinear
-!    'UNST' : unstructured (triangle-based)
-!
-! * coordinate system can be : 
-!    'SPHE' : Spherical (degrees)
-!    'CART' : Cartesian (meters)
-!
-! * grid closure can only be applied in spherical coordinates
-!
-! * grid closure can be : 
-!    'NONE' : No closure is applied
-!    'SMPL' : Simple grid closure. Grid is periodic in the
-!           : i-index and wraps at i=NX+1. In other words,
-!           : (NX+1,J) => (1,J). A grid with simple closure
-!           : may be rectilinear or curvilinear.
-!    'TRPL' : Tripole grid closure : Grid is periodic in the
-!           : i-index and wraps at i=NX+1 and has closure at
-!           : j=NY+1. In other words, (NX+1,J<=NY) => (1,J)
-!           : and (I,NY+1) => (NX-I+1,NY). Tripole
-!           : grid closure requires that NX be even. A grid
-!           : with tripole closure must be curvilinear.
-!
-! * The coastline limit depth is the value which distinguish the sea 
-!   points to the land points. All the points with depth values (ZBIN)
-!   greater than this limit (ZLIM) will be considered as excluded points
-!   and will never be wet points, even if the water level grows over.
-!   It can only overwrite the status of a sea point to a land point.
-!   The value must have a negative value under the mean sea level
-!
-! * The minimum water depth allowed to compute the model is the absolute
-!   depth value (DMIN) used in the model if the input depth is lower to 
-!   avoid the model to blow up.
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     GRID%NAME             = 'unset'            ! grid name (30 char)
-!     GRID%NML              = 'namelists.nml'    ! namelists filename
-!     GRID%TYPE             = 'unset'            ! grid type
-!     GRID%COORD            = 'unset'            ! coordinate system
-!     GRID%CLOS             = 'unset'            ! grid closure
-!
-!     GRID%ZLIM             = 0.        ! coastline limit depth (m)
-!     GRID%DMIN             = 0.        ! abs. minimum water depth (m)
-! -------------------------------------------------------------------- !
-&GRID_NML
-  GRID%NAME         =  'HOMOGENEOUS SOURCE TERM TEST'
-  GRID%NML          =  '../input_10ms/namelists_ST4_T702.nml'
-  GRID%TYPE         =  'RECT'
-  GRID%COORD        =  'SPHE'
-  GRID%CLOS         =  'NONE'
-  GRID%ZLIM         =  -5.
-  GRID%DMIN         =  5.75
-/
-
-! -------------------------------------------------------------------- !
-! Define the rectilinear grid type via RECT_NML namelist
-! - only for RECT grids -
-!
-! * The minimum grid size is 3x3.
-!
-! * If the grid increments SX and SY are given in minutes of arc, the scaling
-!   factor SF must be set to 60. to provide an increment factor in degree.
-!
-! * If CSTRG='SMPL', then SX is forced to 360/NX.
-!
-! * value <= value_read / scale_fac
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     RECT%NX               = 0        ! number of points along x-axis
-!     RECT%NY               = 0        ! number of points along y-axis
-!
-!     RECT%SX               = 0.       ! grid increment along x-axis
-!     RECT%SY               = 0.       ! grid increment along y-axis
-!     RECT%SF               = 1.       ! scaling division factor for x-y axis
-!
-!     RECT%X0               = 0.       ! x-coordinate of lower-left corner (deg)
-!     RECT%Y0               = 0.       ! y-coordinate of lower-left corner (deg)
-!     RECT%SF0              = 1.       ! scaling division factor for x0,y0 coord
-! -------------------------------------------------------------------- !
-&RECT_NML
-  RECT%NX           =  3
-  RECT%NY           =  3
-  RECT%SX           =  1.
-  RECT%SY           =  1.
-  RECT%SF           =  1.E-2
-  RECT%X0           =  -1.
-  RECT%Y0           =  -1.
-  RECT%SF0          =  1.E-2
-/
-
-! -------------------------------------------------------------------- !
-! Define the depth to preprocess via DEPTH_NML namelist
-! - for RECT and CURV grids -
-!
-! * if no obstruction subgrid, need to set &MISC FLAGTR = 0
-!
-! * The depth value must have negative values under the mean sea level
-!
-! * value <= value_read * scale_fac
-!
-! * IDLA : Layout indicator :
-!                  1   : Read line-by-line bottom to top.  (default)
-!                  2   : Like 1, single read statement.
-!                  3   : Read line-by-line top to bottom.
-!                  4   : Like 3, single read statement.
-! * IDFM : format indicator :
-!                  1   : Free format.  (default)
-!                  2   : Fixed format.
-!                  3   : Unformatted.
-! * FORMAT : element format to read :
-!               '(....)'  : auto detected  (default)
-!               '(f10.6)' : float type
-!
-! * Example :
-!      IDF  SF     IDLA  IDFM   FORMAT    FILENAME
-!      50   0.001  1     1     '(....)'  'GLOB-30M.bot'
-!
-! * namelist must be terminated with /
-! * definitions & defaults:
-!     DEPTH%SF             = 1.       ! scale factor
-!     DEPTH%FILENAME       = 'unset'  ! filename
-!     DEPTH%IDF            = 50       ! file unit number
-!     DEPTH%IDLA           = 1        ! layout indicator
-!     DEPTH%IDFM           = 1        ! format indicator
-!     DEPTH%FORMAT         = '(....)' ! formatted read format
-! -------------------------------------------------------------------- !
-&DEPTH_NML
-  DEPTH%SF        =  -2500.
-  DEPTH%FILENAME  =  '../input/HOMOGENEOUS.depth'
-  DEPTH%IDLA      =  3
-/
-
-! -------------------------------------------------------------------- !
-! WAVEWATCH III - end of namelist                                      !
-! -------------------------------------------------------------------- !