-correct typo in ww3_ufs1.1/namelist*.nml

-correct namelist in ww3_tp2.3 to enable TH1M and STH1M outputs
-replace 'echo' by 'basename' in matrix_cmake_datarmor
 to restrict the search of keyword in the filename itself

regtests/bin/run_cmake_test

@@ -628,7 +628,7 @@ then
     fi
 
     # link conf file
-    if [ $nml_input ] && [ ! -z "`echo ${ifile} | grep -o nml`" ]
+    if [ $nml_input ] && [ ! -z "`basename ${ifile} | grep -o nml`" ]
     then
       \rm -f $prog.nml
       \ln -s $ifile $prog.nml
@@ -654,7 +654,7 @@ then
       if [ $multi -eq 2 ]
       then
         mv mod_def.ww3 mod_def.$g
-        if [ $nml_input ] && [ ! -z "`echo ${ifile} | grep -o nml`" ]
+        if [ $nml_input ] && [ ! -z "`basename ${ifile} | grep -o nml`" ]
         then
           mv $prog.nml.log ${prog}_$g.nml.log
         fi
@@ -752,7 +752,7 @@ then
         then
           mv restart.ww3 restart.$g
           \rm -f mod_def.ww3
-          if [ $nml_input ] && [ ! -z "`echo ${ifile} | grep -o nml`" ]
+          if [ $nml_input ] && [ ! -z "`basename ${ifile} | grep -o nml`" ]
           then
             mv $prog.nml.log ${prog}_$g.nml.log
           fi
@@ -851,7 +851,7 @@ then
         then
           mv nest.ww3 nest.$g
           \rm -f mod_def.ww3
-          if [ $nml_input ] && [ ! -z "`echo ${ifile} | grep -o nml`" ]
+          if [ $nml_input ] && [ ! -z "`basename ${ifile} | grep -o nml`" ]
           then
             mv $prog.nml.log ${prog}_$g.nml.log
           fi
@@ -950,7 +950,7 @@ then
         then
           mv nest.ww3 nest.$g
           \rm -f mod_def.ww3
-          if [ $nml_input ] && [ ! -z "`echo ${ifile} | grep -o nml`" ]
+          if [ $nml_input ] && [ ! -z "`basename ${ifile} | grep -o nml`" ]
           then
             mv $prog.nml.log ${prog}_$g.nml.log
           fi
@@ -1054,7 +1054,7 @@ then
           then
             \rm -f mod_def.ww3
             mv $otype.ww3 $otype.$g
-            if [ $nml_input ] && [ ! -z "`echo ${ifile} | grep -o nml`" ]
+            if [ $nml_input ] && [ ! -z "`basename ${ifile} | grep -o nml`" ]
             then
               mv $prog.nml.log ${prog}_$g.nml.log
             fi
@@ -1178,7 +1178,7 @@ then
           then
             \rm -f mod_def.ww3
             mv $otype.ww3 $otype.$g
-            if [ $nml_input ] && [ ! -z "`echo ${ifile} | grep -o nml`" ]
+            if [ $nml_input ] && [ ! -z "`basename ${ifile} | grep -o nml`" ]
             then
               mv $prog.nml.log ${prog}_$g.nml.log
             fi
@@ -1301,7 +1301,7 @@ then
           then
             \rm -f mod_def.ww3
             mv $otype.ww3 $otype.$g
-            if [ $nml_input ] && [ ! -z "`echo ${ifile} | grep -o nml`" ]
+            if [ $nml_input ] && [ ! -z "`basename ${ifile} | grep -o nml`" ]
             then
               mv $prog.nml.log ${prog}_$g.nml.log
             fi
@@ -1445,7 +1445,7 @@ then
       \rm -f PET*.ESMF_LogFile
       \rm -f ww3_esmf.rc
       \cp -f ${path_i}/ww3_esmf.rc ww3_esmf.rc
-      if [ ! -z "`echo ${ifile} | grep -o nml`" ]
+      if [ ! -z "`basename ${ifile} | grep -o nml`" ]
       then
         echo "WAV_input_file_name: $prog.nml" >> ww3_esmf.rc
       fi
@@ -1754,7 +1754,7 @@ do
             then
               \rm -f mod_def.ww3
               \rm -f out_grd.ww3
