Skip to content

MOSRS trunk r9356#55

Draft
leifdenby wants to merge 7 commits intoLeeds-MONC:masterfrom
leifdenby:trunk_r9356
Draft

MOSRS trunk r9356#55
leifdenby wants to merge 7 commits intoLeeds-MONC:masterfrom
leifdenby:trunk_r9356

Conversation

@leifdenby
Copy link
Collaborator

@leifdenby leifdenby commented Jan 6, 2022

@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 and model_core/src/components/registry.F90 (they were just whitespace differences), but I've left the one for model_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 😄

adrianhill and others added 7 commits January 6, 2022 12:44
….x_part1_pkg@8145 cf. /main/trunk@7765

git-svn-id: https://code.metoffice.gov.uk/svn/monc/main/trunk@8146 0f676ef4-b20c-4647-9485-21614760d15f
      Permit unset options to be ignored by the configuration file parser.
      Allow case-insensitive handling of some string options.


git-svn-id: https://code.metoffice.gov.uk/svn/monc/main/trunk@8165 0f676ef4-b20c-4647-9485-21614760d15f
…solar_fixed=.true. by reading rad_interval from configuration in all cases where SOCRATES is enabled.

git-svn-id: https://code.metoffice.gov.uk/svn/monc/main/trunk@8166 0f676ef4-b20c-4647-9485-21614760d15f
…good

Merged into /main/trunk: /main/branches/dev/adrianhill/r8166_um_omp_test@8785 cf. /main/trunk@8166


git-svn-id: https://code.metoffice.gov.uk/svn/monc/main/trunk@8794 0f676ef4-b20c-4647-9485-21614760d15f
…See ticketsummary for #368 for details and testing

Merged into /main/trunk: /main/branches/dev/adrianhill/r8794_archer2_change@8797 cf. /main/trunk@8794


git-svn-id: https://code.metoffice.gov.uk/svn/monc/main/trunk@8917 0f676ef4-b20c-4647-9485-21614760d15f
Merged into /main/trunk: /main/branches/dev/adrianhill/r8917_monc_w_casim_vn0p5@9193 cf. /main/trunk@8917


git-svn-id: https://code.metoffice.gov.uk/svn/monc/main/trunk@9196 0f676ef4-b20c-4647-9485-21614760d15f
@leifdenby leifdenby changed the title Trunk r9356 MOSRS trunk r9356 Jan 6, 2022
@leifdenby leifdenby mentioned this pull request Jan 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

Comments