Fix issue with Ocean TerminateImport in Surf #789
Merged
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.
Runs of the MAPL3 development code triggered a fault due to changes in #772 see:
Now, for reason as yet unknown (though @bena-nasa is investigating) MAPL2 doesn't seem to mind this, but MAPL3 does. However, I believe this is an issue with develop as well.
To wit, in
GEOS_GcmGridComp.F90
we have:and in
GEOS_OgcmGridComp.F90
In both cases the
SURFSTATE
code is protected with an if-block forDO_CICE_THERMO==2
. But inGEOS_SurfaceGridComp.F90
we have:which seems to cause some issues when running in the plain
DO_CICE_THERMO=0
way.So my proposal is we only do the TerminateImport with
SURFSTATE
mentioned if we are runningDO_CICE_THERMO=2
and if not, we use the "old" TerminateImport code which (I think?) terminates all of Ocean.Since #772 was @zhaobin74 's code, I'll explicitly add him here. I think this is safe, but I want his blessing.