update templates for diag_table to be consistent with model_configure (…

…#781) * update templates for diag_table to be consistent with model_configure * remove edit_diag_table function. point to @climbfuji branch of FV3atm * FV3 is updated with land mask bug fix (CCPP issue #719)
ufs-community · Sep 3, 2021 · 77eaba8 · 77eaba8
1 parent 01d70f4
commit 77eaba8
Show file tree

Hide file tree

Showing 18 changed files with 3,001 additions and 2,924 deletions.
diff --git a/CMEPS-interface/CMakeLists.txt b/CMEPS-interface/CMakeLists.txt
@@ -1,6 +1,9 @@
 # CMEPS compiler flags
 if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
   set(CMAKE_Fortran_FLAGS "-g -fbacktrace -ffree-line-length-none")
+  if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch -fallow-invalid-boz")
+  endif()
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
   set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -fcheck=bounds -ffpe-trap=invalid,zero,overflow,underflow" )

diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/edit_inputs.sh b/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"

diff --git a/tests/parm/diag_table_bmark_v16_merra2_template b/tests/parm/diag_table_bmark_v16_merra2_template
@@ -1,5 +1,5 @@
-YMD.00Z.ATMRES.64bit.non-mono
-SYEAR SMONTH SDAY 00 0 0
+@[SYEAR]@[SMONTH]@[SDAY].@[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"

diff --git a/tests/parm/diag_table_bmark_v16_template b/tests/parm/diag_table_bmark_v16_template
@@ -1,5 +1,5 @@
-YMD.00Z.ATMRES.64bit.non-mono
-SYEAR SMONTH SDAY 00 0 0
+@[SYEAR]@[SMONTH]@[SDAY].@[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"

diff --git a/tests/parm/diag_table_template b/tests/parm/diag_table_template
@@ -1,5 +1,5 @@
-YMD.00Z.ATMRES.64bit.non-mono
-SYEAR SMONTH SDAY 00 0 0
+@[SYEAR]@[SMONTH]@[SDAY].@[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

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -415,7 +415,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20210830
+BL_DATE=20210901
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else

diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
@@ -65,14 +65,14 @@ RUN     | fv3_esg_HAFS_v0_hwrf_thompson_debug
 # S2S tests                                                                                                                                                      #
 ##################################################################################################################################################################
 
-COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_2017_coupled                                                                            | - cheyenne.gnu | fv3         |
-RUN     | cpld_control                                                                                                            | - cheyenne.gnu | fv3         |
+COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_2017_coupled                                                                            |                | fv3         |
+RUN     | cpld_control                                                                                                            |                | fv3         |
 
-COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_2017_coupled -DDEBUG=ON                                                                 | - cheyenne.gnu | fv3         |
-RUN     | cpld_debug                                                                                                              | - cheyenne.gnu | fv3         |
+COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_2017_coupled -DDEBUG=ON                                                                 |                | fv3         |
+RUN     | cpld_debug                                                                                                              |                | fv3         |
 
 ##################################################################################################################################################################
 # Data Atmosphere tests                                                                                                                                          #
 ##################################################################################################################################################################
 
-COMPILE | -DAPP=NG-GODAS-NEMSDATM                                                                                                 | - cheyenne.gnu | fv3         |
+COMPILE | -DAPP=NG-GODAS-NEMSDATM                                                                                                 |                | fv3         |
diff --git a/tests/run_test.sh b/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