Update ctsm5.2 branch to ctsm5.1.dev176 and some small updates #2464
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…streams (dmleung 12 Mar 2023)
…st emission (dmleung 20 Mar 2023)
…he global tuning factor. We will keep the global tuning factor in CAM. dmleung 5 Apr 2023
Rework handling of evaporation constraint in SoilFluxes Occasionally, h2osoi_ice was going significantly negative in UpdateState_TopLayerFluxes - see ESCOMP#1979. As noted in that issue, this seems to be due to h2osoi_ice having a very different magnitude from h2osoi_liq, leading to greater-than-roundoff-level differences from zero final state in a relative sense (i.e., relative to the magnitude of h2osoi_ice) - I think because of the appearance of the sum (h2osoi_ice + h2osoi_liq) in the equations that limit fluxes. To try to deal with this, I have reworked the handling of the evaporation constraint to directly limit both the liqevap and solidevap, so that both of them should result in the equivalent liq or ice states going to 0 within roundoff. To do that, I needed to move the partitioning of the total flux into liquid and solid to earlier in the subroutine and then recalculate those partitioning fluxes in conditions where we're applying an evaporation constraint. Note that I applied a max of 0 to the new fluxes because many initial conditions files have roundoff-level negative H2OSOI_LIQ, so without this limit, we were getting roundoff-level negative fluxes. Resolves ESCOMP#1979
… gets to the soil eroditability file
…s and add tests for it that currently fail
…ure lnd_tuning_mode has all of the clm physics options paired with all of the forcing types, build-namelist tests now pass
BFB merge tag dev166 2315 @TeaganKing Refactoring run_neon for PLUMBER2 part1 2326 @samsrabin run_sys_tests: Check Python environment for FatesColdTwoStream tests 2213 @samsrabin Automatically assign high priority items to project 25 2330 @samsrabin Add Izumi version of the aux_clm unit testing Conflicts: bld/namelist_files/namelist_defaults_ctsm.xml bld/namelist_files/namelist_definition_ctsm.xml bld/unit_testers/build-namelist_test.pl cime_config/config_component.xml
…for the Zender scheme how the soil eroditability file is handled
…modes for CAM4 and CAM5
…gic for it, this compilers, but does NOT run
…1_Mmpi-serial.1x1_brazil.I2000Clm51SpRs.derecho_gnu.clm-clm51cam6LndTuningMode PASSes
…M4, CAM5, CAM6 cases
… a version for each lnd_tuning_mode, and for CAM4 cases for the f09 grid
…ase for simplicity, suggested by @slevis-lmwg
Update namelist with needed cam4.0, cam5.0, and clm6_0 changes so that the namelist tester works and compares as expected to the previous version.
for ctsm_sci tests with the updated default PE layouts we have in place.
|
I messed up something in the merge of the namelist defaults file. So I'm going through and figuring out what I did wrong. |
Make sure CAM4/CAM5 options are including in the mapping in buildnml for LND_TUNING_MODE. Right now they are just warning about what the tuning is based on.
…odev176 Conflicts: cime_config/buildnml
…cript doesn't exist
… NEON server or file length issues
…t and needs to update to Clm60
|
Testing for the following test lists are all as expected:
On izumi I had a few tests that fail because of an issue I'm having with conda: ERS_D_Ld30.f45_f45_mg37.I2000Clm50FatesCruRsGs.izumi_nag.clm-FatesColdLandUse Note, also some NEON tests failed for me because of long filenames, because my testname is long. Other's aren't having these problems though, so I'm moving this forward with those two small glitches. |
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Update the ctsm5.2 branch to ctsm5.1.dev176 and bring in some small updates. Copy initdata_map datasets to initdata_esmf/ctsm5.2. Copy ctsm51 parameter file to ctsm60. Change output jobscripts to include a .sh extension.
Use default PE layouts rather than assigned ones for ctsm_sci tests for odd grids.
Specific notes
Contributors other than yourself, if any: @slevis-lmwg
CTSM Issues Fixed (include github issue #):
Fixes #2149
Deals with a few things in #2446
Are answers expected to change (and if so in what way)? No
Any User Interface Changes (namelist or namelist defaults changes)?
New ctsm5.2 finidat files moved to the lnd/clm2/initdata_esmf/ctsm5.2 diretory
ctsm6.0 parameter file copied from the ctsm5.1 one
ctsm5.1.dev175 to ctsm5.1.dev176 update brings in dust-emiss datasets and LND_TUNING_MODE updates
Testing performed, if any:
python Derecho PASS
build_namelist tester PASS
aux_clm -- Derecho OK
aux_clm -- Izumi OK
ctsm_sci -- Derecho OK
mosart -- Derecho OK
rtm -- Derecho PASS