Skip to content
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

Update MOM6 templates for coordination with global-workflow updates #1979

Merged
merged 26 commits into from
Dec 7, 2023
Merged

Update MOM6 templates for coordination with global-workflow updates #1979

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
da68dd7
Update MOM templates to be in sync with recent additions to g-w
JessicaMeixner-NOAA Nov 2, 2023
900b716
Merge remote-tracking branch 'UFS/develop' into feature/mom6sync
JessicaMeixner-NOAA Nov 2, 2023
8075263
update datm MOM6 vars
JessicaMeixner-NOAA Nov 3, 2023
8bebbf6
point to g-w fix instead of my linked copy
JessicaMeixner-NOAA Nov 6, 2023
00ff646
Merge branch 'ufs-community:develop' into feature/mom6sync
JessicaMeixner-NOAA Nov 9, 2023
7bff903
Merge branch 'ufs-community:develop' into feature/mom6sync
JessicaMeixner-NOAA Nov 14, 2023
c671115
Merge branch 'ufs-community:develop' into feature/mom6sync
JessicaMeixner-NOAA Nov 16, 2023
d1e0d52
Merge branch 'ufs-community:develop' into feature/mom6sync
JessicaMeixner-NOAA Nov 20, 2023
547d092
Merge branch 'ufs-community:develop' into feature/mom6sync
JessicaMeixner-NOAA Nov 27, 2023
e6bdd5b
Merge branch 'ufs-community:develop' into feature/mom6sync
JessicaMeixner-NOAA Nov 27, 2023
80f8126
Revert manual copying of file now that new file is in input directory
JessicaMeixner-NOAA Nov 27, 2023
8aa8848
Merge branch 'ufs-community:develop' into feature/mom6sync
JessicaMeixner-NOAA Nov 30, 2023
4dde4c8
Merge branch 'ufs-community:develop' into feature/mom6sync
JessicaMeixner-NOAA Dec 4, 2023
028065e
Merge branch 'ufs-community:develop' into feature/mom6sync
JessicaMeixner-NOAA Dec 4, 2023
6c7e269
Merge branch 'ufs-community:develop' into feature/mom6sync
JessicaMeixner-NOAA Dec 6, 2023
368d9cf
Add new BL_DATE
jkbk2004 Dec 6, 2023
aa7dea8
add hercules RT logs: passed
zach1221 Dec 7, 2023
9ffcf1a
add orion RT logs: passed
zach1221 Dec 7, 2023
994f7f6
add hera RT log: passed
jkbk2004 Dec 7, 2023
b1745d6
Merge branch 'feature/mom6sync' of https://github.com/JessicaMeixner-…
jkbk2004 Dec 7, 2023
8694920
add gaea c5 RT log: passed
jkbk2004 Dec 7, 2023
3c94737
add gaea c4 RT log: passed
jkbk2004 Dec 7, 2023
3576ecf
add jet RT passed
FernandoAndrade-NOAA Dec 7, 2023
7639b8f
WCOSS2 RT Log
BrianCurtis-NOAA Dec 7, 2023
544c7ef
Acorn RT Log
BrianCurtis-NOAA Dec 7, 2023
61404c0
add hercules RT logs: passed
zach1221 Dec 7, 2023
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
6 changes: 6 additions & 0 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,9 @@ export DO_OCN_SPPT=False
export PERT_EPBL=False
export OCN_SPPT=-999.
export EPBL=-999.
# MOM6 diag
export MOM6_DIAG_COORD_DEF_Z_FILE=interpolate_zgrid_40L.nc
export MOM6_DIAG_MISVAL='-1e34'

# CICE6 defaults; 1 degree
export CICE_DECOMP=slenderX2
Expand Down Expand Up @@ -1076,6 +1079,9 @@ export EPBL=-999.
export MOM6_THERMO_SPAN=False
export MOM6_USE_WAVES=False
export MOM6_ALLOW_LANDMASK_CHANGES=False
# MOM6 diag
export MOM6_DIAG_COORD_DEF_Z_FILE=interpolate_zgrid_40L.nc
export MOM6_DIAG_MISVAL='-1e34'

