Code

Merge main to dev/gfdl (2013-10-25)#1612

Code

Closed

marshallward wants to merge 124 commits intomom-ocean:mainmom-ocean/MOM6:mainfrom NOAA-GFDL:main_20231025NOAA-GFDL/MOM6:main_20231025Copy head branch name to clipboard

+11,249-6,848

Commits

Commits on Jul 7, 2023

• Autoconf: Find Python, even if PYTHON is empty

  Show description for 620d933
  

  marshallward

  authored and

  adcroft

  committed
  620d933

• +Refactor nominal depth in ALE code

  Show description for 77b5881
  

  Hallberg-NOAA

  authored and

  adcroft

  committed
  77b5881

Commits on Jul 12, 2023

• Add restart subroutine to MOM.F90

  Show description for 7970347
  

  adcroft

  authored and

  marshallward

  committed
  7970347

Commits on Jul 14, 2023

• +Add tv%valid_SpV_halo to debug non-Boussinesq mode

  Show description for 37ee5cc
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  37ee5cc

Commits on Jul 17, 2023

• (*)+Use RHO_KV_CONVERT to set nonBous GV%H_to_m

  Show description for b1210a0
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  b1210a0

Commits on Jul 18, 2023

• +Add new (not yet used) arguments to 7 routines

  Show description for 2342a58
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  2342a58

Commits on Jul 20, 2023