-              if [ $nml_input ] && [ ! -z "`echo ${ifile} | grep -o nml`" ]
+              if [ $nml_input ] && [ ! -z "`basename ${ifile} | grep -o nml`" ]
               then
                 mv $prog.nml.log ${prog}_$g.nml.log
               fi
@@ -1821,7 +1821,7 @@ do
             then
               \rm -f mod_def.ww3
               \rm -f out_grd.ww3
-              if [ $nml_input ] && [ ! -z "`echo ${ifile} | grep -o nml`" ]
+              if [ $nml_input ] && [ ! -z "`basename ${ifile} | grep -o nml`" ]
               then
                 mv $prog.nml.log ${prog}_$g.nml.log
               fi
@@ -1989,7 +1989,7 @@ do
             then
               \rm -f mod_def.ww3
               \rm -f out_pnt.ww3
-              if [ $nml_input ] && [ ! -z "`echo ${ifile} | grep -o nml`" ]
+              if [ $nml_input ] && [ ! -z "`basename ${ifile} | grep -o nml`" ]
               then
                 mv $prog.nml.log ${prog}_$g.nml.log
               fi
@@ -2125,7 +2125,7 @@ do
           if [ $multi -eq 2 ]
           then
             \rm -f track_o.ww3
-            if [ $nml_input ] && [ ! -z "`echo ${ifile} | grep -o nml`" ]
+            if [ $nml_input ] && [ ! -z "`basename ${ifile} | grep -o nml`" ]
             then
               mv $prog.nml.log ${prog}_$g.nml.log
             fi

regtests/ww3_tp2.3/input/namelists_GARDEN.nml

@@ -1,4 +1,4 @@
-&OUTS E3D=1 /
+&OUTS E3D=1, TH1MF=1, STH1MF=1 /
 &PRO2 DTIME=345600. /
 &PRO3 WDTHTH=1.50, WDTHCG=1.50 /
 END OF NAMELISTS

regtests/ww3_tp2.3/input/ww3_grid.inp

@@ -16,7 +16,7 @@ $
 $
 $ Activated up to one line per namelist !!
 $
-  &OUTS E3D=1 /
+  &OUTS E3D=1, TH1MF=1, STH1MF=1 /
 $ &PRO2 DTIME= 0. /
 $ &PRO2 DTIME=172800. /
   &PRO2 DTIME=345600. /

regtests/ww3_ufs1.1/input_unstr/namelists_a.nml

@@ -31,7 +31,7 @@ SDSHCK = 1.50, SDSBR = 0.9000E-03, SDSSTRAIN = 0.000,
 SDSP = 2.00, SDSISO = 2, SDSCOS =2.0, SDSDTH = 80.0,
 SDSBRF1 = 0.50, SDSBRFDF = 0,
 SDSBM0 = 1.00, SDSBM1 = 0.00, SDSBM2 = 0.00, SDSBM3 = 0.00, SDSBM4 = 0.00,
-, WHITECAPWIDTH = 0.30/
+WHITECAPWIDTH = 0.30/
 &SBT1 GAMMA = -0.6700E-01 /
 &SDB1 BJALFA = 1.000, BJGAM = 0.730, BJFLAG = .TRUE. /
 &PRO3 CFLTM = 0.70, WDTHCG = 1.50, WDTHTH = 1.50 /

regtests/ww3_ufs1.1/input_unstr/namelists_b.nml

@@ -51,7 +51,7 @@ SDSHCK = 1.50, SDSBR = 0.9000E-03, SDSSTRAIN = 0.000,
 SDSP = 2.00, SDSISO = 2, SDSCOS =2.0, SDSDTH = 80.0,
 SDSBRF1 = 0.50, SDSBRFDF = 0,
 SDSBM0 = 1.00, SDSBM1 = 0.00, SDSBM2 = 0.00, SDSBM3 = 0.00, SDSBM4 = 0.00,
-, WHITECAPWIDTH = 0.30/
+WHITECAPWIDTH = 0.30/
 &SBT1 GAMMA = -0.6700E-01 /
 &SDB1 BJALFA = 1.000, BJGAM = 0.730, BJFLAG = .TRUE. /
 &PRO3 CFLTM = 0.70, WDTHCG = 1.50, WDTHTH = 1.50 /