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 option for CRUJRA2024 add some compsets for Clm60 for it as well as a corresponding compset for Clm5 #2956

Open
wants to merge 39 commits into
base: master
Choose a base branch
from

Conversation

slevis-lmwg
Copy link
Contributor

@slevis-lmwg slevis-lmwg commented Feb 6, 2025

Description of changes

Change the default datm input from GSWP3v1 to CRUJRA2024 for Clm6.
Add a CRUJRA2024 compset for clm5.

See #1895 for definition of DONE.

Specific notes

Contributors other than yourself (I hope I didn't forget any):
@wwieder @adrifoster @swensosc @djk2120 @ekluzek @olyson

CTSM Issues Fixed (include github issue #):
Resolves #1895

Are answers expected to change (and if so in what way)?
No. We will make a separate answer-changing PR to address Clm6 tests that do not specify the datm input, so that they get CRUJRA2024 instead of GSWP3v1.

Any User Interface Changes (namelist or namelist defaults changes)?
Adding Crujra to compset names.
Adding 2 new tests that explicitly include Crujra in their compset names.
Clm60 tests that do not include a datm option in their compset will default to Crujra in a later PR.

Does this create a need to change or add documentation? Did you do so?
It does, and I did not, yet.

Testing performed, if any:
See relevant posts below.

@slevis-lmwg slevis-lmwg self-assigned this Feb 6, 2025
@slevis-lmwg slevis-lmwg added enhancement new capability or improved behavior of existing capability priority: high High priority to fix/merge soon, e.g., because it is a problem in important configurations usability Improve or clarify user-facing options PR status: needs testing non-bfb Changes answers (incl. adding tests) labels Feb 6, 2025
@slevis-lmwg slevis-lmwg added this to the ctsm5.4.0: CMIP7 Datasets milestone Feb 6, 2025
@slevis-lmwg
Copy link
Contributor Author

First attempt at testing:
./create_test ERP_P128x2_Ld30.f45_f45_mg37.I2000Clm60FatesSpCrujraRsGs.derecho_intel.clm-FatesColdSatPhen

@slevis-lmwg
Copy link
Contributor Author

slevis-lmwg commented Feb 7, 2025

Second set of tests on derecho:

OK make black & lint (the latter gives two warnings)
PASS python
PASS ./build-namelist_test.pl
OK ./run_sys_tests -s aux_clm -c ctsm5.3.021 --skip-generate
OK? ./run_sys_tests -s aux_cdeps -c /glade/campaign/cesm/cesmdata/cseg/cesm_baselines/cdeps1.0.55 --skip-generate

Checked the last two suites with these commands:

./cs.status.fails | grep -v PASS | grep -v NLCOM | grep -v '21: DIF'
./cs.status.fails | grep -v NLCOMP

In aux_cdeps, this test fails here but also in vanilla ctsm5.3.021:

SMS_D_Ld3.f10_f10_ais8gris4_mg37.DATAMODELTEST.derecho_gnu
ERROR: Invalid compset name, DATAMODELTEST, all stub components generated

@slevis-lmwg
Copy link
Contributor Author

3rd round to test the "clm5" changes

PASS ./build-namelist_test.pl
PASS ./create_test ERP_P128x2_Ld30.f45_f45_mg37.I1850Clm50BgcCropCrujra.derecho_intel.clm-default

@slevis-lmwg
Copy link
Contributor Author

slevis-lmwg commented Feb 8, 2025

TODOs

  • @wwieder suggests making t232 the default grid with the introduction of the CRUJRA compsets in this PR if it's "dead simple"):
    Erik suggests we use t232 just for the new CRUJRA compset tests for now, because we don't have all the grid aliases for the grids we need for CTSM testing; @slevis-lmwg checked the testlist, and we already have 10 ne30pg3_t232 tests, which may cover our needs, and I will confirm with Erik
  • Go over with @ekluzek
  • Update to latest on master here and in cdeps
  • Submit tests

@ekluzek ekluzek changed the title Make CRUJRA2024 the default datm input for Clm6 plus add a corresponding compset for Clm5 Add option for CRUJRA2024 add some compsets for Clm60 for it as well as a corresponding compset for Clm5 Feb 11, 2025
Copy link
Collaborator

@ekluzek ekluzek left a comment

Choose a reason for hiding this comment

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

@slevis-lmwg and I met and we went over the things to do and there's a conversation for them.

Since, we aren't doing the answer changing part here -- this could be put onto b4b-dev. What do you think about that @slevis-lmwg?

@slevis-lmwg slevis-lmwg marked this pull request as ready for review March 10, 2025 16:23
@slevis-lmwg
Copy link
Contributor Author

About the last commit:
I already see a cdeps1.0.69 tag with diffs that probably do not matter much, but I suspect that I would need to rerun all testing if we decided to update to this latest cdeps tag.

@slevis-lmwg
Copy link
Contributor Author

slevis-lmwg commented Mar 10, 2025

From meeting with @ekluzek

  • mesh file needs time stamp, which requires new cdeps PR; change the name to:
    mesh_0.5x0.5_CRUJRAv2.5mask_cdf5_c20240916.nc
  • while fixing that, remove /inputs directory from path to the CRUJRA data in datm/cime_config/stream_definition_datm.xml
  • in ctsm test_list, bring back the original default tests that will ensure b4b
  • change clm5 to clm6 in CRUJRA SSP tests
  • make compsets compatible with above updates
  • rerun all tests that I ran before
  • update .gitmodules to cdeps1.0.70 (if/when JimE makes a new tag with my PR)

@slevis-lmwg
Copy link
Contributor Author

slevis-lmwg commented Mar 11, 2025

derecho testing

PASS black, lint, python, build-namelist_test.pl
OK ./run_sys_tests -s aux_cdeps -c /glade/campaign/cesm/cesmdata/cseg/cesm_baselines/cdeps1.0.68 -g /glade/campaign/cesm/cesmdata/cseg/cesm_baselines/cdeps1.0.70
OK ./run_sys_tests -s aux_clm -c ctsm5.3.030 -g ctsm5.3.031
OK ./run_sys_tests -s ctsm_sci -c ctsm_sci-ctsm5.3.021 -g ctsm_sci-ctsm5.3.031

izumi testing
OK ./run_sys_tests -s aux_clm -c ctsm5.3.030 -g ctsm5.3.031

  • ./rimport-ed the data again
  • copied from /project/tss to /inputdata and submitted:
    PASS ./create_test SMS_D_Mmpi-serial_Ld5.5x5_amazon.I2000Clm60FatesCrujraRs.izumi_nag.clm-FatesCold -c /fs/cgd/csm/ccsm_baselines/ctsm5.3.030 -g /fs/cgd/csm/ccsm_baselines/ctsm5.3.031
    TURNS OUT IT'S LOOKING FOR THE mesh in /inputdata and the rest in /project/tss. I have confirmed the same about tests that use GSWP3, so this seems fine.
  • chmod a+r -R ctsm5.3.031

@slevis-lmwg
Copy link
Contributor Author

@ekluzek this is ready once again for your review.

@slevis-lmwg slevis-lmwg requested a review from ekluzek March 12, 2025 16:03
@slevis-lmwg slevis-lmwg mentioned this pull request Mar 12, 2025
Copy link
Collaborator

@ekluzek ekluzek left a comment

Choose a reason for hiding this comment

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

I request some changes. But, they are easy. I was thinking we needed to do more in a particular area, but was able to back away from that.

@slevis-lmwg
Copy link
Contributor Author

slevis-lmwg commented Mar 14, 2025

tests

derecho

PASS python, black, lint, build-namelist_test.pl
OK ./run_sys_tests -s aux_cdeps -c /glade/campaign/cesm/cesmdata/cseg/cesm_baselines/cdeps1.0.70 --skip-generate
OK ./run_sys_tests -s ctsm_sci -c ctsm_sci-ctsm5.3.021 -g ctsm_sci-ctsm5.3.032
OK ./run_sys_tests -s aux_clm -c ctsm5.3.031 -g ctsm5.3.032

izumi
OK ./run_sys_tests -s aux_clm -c ctsm5.3.031 -g ctsm5.3.032

@slevis-lmwg
Copy link
Contributor Author

Tests are in progress again.
@ekluzek pls check whether you find this PR approvable this time around.

@slevis-lmwg slevis-lmwg requested a review from ekluzek March 14, 2025 18:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bfb bit-for-bit enhancement new capability or improved behavior of existing capability PR status: needs testing priority: high High priority to fix/merge soon, e.g., because it is a problem in important configurations usability Improve or clarify user-facing options
Projects
Development

Successfully merging this pull request may close these issues.

ctsm5.3.032: Add CRU-JRA as option for datm inputs for CTSM development
3 participants