*Updates in FPMix and Stokes Most#283
Merged
alperaltuntas merged 23 commits intoSep 9, 2024
Merged
Conversation
* Simplify the nonlocal increments in vertFPMix; * Pass boundary layer depths to the RK2 and add consistency check to make sure FPMix is always used with SPLIT; * Add the capability to mix down the Eulerian gradient instead of the Lagrangian; * Make a minimum set of FPMix diagnostics available.
gustavo-marques
commented
Aug 7, 2024
|
|
||
| !> Compute Stokes Drift components at zbot < ztop <= 0 and at k=0.5*(ztop+zbot) and | ||
| !! average components from ztop to zbot <= 0 | ||
| subroutine Compute_StokesDrift(i ,j, ztop, zbot, uS_i, vS_i, uS_k, vS_k, uSbar, vSbar, waves) |
gustavo-marques
commented
Aug 7, 2024
Changed the empirical coefficient for non-local momentum mixing (Cemp_NL) from a hardcoded value to a user-defined parameter.
This is done for DIC, ALK, and related tracers. This mimics uptake and release of these tracers by sea ice.
* Modify NUOPC cap to accept separate glc runoff fluxes * (1/2) Add separate fluxes for glc runoff. (2/2) Add heat content fields for lrunoff_glc and frunoff_glc. * fix merge bugs and add more glc runoff diags * enable glc runoff flux only if use_glc_runoff is present * add ALLOW_GLC_RUNOFF_DIAGNOSTICS param to control whether to allow separate glacier runoff fluxes.
correct some indentation issues
MARBL: convert salt_flux to tracer flux and add to STF
Updated MAX_LAYER_THICKNESS to use longString for handling extended path+filename.
alperaltuntas
approved these changes
Sep 9, 2024
| dt_pred, G, GV, US, CS%vertvisc_CSp, CS%OBC) | ||
| call vertvisc(up, vp, h, forces, visc, dt_pred, CS%OBC, CS%ADp, CS%CDp, G, & | ||
| GV, US, CS%vertvisc_CSp, CS%taux_bot, CS%tauy_bot, waves=waves) | ||
| if (ASSOCIATED(CS%KPP_CSp)) call KPP_get_BLD(CS%KPP_CSp, hbl, G, US, m_to_BLD_units=GV%m_to_H) |
| "If true, add non-local momentum flux increments and diffuse down the Eulerian gradient.", & | ||
| default=.false.) | ||
| if (CS%fpmix) then | ||
| call get_param(param_file, "MOM", "CEMP_NL", CS%Cemp_NL, & |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR revises the formulation of the legacy K-profile parameterization (KPP) ocean boundary layer scheme. It incorporates:
FPMIX); when the local shear is not aligned with the wind, this scheme adds a non-local momentum flux in the direction of the wind; andSTOKES_MOST). This option provides the transition from waveless to ocean surface waves in any stage of growth or decay.Summary:
vertFPMix;CVmix_kpp_compute_unresolved_shear, passes the 2D surface buoyancy flux (surfBuoyFlux2) instead of the 1D version (surfBuoyFlux), which is preferable. This is answer changing;uoldandvolddiagnostics. These were used in an alternative time-stepping scheme that is now obsolete;FPMixis always used withSPLIT;FPMixdiagnostics available.This PR relies on CVMix/CVMix-src#94.
New diagnostics: