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

Merge b4bdev 20241220 #2917

Merged
merged 24 commits into from
Dec 30, 2024
Merged

Conversation

slevis-lmwg
Copy link
Contributor

@slevis-lmwg slevis-lmwg commented Dec 20, 2024

For details, see the ChangeLog for tag ctsm5.3.017.

For reference, this resolves #2869.

wwieder and others added 18 commits March 18, 2024 06:26
…nd update ctsm60 file so that it is based on the previous one with the nfix fields just added to the end
Merge b4b-dev

Bring in latest b4b-dev branch to main CTSM development.

- Update git-fleximod
- Fix equation number in tech note
- Implement urbanl and urbanc coszen filters
- Make ALBGRD and ALBGRI active by default
- Some adjustments to control pylint for the RXCROPMATURITY python tests
- Run_sys_tests: Print test list in --verbose/--debug.
Update temperature cost function for symbiotic Nfix in FUN
iRpointer files for restart now have the simulation timestamp in the filename

Add the simulation timestamp to the rpointer files. Also update submodules with this change
in CMEPS and CDEPS as well as updated cime to handle it. See the notes below for an explaination
about this.

Add a "clm" level directory under usermods_dirs so that the component where user-mods reside
is declared and to make them function the same as test-mods.
@slevis-lmwg slevis-lmwg self-assigned this Dec 20, 2024
@slevis-lmwg slevis-lmwg added the bfb bit-for-bit label Dec 20, 2024
@slevis-lmwg slevis-lmwg changed the base branch from b4b-dev to tmp-241219 December 20, 2024 19:32
@slevis-lmwg
Copy link
Contributor Author

I saw Joseph's message that izumi had been restored to service, so I submitted aux_clm this morning. It seemed as though tests were going to work, but a large number "failed to initialize" in the SHAREDLIB_BUILD phase. I tried resubmitting three of these, and I get "Read-only file system" errors.

I will try again on Monday. If I see the same behavior, I will return to the original plan of merging this PR without izumi testing.

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 like that this has a nice namelist control from the user perspective with the author's name attached. Although in other cases we don't use just the name -- but also the year for the reference paper. That enables different years for the same author to apply when/if that's needed. And it also makes it easy to figure out what the reference paper is.

The most important problem here is that there isn't a test for Tom's scheme here, and minimally we should make sure we have a test for both options.

I'm also glad that the basic change is nicely captured in it's own function. This can allow unit or funcitonal testing for it.

I didn't catch this when it came to b4b-dev, but there are changes I'd like to see, in terms of modularity for making things as local as possible

As such I suggest a bunch of changes, that I do think are worth doing. However, if there is a tag needed for simulations with this, I realized the changes I suggest could be done later, and they are all things that could go on b4b-dev later.

bld/CLMBuildNamelist.pm Outdated Show resolved Hide resolved
bld/namelist_files/namelist_defaults_ctsm.xml Outdated Show resolved Hide resolved
src/biogeochem/CNFUNMod.F90 Outdated Show resolved Hide resolved
src/main/pftconMod.F90 Outdated Show resolved Hide resolved
src/main/clm_varctl.F90 Outdated Show resolved Hide resolved
src/biogeochem/CNFUNMod.F90 Show resolved Hide resolved
src/biogeochem/CNFUNMod.F90 Show resolved Hide resolved
src/biogeochem/CNFUNMod.F90 Show resolved Hide resolved
@slevis-lmwg
Copy link
Contributor Author

I am getting new errors on izumi today, rather than the error that I reported yesterday. I have submitted aux_clm again to see what happens. Meanwhile Ithough I will move on with this merge, because I get the sense that izumi is unreliable.

@slevis-lmwg
Copy link
Contributor Author

Submitting aux_clm after the code revisions.

@slevis-lmwg
Copy link
Contributor Author

slevis-lmwg commented Dec 24, 2024

aux_clm

  • on derecho OK same results as before
  • on izumi NOT OK but this computer seems to have serious problems; e.g. all 13 gnu tests:
    FAIL ERS_Ld1200_Mmpi-serial.1x1_numaIA.I2000Clm50BgcCropQianRs.izumi_gnu.clm-cropMonthlyNoinitial GENERATE exception
    FAIL ERS_Ld600_Mmpi-serial.1x1_smallvilleIA.I1850Clm50BgcCrop.izumi_gnu.clm-cropMonthlyNoinitial GENERATE exception
    FAIL ERS_Ly3_Mmpi-serial.1x1_smallvilleIA.IHistClm50BgcCropQianRs.izumi_gnu.clm-cropMonthOutput GENERATE exception
    FAIL ERS_Ly5_Mmpi-serial.1x1_smallvilleIA.I1850Clm50BgcCrop.izumi_gnu.clm-ciso_monthly--clm-matrixcnOn GENERATE exception
    FAIL ERS_Ly5_Mmpi-serial.1x1_smallvilleIA.I1850Clm50BgcCrop.izumi_gnu.clm-ciso_monthly GENERATE exception
    FAIL SMS_D.f10_f10_mg37.I2000Clm60BgcCrop.izumi_gnu.clm-crop GENERATE exception
    FAIL SMS_D_Ld1_Mmpi-serial.f45_f45_mg37.I2000Clm50SpRs.izumi_gnu.clm-ptsRLA GENERATE exception
    FAIL SMS_D_Ld1_Mmpi-serial.f45_f45_mg37.I2000Clm50SpRs.izumi_gnu.clm-ptsROA GENERATE exception
    FAIL SMS.f10_f10_mg37.I2000Clm50BgcCrop.izumi_gnu.clm-crop GENERATE exception
    FAIL SMS_Ld5_Mmpi-serial.1x1_brazil.IHistClm60Bgc.izumi_gnu.clm-mimics GENERATE exception
    FAIL SMS_Ln9.f10_f10_mg37.I1850Clm45Bgc.izumi_gnu.clm-clm45cam4LndTuningModeZDustSoilErod GENERATE exception
    FAIL SMS_Ly3_Mmpi-serial.1x1_numaIA.I2000Clm50BgcDvCropQianRs.izumi_gnu.clm-ignor_warn_cropMonthOutputColdStart GENERATE exception
    FAIL SMS_Ly5_Mmpi-serial.1x1_smallvilleIA.IHistClm60BgcCropQianRs.izumi_gnu.clm-gregorian_cropMonthOutput GENERATE exception

Similarly with most nag and intel tests, plus a few tests say "SHAREDLIB_BUILD failed to initialize"

UPDATE: I think the "GENERATE exception" tests arise from lack of disk space on /fs/cgd/csm and we have ended up without a new baseline. In any case, izumi feels like an unnecessary time sink right now...

@slevis-lmwg slevis-lmwg merged commit 6cf9dde into ESCOMP:tmp-241219 Dec 30, 2024
2 checks passed
@slevis-lmwg slevis-lmwg deleted the merge-b4bdev-20241220 branch December 30, 2024 19:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bfb bit-for-bit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants