Allow virtual flux correction based on ocean salt restoring/correction #35
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 implements changes that allow
stf
adjustments based on any salt restoring/correction applied by the ocean model. There are two changes in this PR:generic_tracer::generic_tracer_update_from_coupler
routine has been added. This receives the salt flux restoring/correction applied by the ocean and passes it on to the generic tracer'supdate_from_coupler
routine.flux_virtual
has been added to thegeneric_tracer_utils::g_tracer_add
routine. If true, this ensures that thestf
field is allocated on the tracer being added.Unfortunately, changes are needed to the calling ocean model in order to utilize the changes in this PR:
generic_tracer::generic_tracer_coupler_get
is replaced by a call togeneric_tracer::generic_tracer_coupler_accumulate
and thengeneric_tracer::generic_tracer_update_from_coupler
is called as part ofocean_sbc_mod::flux_adjust
. See here for the changes.generic_tracer::generic_tracer_update_from_coupler
is called inMOM_generic_tracer::MOM_generic_tracer_column_physics
. See here for the changes.Merging this PR but not changing the ocean model will mean no change from current behaviour.
Closes #32