update templates for diag_table to be consistent with model_configure

.gitmodules

@@ -1,7 +1,9 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  #url = https://github.com/NOAA-EMC/fv3atm
+  #branch = develop
+  url = https://github.com/climbfuji/fv3atm
+  branch = george_gayno_landmask_bugfix
 [submodule "NEMS"]
   path = NEMS
   url = https://github.com/NOAA-EMC/NEMS

tests/edit_inputs.sh

@@ -51,14 +51,6 @@ function edit_data_table {
   sed -e "s/FRUNOFF/$FRUNOFF/g"
 }
 
-function edit_diag_table {
-  sed -e "s/YMD/$SYEAR$SMONTH$SDAY/g" \
-      -e "s/ATMRES/$ATMRES/g" \
-      -e "s/SYEAR/$SYEAR/g" \
-      -e "s/SMONTH/$SMONTH/g" \
-      -e "s/SDAY/$SDAY/g"
-}
-
 function edit_ww3_input {
 
   SDATEWW3="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"

tests/parm/diag_table_bmark_v16_merra2_template

@@ -1,5 +1,5 @@
-YMD.00Z.ATMRES.64bit.non-mono
-SYEAR SMONTH SDAY 00 0 0
+@[YMD].@[SHOUR]Z.@[ATMRES].64bit.non-mono
+@[SYEAR] @[SMONTH] @[SDAY] @[SHOUR] 0 0
 
 "fv3_history",    0,  "hours",  1,  "hours",  "time"
 "fv3_history2d",  0,  "hours",  1,  "hours",  "time"

tests/parm/diag_table_bmark_v16_template

@@ -1,5 +1,5 @@
-YMD.00Z.ATMRES.64bit.non-mono
-SYEAR SMONTH SDAY 00 0 0
+@[YMD].@[SHOUR]Z.@[ATMRES].64bit.non-mono
+@[SYEAR] @[SMONTH] @[SDAY] @[SHOUR] 0 0
 
 "fv3_history",    0,  "hours",  1,  "hours",  "time"
 "fv3_history2d",  0,  "hours",  1,  "hours",  "time"

tests/parm/diag_table_template

@@ -1,5 +1,5 @@
-YMD.00Z.ATMRES.64bit.non-mono
-SYEAR SMONTH SDAY 00 0 0
+@[YMD].@[SHOUR]Z.@[ATMRES].64bit.non-mono
+@[SYEAR] @[SMONTH] @[SDAY] @[SHOUR] 0 0
 
 "grid_spec",              -1,  "months",   1, "days",  "time"
 "atmos_4xdaily",           6,  "hours",    1, "days",  "time"
@@ -36,7 +36,7 @@ SYEAR SMONTH SDAY 00 0 0
  "ocean_model", "SSV",       "SSV",      "ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
  "ocean_model", "frazil",    "frazil",   "ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
  "ocean_model", "ePBL_h_ML", "ePBL",     "ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
- "ocean_model", "MLD_003",   "MLD_003",  "ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2 
+ "ocean_model", "MLD_003",   "MLD_003",  "ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
  "ocean_model", "MLD_0125",  "MLD_0125", "ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
 
 # save daily SST

tests/run_test.sh

@@ -120,7 +120,7 @@ if [[ $DATM_NEMS = 'true' ]] || [[ $DATM_CDEPS = 'true' ]] || [[ $S2S = 'true' ]
   if [[ $HAFS = 'false' ]]; then
     edit_ice_in     < ${PATHRT}/parm/ice_in_template > ice_in
     edit_mom_input  < ${PATHRT}/parm/${MOM_INPUT:-MOM_input_template_$OCNRES} > INPUT/MOM_input
-    edit_diag_table < ${PATHRT}/parm/${DIAG_TABLE:-diag_table_template} > diag_table
+    atparse         < ${PATHRT}/parm/${DIAG_TABLE:-diag_table_template} > diag_table
     edit_data_table < ${PATHRT}/parm/data_table_template > data_table
   fi
 fi