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 choice in GEOSldas #707

Merged
merged 2 commits into from
Feb 15, 2024

Conversation

gmao-jkolassa
Copy link
Contributor

This PR disables the option of running the Catchment-CN4.5 land model (LSM_CHOICE=3) for GEOSldas. The experiment configuration file (exeinp) no longer includes Catchment-CN4.5 or its associated parameter set as an option. When a user runs ldas_setup with LSM_CHOICE=3, they will get the following error message:

LSM_CHOICE=3 (Catchment-CN4.5) is no longer supported. Please set LSM_CHOICE to 1 (Catchment) or 2 (Catchment-CN4.0

This PR is connected to a PR in the GEOSgcm_GridComp repository that removes the CN_CLM45 parameter set from GEOS_SurfaceGridComp.rc (so it is no longer listed in the exeinp file).

This PR is zero-diff for all model configurations that do not use Catchment-CN4.5.

Notes:

  • In its current form, this PR only disables the Catchment-CN4.5 model option. Removal of the Catchment-CN4.5 source code, references to LSM_CHOICE=3 in other parts of the code, and updates to the history routines will be addressed in a future PR. @gmao-rreichle , please let me know if you would like any of the above changes to be included in this PR.
  • This PR only disables the Catchment-CN4.5 land model option for offline simulations. Equivalent changes to the gcm_setup are needed to also disable this land model option for coupled model simulations.

cc: @biljanaorescanin , @weiyuan-jiang

@gmao-jkolassa gmao-jkolassa self-assigned this Feb 13, 2024
@gmao-rreichle gmao-rreichle marked this pull request as ready for review February 15, 2024 00:06
@gmao-rreichle gmao-rreichle requested a review from a team as a code owner February 15, 2024 00:06
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.

I verified that the PR works as intended and will go ahead with the merg. @mathomp4: This will result in the failure of the CNCLM45 tests, which need to be removed from the list of automated GEOSldas nightly tests.

@gmao-rreichle gmao-rreichle merged commit 2a3b721 into develop Feb 15, 2024
7 checks passed
@gmao-rreichle gmao-rreichle deleted the feature/jkolassa_disable_cn45 branch February 15, 2024 00:10
gmao-rreichle added a commit that referenced this pull request Feb 15, 2024
biljanaorescanin added a commit that referenced this pull request Feb 15, 2024
Fix error in components.yaml of #707
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants