Skip to content

Change MOM6_OUTPUT_FH variable name to MOM6_HISTFREQ_N + Update MOM6 with inline-CDEPS capability #3033 #3044

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

Merged
gspetro-NOAA merged 14 commits into from
Jan 13, 2026
Merged

Change MOM6_OUTPUT_FH variable name to MOM6_HISTFREQ_N + Update MOM6 with inline-CDEPS capability #3033 #3044

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0971045
Change MOM6_OUTPUT_FH name
dpsarmie Jan 9, 2026
d90f4a2
Merge branch 'develop' into fix/standardize_mom6_output_freq_var
dpsarmie Jan 12, 2026
d7702cd
Bring in PR#3033
dpsarmie Jan 12, 2026
5db4fef
Merge branch 'develop' into fix/standardize_mom6_output_freq_var
dpsarmie Jan 12, 2026
97323db
Add Hercules logs for combined PR RTs
dpsarmie Jan 12, 2026
dfe7481
add hera ursa RT logs passed
FernandoAndrade-NOAA Jan 13, 2026
d8783c0
add gaeaC6 RT log passed
FernandoAndrade-NOAA Jan 13, 2026
b03243c
hercules rt log - passed
gspetro-NOAA Jan 13, 2026
a0aab98
orion rt log - passed
gspetro-NOAA Jan 13, 2026
c6b0150
ORT Jobs Completed.
epic-cicd-jenkins Jan 13, 2026
81b76b2
derecho rt log - passed
gspetro-NOAA Jan 13, 2026
5389b5d
Acorn RT Log: Passed
BrianCurtis-NOAA Jan 13, 2026
998addf
WCOSS2 RT Log: Passed
BrianCurtis-NOAA Jan 13, 2026
3a9c694
Revert .gitmodules and update hash
dpsarmie Jan 13, 2026
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
4 changes: 2 additions & 2 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1398,7 +1398,7 @@ export CHOUR=06
export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
export MOM6_RESTART_DIR=./RESTART/
export MOM6_RESTART_SETTING=n
export MOM6_OUTPUT_FH=6
export MOM6_HISTFREQ_N=6

# Following not used for standalone
export USE_CICE_ALB=.false.
Expand Down Expand Up @@ -1646,7 +1646,7 @@ export_mom6() {
export DT_THERM_MOM6=3600
export MOM6_INPUT=MOM_input_100.IN
export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
export MOM6_OUTPUT_FH=6
export MOM6_HISTFREQ_N=6
export MOM6_RESTART_DIR=./RESTART/
export MOM6_RESTART_SETTING=n
export MOM6_RIVER_RUNOFF=False
Expand Down
815 changes: 408 additions & 407 deletions tests/logs/RegressionTests_ursa.log
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_cpld.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"fv3_history", 0, "hours", 1, "hours", "time"
"fv3_history2d", 0, "hours", 1, "hours", "time"
######################
"@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr%2mi", @[MOM6_OUTPUT_FH], "hours", 1, "hours", "time", @[MOM6_OUTPUT_FH], "hours", "@[SYEAR] @[SMONTH] @[SDAY] @[CHOUR] 0 0"
"@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr%2mi", @[MOM6_HISTFREQ_N], "hours", 1, "hours", "time", @[MOM6_HISTFREQ_N], "hours", "@[SYEAR] @[SMONTH] @[SDAY] @[CHOUR] 0 0"
"@[MOM6_OUTPUT_DIR]/SST%4yr%2mo%2dy%2hr%2mi", 1, "days", 1, "days", "time", 1, "days", "@[SYEAR] @[SMONTH] @[SDAY] @[CHOUR] 0 0"
##############################################
# static fields
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_gefsv13.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"fv3_history", 0, "hours", 1, "hours", "time"
"fv3_history2d", 0, "hours", 1, "hours", "time"
######################
"@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr%2mi", @[MOM6_OUTPUT_FH], "hours", 1, "hours", "time", @[MOM6_OUTPUT_FH], "hours", "@[SYEAR] @[SMONTH] @[SDAY] @[CHOUR] 0 0"
"@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr%2mi", @[MOM6_HISTFREQ_N], "hours", 1, "hours", "time", @[MOM6_HISTFREQ_N], "hours", "@[SYEAR] @[SMONTH] @[SDAY] @[CHOUR] 0 0"
"@[MOM6_OUTPUT_DIR]/ocn_daily%4yr%2mo%2dy%2hr%2mi", 1, "days", 1, "days", "time", 1, "days", "@[SYEAR] @[SMONTH] @[SDAY] @[CHOUR] 0 0"

##############
Expand Down
4 changes: 2 additions & 2 deletions tests/parm/diag_table/diag_table_sfs.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"fv3_history", 0, "hours", 1, "hours", "time"
"fv3_history2d", 0, "hours", 1, "hours", "time"
######################
"@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr%2mi" , @[MOM6_OUTPUT_FH], "hours", 1, "hours", "time", @[MOM6_OUTPUT_FH], "hours", "@[SYEAR] @[SMONTH] @[SDAY] @[CHOUR] 0 0"
"@[MOM6_OUTPUT_DIR]/ocn_scalar%4yr%2mo%2dy", @[MOM6_OUTPUT_FH], "hours", 1, "hours", "time", @[MOM6_OUTPUT_FH], "hours", "@[SYEAR] @[SMONTH] @[SDAY] @[CHOUR] 0 0"
"@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr%2mi" , @[MOM6_HISTFREQ_N], "hours", 1, "hours", "time", @[MOM6_HISTFREQ_N], "hours", "@[SYEAR] @[SMONTH] @[SDAY] @[CHOUR] 0 0"
"@[MOM6_OUTPUT_DIR]/ocn_scalar%4yr%2mo%2dy", @[MOM6_HISTFREQ_N], "hours", 1, "hours", "time", @[MOM6_HISTFREQ_N], "hours", "@[SYEAR] @[SMONTH] @[SDAY] @[CHOUR] 0 0"
##############################################

##############
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_template.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"fv3_history", 0, "hours", 1, "hours", "time"
"fv3_history2d", 0, "hours", 1, "hours", "time"
######################
"@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr%2mi", @[MOM6_OUTPUT_FH], "hours", 1, "hours", "time", @[MOM6_OUTPUT_FH], "hours", "@[SYEAR] @[SMONTH] @[SDAY] @[CHOUR] 0 0"
"@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr%2mi", @[MOM6_HISTFREQ_N], "hours", 1, "hours", "time", @[MOM6_HISTFREQ_N], "hours", "@[SYEAR] @[SMONTH] @[SDAY] @[CHOUR] 0 0"
"@[MOM6_OUTPUT_DIR]/SST%4yr%2mo%2dy%2hr%2mi", 1, "days", 1, "days", "time", 1, "days", "@[SYEAR] @[SMONTH] @[SDAY] @[CHOUR] 0 0"
##############################################
# static fields
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.datm_cdeps.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ OCN_attributes::
use_coldstart = @[use_coldstart]
use_mommesh = @[use_mommesh]
mom6_output_dir = @[MOM6_OUTPUT_DIR]
mom6_output_fh = @[MOM6_OUTPUT_FH]
mom6_output_fh = @[MOM6_HISTFREQ_N]
mom6_restart_dir = @[MOM6_RESTART_DIR]
::

Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.hafs_atm_ocn_wav_mom6.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ OCN_attributes::
eps_imesh = 2.5e-1
mesh_ocn = @[MESH_OCN]
mom6_output_dir = @[MOM6_OUTPUT_DIR]
mom6_output_fh = @[MOM6_OUTPUT_FH]
mom6_output_fh = @[MOM6_HISTFREQ_N]
mom6_restart_dir = @[MOM6_RESTART_DIR]
::

Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.s2s.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ OCN_attributes::
use_coldstart = @[use_coldstart]
use_mommesh = @[use_mommesh]
mom6_output_dir = @[MOM6_OUTPUT_DIR]
mom6_output_fh = @[MOM6_OUTPUT_FH]
mom6_output_fh = @[MOM6_HISTFREQ_N]
mom6_restart_dir = @[MOM6_RESTART_DIR]
::

Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.s2s_aoflux.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ OCN_attributes::
use_coldstart = @[use_coldstart]
use_mommesh = @[use_mommesh]
mom6_output_dir = @[MOM6_OUTPUT_DIR]
mom6_output_fh = @[MOM6_OUTPUT_FH]
mom6_output_fh = @[MOM6_HISTFREQ_N]
mom6_restart_dir = @[MOM6_RESTART_DIR]
::

Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.s2sa.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ OCN_attributes::
use_coldstart = @[use_coldstart]
use_mommesh = @[use_mommesh]
mom6_output_dir = @[MOM6_OUTPUT_DIR]
mom6_output_fh = @[MOM6_OUTPUT_FH]
mom6_output_fh = @[MOM6_HISTFREQ_N]
mom6_restart_dir = @[MOM6_RESTART_DIR]
::

Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.s2sw.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ OCN_attributes::
use_coldstart = @[use_coldstart]
use_mommesh = @[use_mommesh]
mom6_output_dir = @[MOM6_OUTPUT_DIR]
mom6_output_fh = @[MOM6_OUTPUT_FH]
mom6_output_fh = @[MOM6_HISTFREQ_N]
mom6_restart_dir = @[MOM6_RESTART_DIR]
::

Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.s2sw_fast.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ OCN_attributes::
use_coldstart = @[use_coldstart]
use_mommesh = @[use_mommesh]
mom6_output_dir = @[MOM6_OUTPUT_DIR]
mom6_output_fh = @[MOM6_OUTPUT_FH]
mom6_output_fh = @[MOM6_HISTFREQ_N]
mom6_restart_dir = @[MOM6_RESTART_DIR]
::

Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.s2swa.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ OCN_attributes::
use_coldstart = @[use_coldstart]
use_mommesh = @[use_mommesh]
mom6_output_dir = @[MOM6_OUTPUT_DIR]
mom6_output_fh = @[MOM6_OUTPUT_FH]
mom6_output_fh = @[MOM6_HISTFREQ_N]
mom6_restart_dir = @[MOM6_RESTART_DIR]
::

Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.s2swa_fast.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ OCN_attributes::
use_coldstart = @[use_coldstart]
use_mommesh = @[use_mommesh]
mom6_output_dir = @[MOM6_OUTPUT_DIR]
mom6_output_fh = @[MOM6_OUTPUT_FH]
mom6_output_fh = @[MOM6_HISTFREQ_N]
mom6_restart_dir = @[MOM6_RESTART_DIR]
::

Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.s2swal_fast.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ OCN_attributes::
use_coldstart = @[use_coldstart]
use_mommesh = @[use_mommesh]
mom6_output_dir = @[MOM6_OUTPUT_DIR]
mom6_output_fh = @[MOM6_OUTPUT_FH]
mom6_output_fh = @[MOM6_HISTFREQ_N]
mom6_restart_dir = @[MOM6_RESTART_DIR]
::

Expand Down
1 change: 0 additions & 1 deletion tests/test_changes.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@

2 changes: 1 addition & 1 deletion tests/tests/cpld_control_sfs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export ODA_UINC_VAR="u_pert"
export ODA_VINC_VAR="v_pert"

# MOM6 frequency
export MOM6_OUTPUT_FH=24
export MOM6_HISTFREQ_N=24

# CICE frequency
export CICE_HISTFREQ_N="0, 0, 24, 0, 1"
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/cpld_debug_gefs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ export LIST_FILES="sfcf003.nc \
export DAYS=0.125
export FHMAX=3
export CICE_DIAGFREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
export MOM6_OUTPUT_FH=3
export MOM6_HISTFREQ_N=3

export WLCLK=60
2 changes: 1 addition & 1 deletion tests/tests/cpld_debug_sfs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export ODA_UINC_VAR="u_pert"
export ODA_VINC_VAR="v_pert"

# MOM6 frequency
export MOM6_OUTPUT_FH=2
export MOM6_HISTFREQ_N=2

# CICE frequency
export CICE_HISTFREQ_N="0, 0, 2, 0, 1"
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/cpld_restart_sfs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export ODA_INCUPD_UV=False
export nccmp_exclude="--exclude=oda_incupd_ncount"

# MOM6 frequency
export MOM6_OUTPUT_FH=24
export MOM6_HISTFREQ_N=24

# CICE frequency
export CICE_HISTFREQ_N="0, 0, 24, 0, 1"
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_mom6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export INLINE_MESH_OCN="INPUT/gfs_mesh.nc"
export INLINE_STREAM_FILES_OCN="INPUT/gfs_forcings.nc"
export STREAM_OFFSET=0

export MOM6_OUTPUT_FH=3
export MOM6_HISTFREQ_N=3
export MOM6_OUTPUT_DIR=./

export FIELD_TABLE=field_table_hafs
Expand Down