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.
@sjboeing I've created a branch which contains MOSRS trunk r9356 rebased onto our master https://github.com/leifdenby/monc/tree/trunk_r9356. I've resolved the merge conflicts for
model_core/src/components/monc_component.F90
andmodel_core/src/components/registry.F90
(they were just whitespace differences), but I've left the one formodel_core/src/grid/interpolation.F90
.From what I can see the interpolation routine has been updated on MOSRS to handle pressure coordinates, but I'm not sure if the fix you made for the interpolation routine (for the indexing) would work with those changes. So I've left that one for you - which means the continuous integration tests will fail of course.
Let me know if any of this doesn't make sense 😄