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

Disable Catchment-CN4.5 land model option (LSM_CHOICE=3) for GCM simulations #575

Merged
merged 3 commits into from
Feb 21, 2024

Conversation

gmao-jkolassa
Copy link
Contributor

@gmao-jkolassa gmao-jkolassa commented Feb 15, 2024

This PR disables the option for using the Catchment-CN4.5 land model (LSM_CHOICE=3) in GCM simulations. The PR also fixes a minor typo that was present in the error message displayed for invalid values of LSM_CHOICE.

This PR is zero-diff.

Related PRs:
GEOS-ESM/GEOSldas#707
GEOS-ESM/GEOSgcm_GridComp#900

cc: @gmao-rreichle , @biljanaorescanin

@gmao-jkolassa gmao-jkolassa added the 0 diff trivial The changes in this pull request are trivially zero-diff (documentation, build failure, &c.) label Feb 15, 2024
@gmao-jkolassa gmao-jkolassa self-assigned this Feb 15, 2024
@mathomp4
Copy link
Member

Note to @sshakoor1: this will probably need to be done in #544 as well. Though I suppose once this gets in, git would merge the change...

@gmao-rreichle gmao-rreichle changed the title Disable Catchment-CN4.5 land model option (LSM_CHOICE=3) for coupled model simulations Disable Catchment-CN4.5 land model option (LSM_CHOICE=3) for GCM simulations Feb 15, 2024
Copy link
Contributor

@gmao-rreichle gmao-rreichle left a comment

Choose a reason for hiding this comment

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

Thanks, Jana. Looks good to me. Has someone tried running gcm_setup after these mods? Just to make sure there's not an accidental syntax error in the revisions.

@gmao-jkolassa
Copy link
Contributor Author

Has someone tried running gcm_setup after these mods?

Yes, I ran gcm_setup with these modifications trying both LSM_CHOICE=2 and LSM_CHOICE=3 (which is no longer a valid choice). The only options for LSM_CHOICE that are displayed in the interactive script are 1 (Catchment) and 2 (Catchment-CN4.0). And trying to set LSM_CHOICE=3 (Catchment-CN4.5), triggers the error message (which is how I noticed the typo in the error message)

@gmao-rreichle
Copy link
Contributor

Yes, I ran gcm_setup with these modifications t

Thanks, @gmao-jkolassa. I'm marking this as "ready for review", @sdrabenh. Please let us know if you have any questions.

@gmao-rreichle gmao-rreichle marked this pull request as ready for review February 15, 2024 23:14
@gmao-rreichle gmao-rreichle requested a review from a team as a code owner February 15, 2024 23:14
@sdrabenh sdrabenh merged commit f4bc872 into develop Feb 21, 2024
4 of 6 checks passed
@sdrabenh sdrabenh deleted the feature/jkolassa_disable_cn45 branch February 21, 2024 14:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 diff trivial The changes in this pull request are trivially zero-diff (documentation, build failure, &c.)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants