Fixed indenting of MOM_offline_control.F90#374
Merged
Conversation
added 3 commits
October 24, 2016 15:14
…roft/MOM6 into origin/offline_tracers
…rigin/offline_tracers
iangrooms
pushed a commit
to iangrooms/MOM6
that referenced
this pull request
Aug 26, 2025
* Use prediabatic SST and SSS for MARBL surface flux The existing MARBL driver uses T & S from the end of the diabatic routine as inputs into surface_flux_compute() and interior_tendency_compute(). For surface_flux_compute(), there is a discrepancy because we have not yet called tracer_vertdiff for the MARBL tracers but have for T & S. To enforce consistency among all the tracers, we want to use the pre-vertdiff T&S quantities. There is a little bit of infrastructure change -- I added 3D fields for T & S at the beginning of the diabatic subroutine to the diabatic control structure (we will eventually want to call interior_tendency_compute() before tracer_vertdiff as well), and then had to add a routine to MOM_tracer_flow_control.F90 to extract use_MARBL_tracers from the tracer flow control structure. prediabatic_T and prediabatic_S are now optional arguments to call_tracer_column_fns(), but that function will abort if USE_MARBL_TRACERS is true and the arguments are not present because they are required in MARBL_tracers_column_physics() * Clean up comments Fix failing doxygen / style check texts. Also add a long comment to diabatic_ALE explaining why we use prediabatic_T and prediabatic_S (maybe the comment belongs in diabatic_init?) * Use prediabatic T & S for MARBL interior tendency Reordered MARBL_tracers_column_physics so that surface_flux_compute() and interior_tendency_compute() are both called before tracer_vertdiff. Now use prediabatic T & S for interior tendency computation, and also use h_old as dz. Note that this greatly increases the number of warnings from the co2calc routine, and we are not sure why. * Clean up following code review 1. removed spaces from "end if" to match style guide recommendations 2. cleaned up comment in extract_tracer_flow_member (refer to tracer_flow_control_CS rather than diabatic_CS) 3. Consistent capitalization of MARBL in use_MARBL_tracers (and use_MARBL) throughout the codebase
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
2 participants
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.
At the suggestion of @Hallberg-NOAA and to conform with MOM6 codestyle, the indenting has been changed so that subroutine declarations start flush left.