• Fms2 io read3d slice (#399)

  Show description for df0eaf0
  MJHarrison-GFDL

  authored
  df0eaf0

• Fix logic for setting KV_ML_INVZ2 from KVML

  Show description for 25feaf2
  

  adcroft

  authored and

  marshallward

  committed
  25feaf2

• +Use RHO_PGF_REF for the pressure gradient forces

  Show description for a5129ca
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  a5129ca

Commits on Jul 21, 2023

• Converted warning about depth_list to a note

  Show description for bb71c34
  

  adcroft

  authored and

  marshallward

  committed
  bb71c34

Commits on Jul 24, 2023

• Correct diagnostic coordinate interpolation scheme

  Show description for b9c7c86
  

  adcroft

  authored and

  marshallward

  committed
  b9c7c86

• +(*)Fix wave_speed_init mono_N2_depth bug

  Show description for ccd3ded
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  ccd3ded

• *+Revise non-Boussinesq gprime expressions

  Show description for 6102be2
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  6102be2

Commits on Jul 25, 2023

• *Non-Boussinesq revision of MOM_thickness_diffuse

  Show description for 2f6e86e
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  2f6e86e

• Brine plume (#401)

  Show description for 147ddf1
  kshedstrom

  authored
  147ddf1

• +add h to drifters interface (#408)

  Show description for d5ba107
  cspencerjones

  authored
  d5ba107

Commits on Jul 26, 2023

• +*Revise units of arguments to vert_fill_TS

  Show description for 249a078
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  249a078

• Add comment justifying rescaling in vert_fill_TS

  Show description for e465b1f
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  e465b1f

• +*Add and use find_ustar

  Show description for 636d610
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  636d610

• +wave_speed arg mono_N2_depth in thickness units

  Show description for 878fd1e
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  878fd1e

Commits on Jul 27, 2023

• *+Add BT_RHO_LINEARIZED to MOM_barotropic.F90

  Show description for be5602e
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  be5602e

• +*Use thickness_to_dz in tracer modules

  Show description for fffb6f3
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  fffb6f3

Commits on Jul 28, 2023

• Fix a bug in the OMP directive for plume_flux

  Show description for 55fc59a
  Hallberg-NOAA

  committed
  55fc59a

Commits on Jul 29, 2023

• Generalized MOM restart function

  Show description for 5af37b6
  marshallward

  committed
  5af37b6

• Create restart directory if absent

  Show description for 3d9190c
  marshallward

  committed
  3d9190c

• Use POSIX stat to check if restart dir exists

  Show description for 5efad9b
  marshallward

  committed
  5efad9b

• *Cancel out Z_to_H factors in MOM_hor_visc.F90

  Show description for 84056b1
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  84056b1

Commits on Jul 30, 2023

• +*Revise the units of 12 vertvisc_type elements

  Show description for 3fd2191
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  3fd2191

• +Thickness-based diffusivity arguments

  Show description for 2d42dca
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  2d42dca

• +*Use [H Z2 T-3 ~> m3 s-3 or W m-2] for TKE units

  Show description for 359bdcb
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  359bdcb

Commits on Jul 31, 2023

• +*Non-Boussinesq Rossby_front initialization

  Show description for fc773d9
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  fc773d9

• *Fix logic of an inconsistent initialization test

  Show description for 8f5465b
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  8f5465b

• +Add find_rho_bottom

  Show description for d22b667
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  d22b667

• +*Non-Boussinesq internal tide drag uses density

  Show description for e4f76c0
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  e4f76c0

Commits on Aug 1, 2023

• +(*)Minimum non-Boussinesq answer date of 20230701

  Show description for fd31e01
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  fd31e01

Commits on Aug 5, 2023

• Move file parser inquire calls to root PE

  Show description for 45cd5c6
  

  marshallward

  authored and

  Hallberg-NOAA

  committed
  45cd5c6

Commits on Aug 6, 2023

• +Non-Boussinesq revisions to wave_interface

  Show description for f01d256
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  f01d256

Commits on Aug 7, 2023

• Ice shelf melt parameterization fixes (#395)

  Show description for 8f7cc0e
  claireyung

  authored
  8f7cc0e

Commits on Aug 9, 2023

• *Use tv%SpV_avg in non-Boussinesq regridding

  Show description for 46c5262
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  46c5262

Commits on Aug 10, 2023

• *Non-Boussinesq revision of diabatic_driver

  Show description for ba70663
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  ba70663

• Adding a knob for strength of brine plume mixing.

  

  kshedstrom

  authored and

  marshallward

  committed
  648012e

• +*Ignore SURFACE_ANSWER_DATE when non-Boussinesq

  Show description for 07713af
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  07713af

• +*Non-Boussinesq revision of full_convection

  Show description for 597bbf1
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  597bbf1

Commits on Aug 11, 2023

• +*Non-Boussinesq revision of MOM_vertvisc.F90

  Show description for 3ce1368
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  3ce1368

• *+Add forcing%tau_mag_gustless & tau_mag opt args

  Show description for c4ff021
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  c4ff021

Commits on Aug 12, 2023

• +*Non-Boussinesq revision of tidal_mixing

  Show description for 23df713
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  23df713

Commits on Aug 13, 2023

• *Fix allocate_forcing_by_ref tau_mag_gustless bug

  Show description for 9e756af
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  9e756af

Commits on Aug 14, 2023

• Fix rescaling in regularize_surface debugging

  Show description for 2642c1c
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  2642c1c

• *Non-Boussinesq revision of 3 MOM_CVMix modules

  Show description for f847b3c
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  f847b3c

• *Non-Boussinesq revision of MOM_CVMix_KPP

  Show description for 22a370c
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  22a370c

Commits on Aug 15, 2023

• Bugfix for MOM_tracer_advect for ad_x/y and ad2d_x/y diagnostic fields

  Show description for c803904
  

  breichl

  authored and

  marshallward

  committed
  c803904

• *Non-Boussinesq interface_filter

  Show description for a808881
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  a808881

Commits on Aug 16, 2023

• *Revise calc_isoneutral_slopes when non-Boussinesq

  Show description for d223f25
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  d223f25

• Refactor rescaling of CFC_cap flux diagnostics

  Show description for d16f343
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  d16f343

Commits on Aug 17, 2023

• *+Non-Boussinesq revision of set_viscosity

  Show description for 546728a
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  546728a

Commits on Aug 18, 2023

• *Non-Boussinesq revision of set_diffusivity

  Show description for 9b86edb
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  9b86edb

• *Non-Boussinesq refactoring of entrain_diffusive

  Show description for 828a178
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  828a178

• Merge branch 'main' into dev/gfdl

  marshallward

  committed
  be0e800

Commits on Aug 19, 2023

• +Add RESTORE_FLUX_RHO and TKE_TIDAL_RHO

  Show description for 212f2a1
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  212f2a1

• Add tau_mag to allocate_forcing_type calls

  Show description for cf6ac00
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  cf6ac00

• +Set tau_mag in idealized_hurricane_wind_forcing

  Show description for 994ce9e
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  994ce9e

• +Use RESTORE_FLUX_RHO in dumbbell & SCM_CVMix_tests

  Show description for d107737
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  d107737

Commits on Aug 21, 2023

• Resolve warning about S_REF units

  Show description for 5afb122
  

  adcroft

  authored and

  marshallward

  committed
  5afb122

• Bugfix in MLE for reproducible restarts with USE_BODNER23 = True

  Show description for 4c224e7
  

  breichl

  authored and

  marshallward

  committed
  4c224e7

• +*Non-Boussinesq form of mixedlayer_restrat

  Show description for 7e51f1d
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  7e51f1d

Commits on Aug 22, 2023

• *Non-Boussinesq revision of kappa_shear

  Show description for d60c2e0
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  d60c2e0

Commits on Aug 23, 2023

• +(*)Use tv%SpV in MOM_sponge code

  Show description for bd5fe0c
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  bd5fe0c

• *Non-Boussinesq expressions for DOME inflow rates

  Show description for b3c7331
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  b3c7331

Commits on Aug 24, 2023

• Separate SAL from tidal_forcing

  Show description for 32b5e8a
  

  herrwang0

  authored and

  marshallward

  committed
  32b5e8a

• Decompose output from calc_tidal_forcing

  Show description for 4fec906
  

  herrwang0

  authored and

  marshallward

  committed
  4fec906

• Fix SSH for calculating SAL with flooding points

  Show description for b69d6fb
  

  herrwang0

  authored and

  marshallward

  committed
  b69d6fb

• Renaming input parameter names for the SAL module

  Show description for b94a32c
  

  herrwang0

  authored and

  marshallward

  committed
  b94a32c

• Recover old answers with tides in Boussinesq mode

  Show description for 00a63e8
  

  herrwang0

  authored and

  marshallward

  committed
  00a63e8

• Refactor SAL and tides calls in Boussinesq mode

  Show description for 3061166
  

  herrwang0

  authored and

  marshallward

  committed
  3061166

• Change SAL related parameter names

  Show description for 3515b80
  

  herrwang0

  authored and

  marshallward

  committed
  3515b80

• Modify reading SAL related parameters

  Show description for c6b6143
  

  herrwang0

  authored and

  marshallward

  committed
  c6b6143

• *+Use TIDES_ANSWER_DATE with semi-Boussinesq tides

  Show description for 095a3b5
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  095a3b5

Commits on Aug 25, 2023

• *Non-Boussinesq revision of MOM.F90 for restarts

  Show description for 24160d5
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  24160d5

• *Revise BFB_set_coord and BFB_buoyancy_forcing

  Show description for 1872d3b
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  1872d3b

Commits on Aug 30, 2023

• Use GV%dZ_subroundoff

  Show description for 279ee1c
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  279ee1c

• +*Revise non-Boussinesq offline tracer diffusivity

  Show description for 7d199ca
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  7d199ca

Commits on Sep 1, 2023

• +Obsolete 18 2018_ANSWERS runtime parameters

  Show description for 72fbee0
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  72fbee0

• Autoconf: Update deps m4 macros

  Show description for 9f7f86d
  marshallward

  committed
  9f7f86d

Commits on Sep 6, 2023

• Ice-shelf bugfixes for restarts and halo updates

  Show description for 1577ae1
  

  alex-huth

  authored and

  marshallward

  committed
  1577ae1

Commits on Sep 8, 2023

• implement restart for internal tides (#463)

  Show description for 1d35fa1
  

  raphaeldussin

  and

  Raphael Dussin

  authored
  1d35fa1

Commits on Sep 11, 2023

• *+Non-Boussinesq MEKE and add MEKE_TOTAL_DEPTH_RHO

  Show description for 1bb8852
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  1bb8852

• CI: Run test (and test.summary) locally

  Show description for d342b29
  marshallward

  committed
  d342b29

• New TIDAL_SAL_FLATHER option

  Show description for 9de6ce7
  

  2 peopleauthored and

  marshallward

  committed
  9de6ce7

• makedep: Support externals alongside program units

  Show description for 25b57f4
  marshallward

  committed
  25b57f4

Commits on Sep 25, 2023

• *Test for convergence in dz_to_thickness_EOS

  Show description for a7444b3
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  a7444b3

• *Non-Boussinesq revision of energetic_PBL

  Show description for dd5c47d
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  dd5c47d

• +SpV_avg optional argument to extract_optics_slice

  Show description for 2337404
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  2337404

• +*Non-Boussinesq bulk mixed layer calculations

  Show description for 2f1bdc0
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  2f1bdc0

Commits on Sep 28, 2023

• +*Non-Boussinesq revision of diabatic_aux

  Show description for 8d628bd
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  8d628bd

• Do not allocate ustar and tau_mag together

  Show description for 3ef5b93
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  3ef5b93

Commits on Oct 5, 2023

• We need an extra pass_var for Kv_shear

  Show description for e2d244f
  

  kshedstrom

  authored and

  marshallward

  committed
  e2d244f

• +*Non-Boussinesq wave_speed calculations

  Show description for 08704f8
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  08704f8

• +*Add halo_size argument to wave_speeds

  Show description for 2047676
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  2047676

• makedep: Module dependency in nested includes

  Show description for 6756b48
  

  marshallward

  authored and

  adcroft

  committed
  6756b48

• +(*)Non-Boussinesq default for Z_INIT_REMAP_GENERAL

  Show description for 6d68459
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  6d68459

• +*Non-Boussinesq revision of lateral_mixing_coeffs

  Show description for 13f2603
  

  Hallberg-NOAA

  authored and

  adcroft

  committed
  13f2603

• .testing: Codecov upload uses Github Actions token

  Show description for a41d0a0
  

  marshallward

  authored and

  adcroft

  committed
  a41d0a0

Commits on Oct 6, 2023

• +Rename OBC sea surface height variables

  Show description for 7cef1e4
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  7cef1e4

• Read OBC SSH data in Z units

  Show description for de38562
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  de38562

• +Add find_col_avg_SpV

  Show description for 55c948a
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  55c948a

• +Non-Boussinesq Flather open boundary conditions

  Show description for 54b46f6
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  54b46f6

• +Add segment%dZtot

  Show description for 06bc001
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  06bc001

• *Patches for nonBous_OBCs to prevent blocking

  Show description for e2deaec
  

  MJHarrison-GFDL

  authored and

  marshallward

  committed
  e2deaec

Commits on Oct 7, 2023

• New treatment of ice shelf boundaries (#467)

  Show description for 3650339
  alex-huth

  authored
  3650339

• .testing: Codecov token for unit test upload

  Show description for c399372
  marshallward

  committed
  c399372

• *Fix non-Boussinesq Flather BT_OBC%dZ_v bug

  Show description for 23345f0
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  23345f0

Commits on Oct 10, 2023

• Modify quadrature used for ice shelf viscosity (#468)

  Show description for 41609c2
  alex-huth

  authored
  41609c2

Commits on Oct 11, 2023

• SSA convergence based on change of norm (#469)

  Show description for 2ac48a6
  alex-huth

  authored
  2ac48a6

Commits on Oct 12, 2023

• *Use thickness_to_dz in dumbbell_initialize_sponges

  Show description for bd4c87c
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  bd4c87c

• (+*) Fix bugs in tracer index in tracer reservoirs (#480)

  Show description for 95d6e93
  WenhaoChen89

  authored
  95d6e93

Commits on Oct 13, 2023

• +Add particle code option to advect with uhtr (#492)

  Show description for 38aeccd
  cspencerjones

  authored
  38aeccd

• Ice shelf Coulomb friction law (#470)

  Show description for 89506fa
  alex-huth

  authored
  89506fa

• +REMAP_AUX needs at least one more halo update. (#496)

  Show description for 0c491ce
  kshedstrom

  authored
  0c491ce

Commits on Oct 19, 2023

• +Refactored diapyc_energy_req_test

  Show description for ead68d4
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  ead68d4

• Refactor diapyc_energy_req_calc and find_PE_chg

  Show description for 43a4fa9
  

  Hallberg-NOAA

  authored and

  marshallward

  committed
  43a4fa9

• Acceleration of Zanna-Bolton-2020 parameterization and new features required for NW2 (#484)

  Show description for 475590d
  Pperezhogin

  authored
  475590d

Commits on Oct 23, 2023

• Ice-shelf solo driver and MISMIP+ updates (#471)

  Show description for ac66061
  alex-huth

  authored
  ac66061

Commits on Oct 24, 2023

• ice shelf dHdt and optimization

  Show description for c9fc30d
  

  alex-huth

  authored and

  marshallward

  committed
  c9fc30d

Commits on Oct 25, 2023

• Merge branch 'main' into dev/gfdl

  marshallward

  committed
  e5b64f9