# CICE6 defaults; 1 degree
export MESHOCN_ICE=mesh.mx${OCNRES}.nc
Expand Down
1 change: 1 addition & 0 deletions tests/fv3_conf/cpld_control_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/grid_spec.nc ./INPUT/@[ATMRES]_mosaic.n

# MOM6 fixed input
cp @[INPUTDATA_ROOT]/MOM6_FIX/@[OCNRES]/* ./INPUT
cp /scratch1/NCEPDEV/global/glopara/fix/mom6/20220805/500/oceanda_zgrid_25L.nc ./INPUT
JessicaMeixner-NOAA marked this conversation as resolved.
Show resolved Hide resolved

# CICE fixed input
cp @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/grid_cice_NEMS_mx@[OCNRES].nc .
Expand Down
4 changes: 2 additions & 2 deletions tests/parm/MOM_input_template_025
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,8 @@ DIAG_COORDS = "z Z ZSTAR"
! A list of string tuples associating diag_table modules to
! a coordinate definition used for diagnostics. Each string
! is of the form "MODULE_SUFFIX,PARAMETER_SUFFIX,COORDINATE_NAME".
DIAG_COORD_DEF_Z="FILE:interpolate_zgrid_40L.nc,interfaces=zw"
DIAG_MISVAL = -1e34
DIAG_COORD_DEF_Z="FILE:@[MOM6_DIAG_COORD_DEF_Z_FILE],interfaces=zw"
DIAG_MISVAL = @[MOM6_DIAG_MISVAL]
!DIAG_COORD_DEF_RHO2 = "FILE:diag_rho2.nc,interfaces=rho2" ! default = "WOA09"
! Determines how to specify the coordinate resolution. Valid options are:
! PARAM - use the vector-parameter DIAG_COORD_RES_RHO2
Expand Down
4 changes: 2 additions & 2 deletions tests/parm/MOM_input_template_050
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,8 @@ DIAG_COORDS = "z Z ZSTAR"
! A list of string tuples associating diag_table modules to
! a coordinate definition used for diagnostics. Each string
! is of the form "MODULE_SUFFIX,PARAMETER_SUFFIX,COORDINATE_NAME".
DIAG_COORD_DEF_Z="FILE:interpolate_zgrid_40L.nc,interfaces=zw"
DIAG_MISVAL = -1e34
DIAG_COORD_DEF_Z="FILE:@[MOM6_DIAG_COORD_DEF_Z_FILE],interfaces=zw"
DIAG_MISVAL = @[MOM6_DIAG_MISVAL]
!DIAG_COORD_DEF_RHO2 = "RFNC1:35,999.5,1028,1028.5,8.,1038.,0.0078125" ! default = "WOA09"
! Determines how to specify the coordinate resolution. Valid options are:
! PARAM - use the vector-parameter DIAG_COORD_RES_RHO2
Expand Down
4 changes: 2 additions & 2 deletions tests/parm/MOM_input_template_100
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,8 @@ DIAG_COORDS = "z Z ZSTAR"
! A list of string tuples associating diag_table modules to
! a coordinate definition used for diagnostics. Each string
! is of the form "MODULE_SUFFIX,PARAMETER_SUFFIX,COORDINATE_NAME".
DIAG_COORD_DEF_Z="FILE:interpolate_zgrid_40L.nc,interfaces=zw"
DIAG_MISVAL = -1e34
DIAG_COORD_DEF_Z="FILE:@[MOM6_DIAG_COORD_DEF_Z_FILE],interfaces=zw"
DIAG_MISVAL = @[MOM6_DIAG_MISVAL]
!AVAILABLE_DIAGS_FILE = "available_diags.002160" ! default = "available_diags.000000"
! A file into which to write a list of all available ocean diagnostics that can
! be included in a diag_table.
Expand Down
51 changes: 51 additions & 0 deletions tests/parm/MOM_input_template_500
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,15 @@ Z_INIT_ALE_REMAPPING = True ! [Boolean] default = False
! If True, then remap straight to model coordinate from file.

! === module MOM_diag_mediator ===
NUM_DIAG_COORDS = 1
! The number of diagnostic vertical coordinates to use.
! For each coordinate, an entry in DIAG_COORDS must be provided.
DIAG_COORDS = "z Z ZSTAR"
! A list of string tuples associating diag_table modules to
! a coordinate definition used for diagnostics. Each string
! is of the form "MODULE_SUFFIX,PARAMETER_SUFFIX,COORDINATE_NAME".
DIAG_COORD_DEF_Z="FILE:@[MOM6_DIAG_COORD_DEF_Z_FILE],interfaces=zw"
DIAG_MISVAL = @[MOM6_DIAG_MISVAL]

! === module MOM_MEKE ===
USE_MEKE = True ! [Boolean] default = False
Expand Down Expand Up @@ -458,6 +467,48 @@ USE_LA_LI2016 = @[MOM6_USE_LI2016] ! [nondim] default = False
! Langmuir number.
USE_WAVES = @[MOM6_USE_WAVES] ! [Boolean] default = False
! If true, enables surface wave modules.
WAVE_METHOD = "SURFACE_BANDS" ! default = "EMPTY"
! Choice of wave method, valid options include:
! TEST_PROFILE - Prescribed from surface Stokes drift
! and a decay wavelength.
! SURFACE_BANDS - Computed from multiple surface values
! and decay wavelengths.
! DHH85 - Uses Donelan et al. 1985 empirical
! wave spectrum with prescribed values.
! LF17 - Infers Stokes drift profile from wind
! speed following Li and Fox-Kemper 2017.
SURFBAND_SOURCE = "COUPLER" ! default = "EMPTY"
! Choice of SURFACE_BANDS data mode, valid options include:
! DATAOVERRIDE - Read from NetCDF using FMS DataOverride.
! COUPLER - Look for variables from coupler pass
! INPUT - Testing with fixed values.
STK_BAND_COUPLER = 3 ! default = 1
! STK_BAND_COUPLER is the number of Stokes drift bands in the coupler. This has
! to be consistent with the number of Stokes drift bands in WW3, or the model
! will fail.
SURFBAND_WAVENUMBERS = 0.04, 0.11, 0.3305 ! [rad/m] default = 0.12566
! Central wavenumbers for surface Stokes drift bands.
EPBL_LANGMUIR_SCHEME = "ADDITIVE" ! default = "NONE"
! EPBL_LANGMUIR_SCHEME selects the method for including Langmuir turbulence.
! Valid values are:
! NONE - Do not do any extra mixing due to Langmuir turbulence
! RESCALE - Use a multiplicative rescaling of mstar to account for Langmuir
! turbulence
! ADDITIVE - Add a Langmuir turblence contribution to mstar to other
! contributions
LT_ENHANCE_COEF = 0.044 ! [nondim] default = 0.447
! Coefficient for Langmuir enhancement of mstar
LT_ENHANCE_EXP = -1.5 ! [nondim] default = -1.33
! Exponent for Langmuir enhancementt of mstar
LT_MOD_LAC1 = 0.0 ! [nondim] default = -0.87
! Coefficient for modification of Langmuir number due to MLD approaching Ekman
! depth.
LT_MOD_LAC4 = 0.0 ! [nondim] default = 0.95
! Coefficient for modification of Langmuir number due to ratio of Ekman to
! stable Obukhov depth.
LT_MOD_LAC5 = 0.22 ! [nondim] default = 0.95
! Coefficient for modification of Langmuir number due to ratio of Ekman to
! unstable Obukhov depth.

! === module MOM_regularize_layers ===

Expand Down
2 changes: 2 additions & 0 deletions tests/tests/cpld_control_c48
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ export CHLCLIM=''
export FRUNOFF=''
export MOM6_RIVER_RUNOFF=False
export MOM6_RESTART_SETTING=r
export MOM6_DIAG_COORD_DEF_Z_FILE=oceanda_zgrid_25L.nc
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JessicaMeixner-NOAA Does this MOM6_DIAG_COORD_DEF_Z_FILE need to be added to the cpld_warmstart_c48 and cpld_restart_c48? Those tests are currently commented out (I need to recreate the warmstart files that they use). Will we need this variable set for those two tests?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DeniseWorthen good catch, yes you will want to set that for the other C48 tests.



export FNALBC="'C48.snowfree_albedo.tileX.nc'"
export FNALBC2="'C48.facsf.tileX.nc'"
Expand Down