Skip to content

Merge GEOMAR stuff finally into release#1456

Merged
mandresm merged 183 commits intoreleasefrom
geomar_prep_release
Mar 27, 2026
Merged

Merge GEOMAR stuff finally into release#1456
mandresm merged 183 commits intoreleasefrom
geomar_prep_release

Conversation

@seb-wahl
Copy link
Copy Markdown
Contributor

As requested by @mandresm this morning: The merge request.

seb-wahl and others added 30 commits December 10, 2024 12:17
compiles and starts, but misses (as expected) information in existing
JSBACH restart files. Cold start not yet implemented
links all currently known files correctly
running not yet tested as info from Shradda is still missing
draft version of ECHAM76-LMU that start up correctly
but still fails due to land sea mask mismatch
fixed restart setup in a hacky way (see foci.yaml)
added a new runscript for FOCIOIFS
This should be the only difference between geomar_dev and release that matters
allow different streams for restart and output for ECHAM and JSBACH
with FOCI-MOPS with the 12 tile edition
merge geomar dev into geomar branch
separate echam6 namlist templates for foci and foci_lmu
before merging this branch into geomar_dev
differences where too large for an efficient direct merge
@seb-wahl seb-wahl requested a review from mandresm March 23, 2026 11:43
@mandresm
Copy link
Copy Markdown
Contributor

Thanks a lot @seb-wahl

@mandresm
Copy link
Copy Markdown
Contributor

The review was done on #1443. This includes some of the changes there. Once this is merge that PR can also be closed.

Copy link
Copy Markdown
Contributor

@mandresm mandresm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good now :)

@mandresm
Copy link
Copy Markdown
Contributor

Waiting on this converstation to be resolved: #1443 (comment)

Then it's just a matter of bumping and merging. I'll have a look at it tomorrow on the train :)

@mandresm
Copy link
Copy Markdown
Contributor

#bump

@mandresm mandresm force-pushed the geomar_prep_release branch from a92a37a to ace5e4d Compare March 27, 2026 13:56
@mandresm
Copy link
Copy Markdown
Contributor

#bump #minor

@mandresm mandresm merged commit aba4bb5 into release Mar 27, 2026
1 check was pending
@mandresm mandresm deleted the geomar_prep_release branch March 27, 2026 13:59
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.

2 participants