Skip to content

Revert "update templates for diag_table to be consistent with model_configure " #787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
junwang-noaa wants to merge 1 commit into from
Closed

Revert "update templates for diag_table to be consistent with model_configure " #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions CMEPS-interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# 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" )
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated from 279027 to 7a9725
319 changes: 102 additions & 217 deletions tests/RegressionTests_cheyenne.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

692 changes: 346 additions & 346 deletions tests/RegressionTests_cheyenne.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,346 changes: 696 additions & 650 deletions tests/RegressionTests_gaea.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

216 changes: 108 additions & 108 deletions tests/RegressionTests_hera.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

708 changes: 354 additions & 354 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

785 changes: 386 additions & 399 deletions tests/RegressionTests_jet.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

692 changes: 346 additions & 346 deletions tests/RegressionTests_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

400 changes: 200 additions & 200 deletions tests/RegressionTests_wcoss_cray.log
View file
Open in desktop

Large diffs are not rendered by default.

708 changes: 354 additions & 354 deletions tests/RegressionTests_wcoss_dell_p3.log
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions tests/edit_inputs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,14 @@ 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"
Expand Down
4 changes: 2 additions & 2 deletions tests/parm/diag_table_bmark_v16_merra2_template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@[SYEAR]@[SMONTH]@[SDAY].@[SHOUR]Z.@[ATMRES].64bit.non-mono
@[SYEAR] @[SMONTH] @[SDAY] @[SHOUR] 0 0
YMD.00Z.ATMRES.64bit.non-mono
SYEAR SMONTH SDAY 00 0 0

"fv3_history", 0, "hours", 1, "hours", "time"
"fv3_history2d", 0, "hours", 1, "hours", "time"
Expand Down
4 changes: 2 additions & 2 deletions tests/parm/diag_table_bmark_v16_template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@[SYEAR]@[SMONTH]@[SDAY].@[SHOUR]Z.@[ATMRES].64bit.non-mono
@[SYEAR] @[SMONTH] @[SDAY] @[SHOUR] 0 0
YMD.00Z.ATMRES.64bit.non-mono
SYEAR SMONTH SDAY 00 0 0

"fv3_history", 0, "hours", 1, "hours", "time"
"fv3_history2d", 0, "hours", 1, "hours", "time"
Expand Down
6 changes: 3 additions & 3 deletions tests/parm/diag_table_template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@[SYEAR]@[SMONTH]@[SDAY].@[SHOUR]Z.@[ATMRES].64bit.non-mono
@[SYEAR] @[SMONTH] @[SDAY] @[SHOUR] 0 0
YMD.00Z.ATMRES.64bit.non-mono
SYEAR SMONTH SDAY 00 0 0

"grid_spec", -1, "months", 1, "days", "time"
"atmos_4xdaily", 6, "hours", 1, "days", "time"
Expand Down Expand Up @@ -36,7 +36,7 @@
"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
Expand Down
2 changes: 1 addition & 1 deletion tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
TEST_35D=true
fi

BL_DATE=20210901
BL_DATE=20210830
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
Expand Down
10 changes: 5 additions & 5 deletions tests/rt_gnu.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@ RUN | fv3_esg_HAFS_v0_hwrf_thompson_debug
# S2S tests #
##################################################################################################################################################################

COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_2017_coupled | | fv3 |
RUN | cpld_control | | fv3 |
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 -DDEBUG=ON | | fv3 |
RUN | cpld_debug | | fv3 |
COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_2017_coupled -DDEBUG=ON | - cheyenne.gnu | fv3 |
RUN | cpld_debug | - cheyenne.gnu | fv3 |

##################################################################################################################################################################
# Data Atmosphere tests #
##################################################################################################################################################################

COMPILE | -DAPP=NG-GODAS-NEMSDATM | | fv3 |
COMPILE | -DAPP=NG-GODAS-NEMSDATM | - cheyenne.gnu | fv3 |
2 changes: 1 addition & 1 deletion tests/run_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
atparse < ${PATHRT}/parm/${DIAG_TABLE:-diag_table_template} > diag_table
edit_diag_table < ${PATHRT}/parm/${DIAG_TABLE:-diag_table_template} > diag_table
edit_data_table < ${PATHRT}/parm/data_table_template > data_table
fi
fi
Expand Down