User/bgr/fix buoy flux merged #548
Merged
Conversation
This file contains 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
- Previously applyboundaryfluxesinout and extractbuoyancyflux2d both called extractfluxes1d. The second call was to get the surface buoyancy flux for ePBL and ignored calving/river contributions to the heat flux. This caused a diagnostic of the net heat flux to incorrectly also ignore these terms, corrupting this diagnostic. - This fix adds optional output of surface buoyancy flux to applyboundaryfluxesinout, therefore, no additional subroutine calls needed to get surface buoyancy flux for ePBL. - To avoid any change of answers this step required adding '_rate' outputs of netheat, netsalt, netmassinout, and pen_sw to extractfluxes1d. The net_heat_rate ignores calving and river contributions because the previous version ignored these terms. By adding the '_rate' outputs (w/ dt=1) we can preserve the old answers completely (avoiding a roundoff error), though this is less important of a point than ignoring the calving/river contributions to the heat flux. - A lengthy comment is added to diabatic_aux to detail the change and describe potential for simplifying (which would change answers). In principle all the '_rate' terms that are added here can be eliminated without compromising the mathematics, but we must confirm if we wish to include the calving/river contributions in the buoyancy flux used by ePBL. Otherwise, a second net_heat term is needed that is hard-coded to ignore calving/river contributions when computing the buoyancy flux used by ePBL.
- Fixed conflicts in MOM_forcing_type.F90 and MOM_diabatic_driver.F90 - Cleaned up comments
nikizadehgfdl
pushed a commit
to nikizadehgfdl/MOM6
that referenced
this pull request
Oct 9, 2017
- Round-off changes due to symmetry-dix in bracketing. - Changes answers for many experiments. - NOAA-GFDL/MOM@cec7499 Merge branch 'nicjhan-531-transform-bracketing-fix' into dev/gfdl - NOAA-GFDL/MOM@e2cdbb3 Merge branch '531-transform-bracketing-fix' of https://github.com/nicjhan/MOM6 into nicjhan-531-transform-bracketing-fix - NOAA-GFDL/MOM@c8d3ac0 Merge pull request mom-ocean#549 from Hallberg-NOAA/dev/gfdl - NOAA-GFDL/MOM@e344fb9 Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6 into dev/gfdl - NOAA-GFDL/MOM@ea1a338 Merge pull request mom-ocean#548 from breichl/user/bgr/Fix_BuoyFlux_merged - NOAA-GFDL/MOM@0f5a5ed (*)close_param_file always closes the input files - NOAA-GFDL/MOM@da325d6 Merge pull request mom-ocean#547 from CarolineCardinale/dev/gfdl - NOAA-GFDL/MOM@7756722 Merge pull request mom-ocean#546 from Hallberg-NOAA/dev/gfdl - NOAA-GFDL/MOM@8a5704d Add missing comment to MOM_forcing_type.F90 - NOAA-GFDL/MOM@1bdfa54 Merge branch 'dev/gfdl' into user/bgr/Fix_BuoyFlux_merged - NOAA-GFDL/MOM@94c1735 Added Doxygen Comments - NOAA-GFDL/MOM@0357baa (*)Convert GV%Angstrom to units of H - NOAA-GFDL/MOM@c0e00a4 Added chksum calls for h_u and h_v in btcalc - NOAA-GFDL/MOM@d4999e3 Corrected the chksum scaling for pbce - NOAA-GFDL/MOM@3d1d9c0 Merge branch 'user/bgr/BuoyFluxFix' into user/bgr/Fix_BuoyFlux_merged - NOAA-GFDL/MOM@eaefd55 Remove apostrophe from comments in MOM_forcing_type.F90 - NOAA-GFDL/MOM@7c0b9a2 Adding code changes that are part of previous commit. - NOAA-GFDL/MOM@9bd84c2 Code fix to remove 2nd call to extractfluxes1d when using ePBL. - NOAA-GFDL/MOM@10e5fc2 Bracketing fix for transform test. Changes answers.
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.
Expands on commit #544 as motivated by #543
In MOM_forcing_type.F90:
In MOM_diabatic_aux.F90:
In MOM_diabatic_driver.F90:
@StephenGriffies has confirmed these changes correct the issue reported as NOAA-GFDL/MOM6-examples#128 (hdfs diagnostic broken).
This commit does not change answers, but similar to #544, this is not a permanent fix as the code could be simplified to remove '_rate' terms (will introduce round-off answer changes) and a more permanent solution for useRiverHeatContent and useCalvingHeatContent. These points are described within code comments.