Skip to content

Commit

Permalink
Change MOM6 and FV3atm restart filename format (#1599)
Browse files Browse the repository at this point in the history 
* MOM6 writes restarts in YYYYMMDD.HHMMSS.MOM*nc format
* the final restart is timestamped
* make changes in scripts to remove 'suffix-hours' strings

* remove STORE_CORIOLIS from MOM_input templates

* add timestamp in the end forecast restart filenames for GFS

* FV3atm restart filename format
  • Loading branch information
@DeniseWorthen
DeniseWorthen authored Feb 27, 2023
1 parent a863389 commit 23a4116
Show file tree
Hide file tree
Showing 91 changed files with 17,895 additions and 17,917 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 3 files
+2 −2 atmos_model.F90
+5 −39 module_fcst_grid_comp.F90
+0 −1 module_fv3_config.F90
2 changes: 1 addition & 1 deletion MOM6-interface/MOM6
Submodule MOM6 updated 3 files
+5 −11 config_src/drivers/nuopc_cap/mom_cap.F90
+1 −1 config_src/drivers/nuopc_cap/mom_cap_methods.F90
+0 −1 config_src/drivers/nuopc_cap/mom_surface_forcing_nuopc.F90
2,076 changes: 1,038 additions & 1,038 deletions tests/RegressionTests_cheyenne.gnu.log
View file

Large diffs are not rendered by default.

4,676 changes: 2,338 additions & 2,338 deletions tests/RegressionTests_cheyenne.intel.log
View file

Large diffs are not rendered by default.

4,818 changes: 2,409 additions & 2,409 deletions tests/RegressionTests_gaea.intel.log
View file

Large diffs are not rendered by default.

2,152 changes: 1,070 additions & 1,082 deletions tests/RegressionTests_hera.gnu.log
View file

Large diffs are not rendered by default.

4,842 changes: 2,421 additions & 2,421 deletions tests/RegressionTests_hera.intel.log
View file

Large diffs are not rendered by default.

4,454 changes: 2,227 additions & 2,227 deletions tests/RegressionTests_jet.intel.log
View file

Large diffs are not rendered by default.

4,848 changes: 2,424 additions & 2,424 deletions tests/RegressionTests_orion.intel.log
View file

Large diffs are not rendered by default.

4,190 changes: 2,095 additions & 2,095 deletions tests/RegressionTests_wcoss2.intel.log
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,6 @@ export AOD_FRQ=060000

# checkpoint restarts
export RESTART_FILE_PREFIX=''
export RESTART_FILE_SUFFIX_HRS=''
export RESTART_FILE_SUFFIX_SECS=''
export RT35D=''
}
Expand Down
10 changes: 5 additions & 5 deletions tests/fv3_conf/cpld_control_run.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@ else

#if not mx025, then mom6 restart is a single file
if [[ $OCNRES == 025 ]]; then
cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00.nc ./INPUT/MOM.res.nc
cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00_1.nc ./INPUT/MOM.res_1.nc
cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00_2.nc ./INPUT/MOM.res_2.nc
cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00_3.nc ./INPUT/MOM.res_3.nc
cp ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.MOM.res.nc ./INPUT/MOM.res.nc
cp ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.MOM.res_1.nc ./INPUT/MOM.res_1.nc
cp ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.MOM.res_2.nc ./INPUT/MOM.res_2.nc
cp ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.MOM.res_3.nc ./INPUT/MOM.res_3.nc
else
cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00.nc ./INPUT/MOM.res.nc
cp ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.MOM.res.nc ./INPUT/MOM.res.nc
fi

# CMEPS restart and pointer files
Expand Down
2 changes: 1 addition & 1 deletion tests/fv3_conf/cpld_datm_cdeps.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if [ $WARM_START = .false. ]; then
fi
else
# warm start
cp ../${DEP_RUN}${RT_SUFFIX}/RESTART/MOM.res.2011-10-01-12*.nc ./INPUT/MOM.res.nc
cp ../${DEP_RUN}${RT_SUFFIX}/RESTART/20111001.120000.MOM.res.nc ./INPUT/MOM.res.nc

# CMEPS restart and pointer files
RFILE="DATM_${DATM_SRC}.cpl.r.2011-10-01-43200.nc"
Expand Down
1 change: 1 addition & 0 deletions tests/opnReqTests/dbg.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ elif [[ $application == 'cpld' ]]; then
LIST_FILES=$(echo -n $LIST_FILES | sed -E "s/sfcf024/sfcf003/g" \
| sed -E "s/atmf024/atmf003/g" \
| sed -E "s/2021-03-23-21600/2021-03-22-32400/g" \
| sed -E "s/20210323\.060000/20210322\.090000/g" \
| sed -E "s/sfcf021\.tile[1-6]\.nc ?//g" \
| sed -E "s/atmf021\.tile[1-6]\.nc ?//g" \
| sed -E "s/(gocart\.inst_aod\.202103)23_0600z\.nc4/\122_0900z\.nc4/g" \
Expand Down
2 changes: 0 additions & 2 deletions tests/opnReqTests/rst.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ elif [[ $application == 'cpld' ]]; then
MOM6_RESTART_SETTING="r"
RESTART_N=$(( FHMAX - FHROT ))
RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( SHOUR + FHROT )))0000"
RESTART_FILE_SUFFIX_HRS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( SHOUR + FHROT )))"
RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%05d" $(( (SHOUR + FHROT)* 3600 )))"
RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${FHROT}+${SHOUR} )))0000"
fi
Expand Down Expand Up @@ -67,7 +66,6 @@ export RUNTYPE=${RUNTYPE:-}
export USE_RESTART_TIME=${USE_RESTART_TIME:-}
export MOM6_RESTART_SETTING=${MOM6_RESTART_SETTING:-}
export RESTART_N=${RESTART_N:-}
export RESTART_FILE_SUFFIX_HRS=${RESTART_FILE_SUFFIX_HRS:-}
export RESTART_FILE_SUFFIX_SECS=${RESTART_FILE_SUFFIX_SECS:-}
export RUN_BEG="${RUN_BEG:-}"
export OUT_BEG="${RUN_BEG:-}"
Expand Down
9 changes: 4 additions & 5 deletions tests/parm/MOM_input_template_025
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ DTFREEZE_DP = -7.75E-08 ! [deg C Pa-1] default = 0.0
PARALLEL_RESTARTFILES = True ! [Boolean] default = False
! If true, each processor writes its own restart file, otherwise a single
! restart file is generated
STORE_CORIOLIS_ACCEL = False

! === module MOM_tracer_flow_control ===
USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False
Expand Down Expand Up @@ -406,7 +405,7 @@ GILL_EQUATORIAL_LD = True ! [Boolean] default = False
! radius, otherwise, if false, use Pedlosky's definition. These definitions
! differ by a factor of 2 in front of the beta term in the denominator. Gill's
! is the more appropriate definition.
INTERNAL_WAVE_SPEED_BETTER_EST = False ! [Boolean] default = True
INTERNAL_WAVE_SPEED_BETTER_EST = False ! [Boolean] default = True
! If true, use a more robust estimate of the first mode wave speed as the
! starting point for iterations.

Expand Down Expand Up @@ -734,7 +733,7 @@ NSTAR = 0.06 ! [nondim] default = 0.2
! The portion of the buoyant potential energy imparted by surface fluxes that is
! available to drive entrainment at the base of mixed layer when that energy is
! positive.
EPBL_MLD_BISECTION = True ! [Boolean] default = False
EPBL_MLD_BISECTION = True ! [Boolean] default = False
! If true, use bisection with the iterative determination of the self-consistent
! mixed layer depth. Otherwise use the false position after a maximum and
! minimum bound have been evaluated and the returned value or bisection before
Expand Down Expand Up @@ -871,8 +870,8 @@ LIQUID_RUNOFF_FROM_DATA = @[MOM6_RIVER_RUNOFF] ! [Boolean] default = False
! the data_table using the component name 'OCN'.
! === module ocean_stochastics ===
DO_SPPT = @[DO_OCN_SPPT] ! [Boolean] default = False
! If true perturb the diabatic tendencies in MOM_diabadic_driver
PERT_EPBL = @[PERT_EPBL] ! [Boolean] default = False
! If true perturb the diabatic tendencies in MOM_diabadic_driver
PERT_EPBL = @[PERT_EPBL] ! [Boolean] default = False
! If true perturb the KE dissipation and destruction in MOM_energetic_PBL
! === module MOM_restart ===
RESTART_CHECKSUMS_REQUIRED = False
Expand Down
9 changes: 4 additions & 5 deletions tests/parm/MOM_input_template_050
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ DTFREEZE_DP = -7.75E-08 ! [deg C Pa-1] default = 0.0
PARALLEL_RESTARTFILES = True ! [Boolean] default = False
! If true, each processor writes its own restart file, otherwise a single
! restart file is generated
STORE_CORIOLIS_ACCEL = False

! === module MOM_tracer_flow_control ===
USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False
Expand Down Expand Up @@ -419,7 +418,7 @@ GILL_EQUATORIAL_LD = True ! [Boolean] default = False
! radius, otherwise, if false, use Pedlosky's definition. These definitions
! differ by a factor of 2 in front of the beta term in the denominator. Gill's
! is the more appropriate definition.
INTERNAL_WAVE_SPEED_BETTER_EST = False ! [Boolean] default = True
INTERNAL_WAVE_SPEED_BETTER_EST = False ! [Boolean] default = True
! If true, use a more robust estimate of the first mode wave speed as the
! starting point for iterations.

Expand Down Expand Up @@ -760,7 +759,7 @@ MSTAR2_COEF1 = 0.29 ! [nondim] default = 0.3
MSTAR2_COEF2 = 0.152 ! [nondim] default = 0.085
! Coefficient in computing mstar when only rotation limits the total mixing
! (used if EPBL_MSTAR_SCHEME = OM4)
EPBL_MLD_BISECTION = True ! [Boolean] default = False
EPBL_MLD_BISECTION = True ! [Boolean] default = False
! If true, use bisection with the iterative determination of the self-consistent
! mixed layer depth. Otherwise use the false position after a maximum and
! minimum bound have been evaluated and the returned value or bisection before
Expand Down Expand Up @@ -916,8 +915,8 @@ LIQUID_RUNOFF_FROM_DATA = @[MOM6_RIVER_RUNOFF] ! [Boolean] default = False
! the data_table using the component name 'OCN'.
! === module ocean_stochastics ===
DO_SPPT = @[DO_OCN_SPPT] ! [Boolean] default = False
! If true perturb the diabatic tendencies in MOM_diabadic_driver
PERT_EPBL = @[PERT_EPBL] ! [Boolean] default = False
! If true perturb the diabatic tendencies in MOM_diabadic_driver
PERT_EPBL = @[PERT_EPBL] ! [Boolean] default = False
! If true perturb the KE dissipation and destruction in MOM_energetic_PBL
! === module MOM_restart ===

Expand Down
3 changes: 1 addition & 2 deletions tests/parm/MOM_input_template_100
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ TFREEZE_FORM = "MILLERO_78" ! default = "LINEAR"
PARALLEL_RESTARTFILES = True ! [Boolean] default = False
! If true, each processor writes its own restart file, otherwise a single
! restart file is generated
STORE_CORIOLIS_ACCEL = False

! === module MOM_tracer_flow_control ===
USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False
Expand Down Expand Up @@ -430,7 +429,7 @@ VISC_RES_FN_POWER = 2 ! [nondim] default = 100
! used, although even integers are more efficient to calculate. Setting this
! greater than 100 results in a step-function being used. This function affects
! lateral viscosity, Kh, and not KhTh.
INTERNAL_WAVE_SPEED_BETTER_EST = False ! [Boolean] default = True
INTERNAL_WAVE_SPEED_BETTER_EST = False ! [Boolean] default = True
! If true, use a more robust estimate of the first mode wave speed as the
! starting point for iterations.

Expand Down
1 change: 0 additions & 1 deletion tests/parm/MOM_input_template_500
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ TFREEZE_FORM = "MILLERO_78" ! default = "LINEAR"

! === module MOM_restart ===
RESTART_CHECKSUMS_REQUIRED = False
STORE_CORIOLIS_ACCEL = False
! === module MOM_tracer_flow_control ===

! === module MOM_coord_initialization ===
Expand Down
4 changes: 2 additions & 2 deletions tests/rt.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ elif [[ $MACHINE_ID = gaea.* ]]; then
ECFLOW_START=/lustre/f2/pdata/esrl/gsd/contrib/miniconda3/4.8.3/envs/ufs-weather-model/bin/ecflow_start.sh
ECF_PORT=$(( $(id -u) + 1500 ))

DISKNM=/lustre/f2/pdata/ncep/role.epic/RT
DISKNM=/lustre/f2/pdata/ncep_shared/role.epic/RT
QUEUE=normal
COMPILE_QUEUE=normal
# ACCNR="${ACCNR:-cmp}"
Expand Down Expand Up @@ -446,7 +446,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
fi


BL_DATE=20230215
BL_DATE=20230222

RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}

Expand Down
64 changes: 32 additions & 32 deletions tests/tests/atmaero_control_p8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,38 @@ export LIST_FILES="sfcf000.nc \
GFSPRS.GrbF00 \
GFSPRS.GrbF24 \
gocart.inst_aod.20210323_0600z.nc4 \
RESTART/coupler.res \
RESTART/fv_core.res.nc \
RESTART/fv_core.res.tile1.nc \
RESTART/fv_core.res.tile2.nc \
RESTART/fv_core.res.tile3.nc \
RESTART/fv_core.res.tile4.nc \
RESTART/fv_core.res.tile5.nc \
RESTART/fv_core.res.tile6.nc \
RESTART/fv_srf_wnd.res.tile1.nc \
RESTART/fv_srf_wnd.res.tile2.nc \
RESTART/fv_srf_wnd.res.tile3.nc \
RESTART/fv_srf_wnd.res.tile4.nc \
RESTART/fv_srf_wnd.res.tile5.nc \
RESTART/fv_srf_wnd.res.tile6.nc \
RESTART/fv_tracer.res.tile1.nc \
RESTART/fv_tracer.res.tile2.nc \
RESTART/fv_tracer.res.tile3.nc \
RESTART/fv_tracer.res.tile4.nc \
RESTART/fv_tracer.res.tile5.nc \
RESTART/fv_tracer.res.tile6.nc \
RESTART/phy_data.tile1.nc \
RESTART/phy_data.tile2.nc \
RESTART/phy_data.tile3.nc \
RESTART/phy_data.tile4.nc \
RESTART/phy_data.tile5.nc \
RESTART/phy_data.tile6.nc \
RESTART/sfc_data.tile1.nc \
RESTART/sfc_data.tile2.nc \
RESTART/sfc_data.tile3.nc \
RESTART/sfc_data.tile4.nc \
RESTART/sfc_data.tile5.nc \
RESTART/sfc_data.tile6.nc"
RESTART/20210323.060000.coupler.res \
RESTART/20210323.060000.fv_core.res.nc \
RESTART/20210323.060000.fv_core.res.tile1.nc \
RESTART/20210323.060000.fv_core.res.tile2.nc \
RESTART/20210323.060000.fv_core.res.tile3.nc \
RESTART/20210323.060000.fv_core.res.tile4.nc \
RESTART/20210323.060000.fv_core.res.tile5.nc \
RESTART/20210323.060000.fv_core.res.tile6.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc \
RESTART/20210323.060000.fv_tracer.res.tile1.nc \
RESTART/20210323.060000.fv_tracer.res.tile2.nc \
RESTART/20210323.060000.fv_tracer.res.tile3.nc \
RESTART/20210323.060000.fv_tracer.res.tile4.nc \
RESTART/20210323.060000.fv_tracer.res.tile5.nc \
RESTART/20210323.060000.fv_tracer.res.tile6.nc \
RESTART/20210323.060000.phy_data.tile1.nc \
RESTART/20210323.060000.phy_data.tile2.nc \
RESTART/20210323.060000.phy_data.tile3.nc \
RESTART/20210323.060000.phy_data.tile4.nc \
RESTART/20210323.060000.phy_data.tile5.nc \
RESTART/20210323.060000.phy_data.tile6.nc \
RESTART/20210323.060000.sfc_data.tile1.nc \
RESTART/20210323.060000.sfc_data.tile2.nc \
RESTART/20210323.060000.sfc_data.tile3.nc \
RESTART/20210323.060000.sfc_data.tile4.nc \
RESTART/20210323.060000.sfc_data.tile5.nc \
RESTART/20210323.060000.sfc_data.tile6.nc"

export_fv3
export NPZ=127
Expand Down
64 changes: 32 additions & 32 deletions tests/tests/atmaero_control_p8_rad
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,38 @@ export LIST_FILES="sfcf000.nc \
GFSPRS.GrbF00 \
GFSPRS.GrbF24 \
gocart.inst_aod.20210323_0600z.nc4 \
RESTART/coupler.res \
RESTART/fv_core.res.nc \
RESTART/fv_core.res.tile1.nc \
RESTART/fv_core.res.tile2.nc \
RESTART/fv_core.res.tile3.nc \
RESTART/fv_core.res.tile4.nc \
RESTART/fv_core.res.tile5.nc \
RESTART/fv_core.res.tile6.nc \
RESTART/fv_srf_wnd.res.tile1.nc \
RESTART/fv_srf_wnd.res.tile2.nc \
RESTART/fv_srf_wnd.res.tile3.nc \
RESTART/fv_srf_wnd.res.tile4.nc \
RESTART/fv_srf_wnd.res.tile5.nc \
RESTART/fv_srf_wnd.res.tile6.nc \
RESTART/fv_tracer.res.tile1.nc \
RESTART/fv_tracer.res.tile2.nc \
RESTART/fv_tracer.res.tile3.nc \
RESTART/fv_tracer.res.tile4.nc \
RESTART/fv_tracer.res.tile5.nc \
RESTART/fv_tracer.res.tile6.nc \
RESTART/phy_data.tile1.nc \
RESTART/phy_data.tile2.nc \
RESTART/phy_data.tile3.nc \
RESTART/phy_data.tile4.nc \
RESTART/phy_data.tile5.nc \
RESTART/phy_data.tile6.nc \
RESTART/sfc_data.tile1.nc \
RESTART/sfc_data.tile2.nc \
RESTART/sfc_data.tile3.nc \
RESTART/sfc_data.tile4.nc \
RESTART/sfc_data.tile5.nc \
RESTART/sfc_data.tile6.nc"
RESTART/20210323.060000.coupler.res \
RESTART/20210323.060000.fv_core.res.nc \
RESTART/20210323.060000.fv_core.res.tile1.nc \
RESTART/20210323.060000.fv_core.res.tile2.nc \
RESTART/20210323.060000.fv_core.res.tile3.nc \
RESTART/20210323.060000.fv_core.res.tile4.nc \
RESTART/20210323.060000.fv_core.res.tile5.nc \
RESTART/20210323.060000.fv_core.res.tile6.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc \
RESTART/20210323.060000.fv_tracer.res.tile1.nc \
RESTART/20210323.060000.fv_tracer.res.tile2.nc \
RESTART/20210323.060000.fv_tracer.res.tile3.nc \
RESTART/20210323.060000.fv_tracer.res.tile4.nc \
RESTART/20210323.060000.fv_tracer.res.tile5.nc \
RESTART/20210323.060000.fv_tracer.res.tile6.nc \
RESTART/20210323.060000.phy_data.tile1.nc \
RESTART/20210323.060000.phy_data.tile2.nc \
RESTART/20210323.060000.phy_data.tile3.nc \
RESTART/20210323.060000.phy_data.tile4.nc \
RESTART/20210323.060000.phy_data.tile5.nc \
RESTART/20210323.060000.phy_data.tile6.nc \
RESTART/20210323.060000.sfc_data.tile1.nc \
RESTART/20210323.060000.sfc_data.tile2.nc \
RESTART/20210323.060000.sfc_data.tile3.nc \
RESTART/20210323.060000.sfc_data.tile4.nc \
RESTART/20210323.060000.sfc_data.tile5.nc \
RESTART/20210323.060000.sfc_data.tile6.nc"

export_fv3
export NPZ=127
Expand Down
Loading

0 comments on commit 23a4116

Please sign in to comment.