Skip to content

Merge tag: Turn on meier2022 and bring in #2212 - #2323

Merged
slevis-lmwg merged 10 commits into
ESCOMP:masterfrom
slevis-lmwg:merge_tag_meier_and_pr2212
Jan 20, 2024
Merged

slevis-lmwg merged 10 commits into
ESCOMP:masterfrom
slevis-lmwg:merge_tag_meier_and_pr2212

Conversation

@slevis-lmwg

@slevis-lmwg slevis-lmwg commented Jan 17, 2024 •

Copy link
Copy Markdown
Contributor

Description of changes

Answer-changing merge-tag:

Specific notes

Contributors other than yourself, if any:
@olyson @samsrabin

CTSM Issues Fixed (include github issue #):
Fixes #2212

Are answers expected to change (and if so in what way)?
Yes, for ctsm5.1 cases by making Meier2022 on, tillage low, and residue removal 0.5 by default.
Yes, for clm45/clm50 by including the #2212 fix.

Any User Interface Changes (namelist or namelist defaults changes)?
Making Meier2022 the default for ctsm5.1 again.
Making tillage low by default for ctsm5.1.
Making residue removal 0.5 by default for ctsm5.1.

Testing performed, if any:

@slevis-lmwg

Copy link
Copy Markdown
Contributor Author

The first test-suite listed above fails in clm45/clm50 tests because the corresponding params files do not include the Meier2022 parameters. I'm pretty sure that we never intended to add the Meier2022 parameters to the clm45/clm50 params files because Meier2022 was intended for ctsm5.1. Since there are no issues of backwards compatibility, I think we have nothing to prove even if we could show that Meier2022 works with clm45/clm50 tests.

I propose not making temporary clm45/clm50 params files to test whether Meier2022 works with these models. I can bring this up for discussion at tomorrow's software meeting.

@slevis-lmwg

slevis-lmwg commented Jan 18, 2024 •

Copy link
Copy Markdown
Contributor Author

Group decisions (2024/1/18 software meeting)

  • Disallow Meier2022 for versions < ctsm51, since it’s something we’d need to scientifically test. Include a helpful error message. Do not allow getting around this with just --ignore-warnings.
  • Enable tillage “low” by default for ctsm51. Allow tillage for clm45/50 but leave it off by default (to recreate release version behavior).
  • Enable residue removal 0.5 by default for ctsm51. Allow it for clm45/50 but off by default (to recreate release version behavior).

@slevis-lmwg

Copy link
Copy Markdown
Contributor Author

@rgknox I'm preparing the next tag (dev165) and wanted to ask you about this test:
ERS_D_Ld15.f45_f45_mg37.I2000Clm50FatesRs.derecho_intel.clm-FatesColdTwoStream
returns a COMPARE_base_rest failure in both dev164 and dev165.
If you agree, I could label this an EXPECTED FAILURE.

@slevis-lmwg
slevis-lmwg requested a review from samsrabin January 18, 2024 22:22
@slevis-lmwg

Copy link
Copy Markdown
Contributor Author

@samsrabin this should be a 10-minute review to confirm that I haven't missed anything in this PR. Let me know if you prefer to meet and go over stuff together.

@slevis-lmwg

slevis-lmwg commented Jan 18, 2024 •

Copy link
Copy Markdown
Contributor Author

Test-suites
derecho OK
izumi OK

@samsrabin

Copy link
Copy Markdown
Member

The tillage and residue removal stuff look good to me!

@slevis-lmwg
slevis-lmwg marked this pull request as ready for review January 20, 2024 01:59
@slevis-lmwg
slevis-lmwg merged commit ff7c19d into ESCOMP:master Jan 20, 2024
@slevis-lmwg
slevis-lmwg deleted the merge_tag_meier_and_pr2212 branch January 20, 2024 02:00
@samsrabin samsrabin added bug something is working incorrectly science Enhancement to or bug impacting science enhancement new capability or improved behavior of existing capability labels Aug 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug something is working incorrectly enhancement new capability or improved behavior of existing capability science Enhancement to or bug impacting science

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants