Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add BLOM specific settings #6

Merged
merged 75 commits into from
May 26, 2023

Conversation

mvertens
Copy link
Collaborator

@mvertens mvertens commented May 25, 2023

Description of changes

BLOM specific settings have been added to config_component_cesm.xml

Specific notes

In addition the code has been updated to cmeps0.14.32 - which contained several bug fixes.
Had to back off from making the xgrid the default - since this caused an ESMF error in generating the second order conservative mapping (see #7)

Contributors other than yourself, if any: None

CMEPS Issues Fixed: None

Are changes expected to change answers? No

Any User Interface Changes (namelist or namelist defaults changes)?

Testing performed

Ran the following case on betzy
--compset 2000_CAM60_CLM50%SP_CICE_BLOM_MOSART_SGLC_WW3DEV_SESP --res f19_tn14_wtn14

phall-brown and others added 30 commits April 12, 2023 14:31
jedwards4b and others added 26 commits May 10, 2023 13:44
update the minimum esmf version requirement
make history_n integer variables
add new optional mapping of taux and tauy from ocean to wave
make xgrid default and fix sw flux to mom ocn
@mvertens mvertens requested a review from gold2718 May 25, 2023 17:49
Copy link
Collaborator

@gold2718 gold2718 left a comment

Choose a reason for hiding this comment

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

One suggestion.
I did not look at the Fortran files since they were just updates from CESM.

)
else:
expect(int(minor) >= 1, "ESMF version should be 8.1.0 or newer")
expect(int(major) >= 8 and int(minor) >=4, "ESMF version should be 8.4.1 or newer")
Copy link
Collaborator

Choose a reason for hiding this comment

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

This logic only works for int(major) == 8. EMF 9.1 or 9.3 would fail. I would prefer:

Suggested change
expect(int(major) >= 8 and int(minor) >=4, "ESMF version should be 8.4.1 or newer")
expect(int(major) >= 8, "ESMF version should be 8.4.1 or newer")
expect(int(major) > 8 or int(minor) >=4, "ESMF version should be 8.4.1 or newer")

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@gold2718 - the above did not work for ESMF 8.4.1 - so I'm happy to look at this later - but I'd like to get this PR merged.

@mvertens mvertens merged commit 4140d54 into NorESMhub:noresm May 26, 2023
@mvertens mvertens deleted the feature/add_blom_settings branch June 16, 2023 08:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants