Skip to content

Commit 5f8db40

Browse files
Eric StofferahnEric Stofferahn
Eric Stofferahn
authored and
Eric Stofferahn
committed
Merge commit '7ee13cd' into cmip7
2 parents cc8a6db + 7ee13cd commit 5f8db40

139 files changed

Lines changed: 9378 additions & 5264 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.testing/tc0/MOM_input‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,11 @@ ENERGYSAVEDAYS = 1.0
233233

234234
DIAG_AS_CHKSUM = True
235235
DEBUG = True
236-
GRID_ROTATION_ANGLE_BUGS = True ! [Boolean] default = True
237-
USE_GM_WORK_BUG = True ! [Boolean] default = True
238-
FIX_UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
236+
239237
USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False
240238
GUST_CONST = 0.02 ! [Pa] default = 0.02
241-
FIX_USTAR_GUSTLESS_BUG = False ! [Boolean] default = False
239+
240+
! These are no longer necessary, as they are using the default value.
241+
GRID_ROTATION_ANGLE_BUGS = False ! [Boolean] default = False
242+
USE_GM_WORK_BUG = False ! [Boolean] default = False
243+
USTAR_GUSTLESS_BUG = False ! [Boolean] default = False

‎.testing/tc1.a/MOM_tc_variant‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
#override SPLIT=False
2-
#override FIX_UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
1+
#override SPLIT = False
2+
#override UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
3+
#override EQN_OF_STATE = "ROQUET_RHO" ! default = "WRIGHT_FULL"

‎.testing/tc1.b/MOM_tc_variant‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#override SPLIT=False
2-
#override USE_RK2=True
3-
#override FIX_UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
1+
#override SPLIT = False
2+
#override USE_RK2 = True
3+
#override UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
4+
5+
! There may be a problem with one of these settings.
6+
! #override EQN_OF_STATE = "ROQUET_SPV" ! default = "WRIGHT_FULL"
7+
! #override BOUSSINESQ = FALSE

‎.testing/tc1/MOM_input‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -584,14 +584,27 @@ ENERGYSAVEDAYS = 0.125 ! [days] default = 3600.0
584584
DIAG_AS_CHKSUM = True
585585
DEBUG = True
586586
USE_PSURF_IN_EOS = False ! [Boolean] default = False
587-
GRID_ROTATION_ANGLE_BUGS = True ! [Boolean] default = True
588587
INTERPOLATE_RES_FN = True ! [Boolean] default = True
589588
GILL_EQUATORIAL_LD = False ! [Boolean] default = False
590-
USE_GM_WORK_BUG = True ! [Boolean] default = True
591589
USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False
592-
KAPPA_SHEAR_ITER_BUG = True ! [Boolean] default = True
593-
KAPPA_SHEAR_ALL_LAYER_TKE_BUG = True ! [Boolean] default = True
594-
BULKML_CONV_MOMENTUM_BUG = True ! [Boolean] default = True
595590
PEN_SW_ABSORB_MINTHICK = 0.001 ! [m] default = 0.001
596591
GUST_CONST = 0.02 ! [Pa] default = 0.02
597-
FIX_USTAR_GUSTLESS_BUG = False ! [Boolean] default = False
592+
593+
594+
! Updated defaults reflecting the model status in late 2025
595+
DRAG_DIFFUSIVITY_ANSWER_DATE = 20251231
596+
EQN_OF_STATE = "WRIGHT_FULL" ! default = "WRIGHT_FULL"
597+
HOR_DIFF_ANSWER_DATE = 20251231
598+
MASS_WEIGHT_IN_PRESSURE_GRADIENT_TOP = True ! [Boolean] default = True
599+
600+
! These are no longer necessary, as they are using the default value.
601+
HOR_DIFF_LIMIT_BUG = False ! [Boolean] default = False
602+
GRID_ROTATION_ANGLE_BUGS = False ! [Boolean] default = False
603+
USE_GM_WORK_BUG = False ! [Boolean] default = False
604+
USTAR_GUSTLESS_BUG = False ! [Boolean] default = False
605+
KAPPA_SHEAR_ITER_BUG = False ! [Boolean] default = False
606+
KAPPA_SHEAR_ALL_LAYER_TKE_BUG = False ! [Boolean] default = False
607+
VISC_REM_BUG = False ! [Boolean] default = False
608+
FRICTWORK_BUG = False ! [Boolean] default = False
609+
BULKML_CONV_MOMENTUM_BUG = False ! [Boolean] default = False
610+

‎.testing/tc2/MOM_input‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -616,14 +616,29 @@ ENERGYSAVEDAYS = 0.5 ! [days] default = 3600.0
616616
! energies of the run and other globally summed diagnostics.
617617
DIAG_AS_CHKSUM = True
618618
DEBUG = True
619-
USE_GM_WORK_BUG = False
619+
620620
USE_PSURF_IN_EOS = False ! [Boolean] default = False
621-
GRID_ROTATION_ANGLE_BUGS = True ! [Boolean] default = True
622621
REMAP_UV_USING_OLD_ALG = True ! [Boolean] default = True
623622
USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False
624-
KAPPA_SHEAR_ITER_BUG = True ! [Boolean] default = True
625-
KAPPA_SHEAR_ALL_LAYER_TKE_BUG = True ! [Boolean] default = True
626623
USE_MLD_ITERATION = False ! [Boolean] default = False
627624
PEN_SW_ABSORB_MINTHICK = 0.001 ! [m] default = 0.001
628625
GUST_CONST = 0.02 ! [Pa] default = 0.02
629-
FIX_USTAR_GUSTLESS_BUG = False ! [Boolean] default = False
626+
627+
! Updated defaults reflecting the model status in late 2025
628+
EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT_FULL"
629+
TIDES_ANSWER_DATE = 20251231
630+
NDIFF_ANSWER_DATE = 20251231
631+
DRAG_DIFFUSIVITY_ANSWER_DATE = 20251231
632+
MASS_WEIGHT_IN_PRESSURE_GRADIENT_TOP = True ! [Boolean] default = True
633+
634+
! These are no longer necessary, as they are using the default value.
635+
GRID_ROTATION_ANGLE_BUGS = False ! [Boolean] default = False
636+
USE_GM_WORK_BUG = False ! [Boolean] default = False
637+
USTAR_GUSTLESS_BUG = False ! [Boolean] default = False
638+
KAPPA_SHEAR_ITER_BUG = False ! [Boolean] default = False
639+
KAPPA_SHEAR_ALL_LAYER_TKE_BUG = False ! [Boolean] default = False
640+
VISC_REM_BUG = False ! [Boolean] default = False
641+
FRICTWORK_BUG = False ! [Boolean] default = False
642+
643+
644+
BACKSCATTER_UNDERBOUND = True

‎.testing/tc2/MOM_tc_variant‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ TIDE_Q1 = True
1010
TIDE_MF = True
1111
TIDE_MM = True
1212
TIDE_SAL_SCALAR_VALUE = 1.
13+
BT_STRONG_DRAG = True ! [Boolean] default = False
14+
RESCALE_STRONG_DRAG = True ! [Boolean] default = False
15+

‎.testing/tc3/MOM_input‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -473,10 +473,18 @@ ENERGYSAVEDAYS = 3.0 ! [hours] default = 1.44E+04
473473
DIAG_AS_CHKSUM = True
474474
DEBUG = True
475475
OBC_RADIATION_MAX = 10.0 ! [nondim] default = 10.0
476-
GRID_ROTATION_ANGLE_BUGS = True ! [Boolean] default = True
477-
USE_GM_WORK_BUG = True ! [Boolean] default = True
476+
478477
USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False
479-
KAPPA_SHEAR_ITER_BUG = True ! [Boolean] default = True
480-
KAPPA_SHEAR_ALL_LAYER_TKE_BUG = True ! [Boolean] default = True
481478
GUST_CONST = 0.02 ! [Pa] default = 0.02
482-
FIX_USTAR_GUSTLESS_BUG = False ! [Boolean] default = False
479+
480+
! Updated defaults reflecting the model status in late 2025
481+
DRAG_DIFFUSIVITY_ANSWER_DATE = 20251231
482+
483+
! These are no longer necessary, as they are using the default value.
484+
GRID_ROTATION_ANGLE_BUGS = False ! [Boolean] default = False
485+
USE_GM_WORK_BUG = False ! [Boolean] default = False
486+
USTAR_GUSTLESS_BUG = False ! [Boolean] default = False
487+
KAPPA_SHEAR_ITER_BUG = False ! [Boolean] default = False
488+
KAPPA_SHEAR_ALL_LAYER_TKE_BUG = False ! [Boolean] default = False
489+
VISC_REM_BUG = False ! [Boolean] default = False
490+
FRICTWORK_BUG = False ! [Boolean] default = False

‎.testing/tc4/MOM_input‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@ ROTATION = "betaplane" ! default = "2omegasinlat"
9292
! USER - call a user modified routine.
9393
F_0 = 1.0E-04 ! [s-1] default = 0.0
9494
! The reference value of the Coriolis parameter with the betaplane option.
95-
GRID_ROTATION_ANGLE_BUGS = True ! [Boolean] default = False
96-
! If true, use an older algorithm to calculate the sine and cosines needed
97-
! rotate between grid-oriented directions and true north and east. Differences
98-
! arise at the tripolar fold.
9995

10096
! === module MOM_tracer_registry ===
10197

@@ -234,9 +230,6 @@ KV = 1.0E-04 ! [m2 s-1]
234230
! === module MOM_thickness_diffuse ===
235231
KHTH = 500.0 ! [m2 s-1] default = 0.0
236232
! The background horizontal thickness diffusivity.
237-
USE_GM_WORK_BUG = True ! [Boolean] default = False
238-
! If true, compute the top-layer work tendency on the u-grid with the incorrect
239-
! sign, for legacy reproducibility.
240233

241234
! === module MOM_porous_barriers ===
242235

@@ -381,9 +374,6 @@ WIND_CONFIG = "zero" !
381374
! options include (file), (2gyre), (1gyre), (gyres), (zero), and (USER).
382375
GUST_CONST = 0.02 ! [Pa] default = 0.0
383376
! The background gustiness in the winds.
384-
FIX_USTAR_GUSTLESS_BUG = False ! [Boolean] default = True
385-
! If true correct a bug in the time-averaging of the gustless wind friction
386-
! velocity
387377

388378
! === module MOM_main (MOM_driver) ===
389379
DAYMAX = 0.25 ! [days]
@@ -411,9 +401,16 @@ DEBUG = True
411401

412402
INTERPOLATE_RES_FN = True ! [Boolean] default = True
413403
GILL_EQUATORIAL_LD = False ! [Boolean] default = False
414-
FIX_UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
415404
USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False
416-
KAPPA_SHEAR_ITER_BUG = True ! [Boolean] default = True
417-
KAPPA_SHEAR_ALL_LAYER_TKE_BUG = True ! [Boolean] default = True
418405
USE_MLD_ITERATION = False ! [Boolean] default = False
419406

407+
MASS_WEIGHT_IN_PRESSURE_GRADIENT_TOP = True ! [Boolean] default = True
408+
409+
! These are no longer necessary, as they are using the default value.
410+
GRID_ROTATION_ANGLE_BUGS = False ! [Boolean] default = False
411+
USE_GM_WORK_BUG = False ! [Boolean] default = False
412+
USTAR_GUSTLESS_BUG = False ! [Boolean] default = False
413+
KAPPA_SHEAR_ITER_BUG = False ! [Boolean] default = False
414+
KAPPA_SHEAR_ALL_LAYER_TKE_BUG = False ! [Boolean] default = False
415+
VISC_REM_BUG = False ! [Boolean] default = False
416+
FRICTWORK_BUG = False ! [Boolean] default = False

‎ac/makedep‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22

33
from __future__ import print_function
44

‎config_src/drivers/FMS_cap/ocean_model_MOM.F90‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,8 @@ subroutine ocean_model_init(Ocean_sfc, OS, Time_init, Time_in, wind_stagger, gas
372372

373373
!allocate(OS%sfc_state)
374374
call allocate_surface_state(OS%sfc_state, OS%grid, use_temperature, do_integrals=.true., &
375-
gas_fields_ocn=gas_fields_ocn, use_meltpot=use_melt_pot)
375+
gas_fields_ocn=gas_fields_ocn, use_meltpot=use_melt_pot, &
376+
use_iceshelves=OS%use_ice_shelf)
376377

377378
if (present(wind_stagger)) then
378379
call surface_forcing_init(Time_in, OS%grid, OS%US, param_file, OS%diag, &

0 commit comments

Comments
 (0)