Merge branch 'main_into_dev' into 'dev/gfdl'#157

Merged

marshallward merged 61 commits into

Jul 3, 2022

Commits on May 21, 2021

Adding Stokes forces implementation and diags.

brandon.reichl
authored and
brandon.reichl
committed

Commits on Jun 3, 2021

Merge branch 'dev/gfdl' into Stokes_Forces

brandon.reichl
authored and
brandon.reichl
committed

Commits on Jun 4, 2021

Finish incomplete merge in MOM_wave_interface.

brandon.reichl
authored and
brandon.reichl
committed

Commits on Jun 7, 2021

Remote application of Stokes tendency on thermodynamic step

brandon.reichl
authored and
brandon.reichl
committed
Updating name of Stokes PGF routine to be more descriptive.

brandon.reichl
authored and
brandon.reichl
committed
Merge branch 'dev/gfdl' into Stokes_Forces

brandon.reichl
authored and
brandon.reichl
committed

Commits on Aug 25, 2021

Merge remote-tracking branch 'breichl/Stokes_Forces' into pstokes_wave_cpl_mehtod
alperaltuntas
committed

Commits on Aug 27, 2021

Merge branch 'merge_ww3_coupling_vr12ma' into pstokes_wave_cpl_mehtod
alperaltuntas
committed

Commits on Aug 30, 2021

In NUOPC cap, add ability to import fields with ungridded dimensions
alperaltuntas
committed

Commits on Sep 7, 2021

disable the register of tidal mixing coeff diags when they are unavailable
alperaltuntas
committed

Commits on Sep 8, 2021

Merge pull request #197 from NCAR/fix_tidal_coeff_diags
gustavo-marques
authored

Commits on Oct 6, 2021

merge pr1507 with dev/ncar and resolve conflicts in MOM_tidal_mixing
alperaltuntas
committed

Commits on Oct 12, 2021

remove unnecessary ampersands from variable declarations
alperaltuntas
committed

Commits on Oct 18, 2021

Merge branch 'pr1507b' into merge_pr1507
alperaltuntas
committed

Commits on Oct 25, 2021

Merge pull request #200 from NCAR/merge_pr1507
gustavo-marques
authored

Commits on Oct 28, 2021

changes in the nuopc cap to support arbitrary stokes bands
alperaltuntas
committed

Commits on Dec 7, 2021

Commits on Dec 8, 2021

Commits on Dec 10, 2021

merge with latest dev/ncar and resolve conflicts
alperaltuntas
committed

Commits on Dec 14, 2021

remove duplicate assignments of dvdx and dudy. These duplicate assignments incorrectly override dvdx and dudy when surfbands wave coupling is on.
alperaltuntas
committed

Commits on Dec 23, 2021

Fixes for Stokes time tendency terms

brandon.reichl
authored and
brandon.reichl
committed
fixes in MOM_wave_interface array indices
alperaltuntas
committed
More changes for surfbands wave coupling:
alperaltuntas
committed

Commits on Jan 14, 2022

Updates to Stokes drift terms, primarily the pressure gradient routine.

brandon.reichl
authored and
brandon.reichl
committed

Commits on Jan 21, 2022

Fixing diagnostic mode for vortex force correction term.

brandon.reichl
authored and
brandon.reichl
committed
Fixing restart issue with Stokes time tendency term.

brandon.reichl
authored and
brandon.reichl
committed
Merge remote-tracking branch 'NCAR/surfbands_refactor' into BGR_Stokes_DDT_Fixes

brandon.reichl
authored and
brandon.reichl
committed

Commits on Feb 2, 2022

fix line lenght error in MOM_wave_interface
alperaltuntas
committed

Commits on Feb 3, 2022

Merge pull request #205 from NCAR/surfbands_refactor
gustavo-marques
authored

Commits on Feb 7, 2022

Merge pull request #206 from mom-ocean/main
alperaltuntas
authored

Commits on Feb 15, 2022

Misc dimensional consistency fixes in regridding, remapping, and MEKE routines
alperaltuntas
authored

Commits on Feb 18, 2022

Commits on Mar 9, 2022

Add KPP nonlocal term to passive tracers (#202)
mnlevy1981
authored

Commits on Apr 21, 2022

Add option to receive enthalpy fluxes via coupler

gustavo-marques
authored and
alperaltuntas
committed
Heat conservation when enthalpy is via coupler

gustavo-marques
authored and
alperaltuntas
committed
Modify log/description of ENTHALPY_FROM_COUPLER

gustavo-marques
authored and
alperaltuntas
committed
Modifications needed for when enthalpy is via CPL

gustavo-marques
authored and
alperaltuntas
committed
Changes needed for when enthalpy is via coupler

gustavo-marques
authored and
alperaltuntas
committed
Add missing logical to control allocation of fluxes

gustavo-marques
authored and
alperaltuntas
committed
Avoid rotating arrays that are not associated

gustavo-marques
authored and
alperaltuntas
committed
Adds conditional for setting fluxes%heat_content_*

gustavo-marques
authored and
alperaltuntas
committed

Commits on May 7, 2022

Corrections to cell-averaged density computation (#213)

authored

Commits on May 17, 2022

Merge branch 'main_03may2022' into dev/ncar
gustavo-marques
committed

Commits on May 19, 2022

Merge pull request #216 from gustavo-marques/eval_main_03may2022
alperaltuntas
authored

Commits on May 20, 2022

Merge branch 'dev/ncar' into eval_main_candidate_16may2022
gustavo-marques
committed

Commits on Jun 2, 2022

Merge branch 'main' into eval_main_candidate_16may2022
gustavo-marques
committed

Commits on Jun 3, 2022

Merge pull request #219 from gustavo-marques/eval_main_candidate_16may2022
alperaltuntas
authored

Commits on Jun 9, 2022

Commits on Jun 29, 2022

Merge pull request #1571 from gustavo-marques/dev-ncar-main-candidate-2022-06-03
gustavo-marques
authored

Commits on Jul 2, 2022

Merge branch 'main' into main_to_dev
marshallward
committed