Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
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 20240711 #2641

Merged
merged 13 commits into from
Jul 12, 2024
Merged

Conversation

slevis-lmwg
Copy link
Contributor

Description of changes

#2638 Remove use_dynroot and corresponding code and testing @slevis-lmwg
#2623 Change a NIWO test to HARV and update expected failures @slevis-lmwg
#2607 Fix py env create @wwieder

CTSM Issues Fixed (include github issue #):
Fixes #2451 Remove use_dynroot from clm codes and testing
Fixes #2563 Unable to install ctsm_pylib environment for mksurfdata_esmf in CTSM5.2.005

Are answers expected to change (and if so in what way)?
No

Testing performed, if any:
As documented in the ChangeLog.

wwieder and others added 13 commits June 20, 2024 14:25
…20240620

Merge b4bdev 20240620

Fix long names ESCOMP#2512
Dust emissions moved to Object Oriented design ESCOMP#2552
Fix RXCROPMATURITY test ESCOMP#2599

NB: This will be the first tag in branch tmp-240620 in a series of temporary tags while we wait for the completion of the beta01 cesm tag.
Merge branch_tags/tmp-240620.n01.ctsm5.2.007 into b4bdev
Change a NIWO test to HARV and update expected failures
Remove use_dynroot and corresponding code and testing
Explicit A/C adoption

Code changes for adding an explicit air-conditioning (AC) adoption parameterization scheme in CLMU. This includes adding a new time-varying input variable (AC adoption rate, p_ac), changes to building energy calculations, and a toggle (new namelist variable urban_explicit_ac).

In this tag we keep the change off by default in order to show that answers do not change.

Fixes ESCOMP#2254 Explicitly representing air-conditioning adoption in CESM.
@slevis-lmwg
Copy link
Contributor Author

aux_clm is in progress on derecho and izumi.

Could I get preemptive approval on this PR @samsrabin or @ekluzek (whoever gets to it first)?

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.

Looks good.

@slevis-lmwg
Copy link
Contributor Author

slevis-lmwg commented Jul 11, 2024

Just touching base:
@glemieux @ekluzek
aux_clm on derecho is still in progress, so I expect to wrap this up in the morning...

UPDATE: done, so proceeding with the merge.

@slevis-lmwg slevis-lmwg merged commit 025f11c into ESCOMP:master Jul 12, 2024
4 checks passed
@slevis-lmwg slevis-lmwg deleted the merge-b4bdev-20240711 branch July 12, 2024 15:41
@slevis-lmwg
Copy link
Contributor Author

@glemieux this merge is now done.
@ekluzek a reminder to pls add the last two tags ctsm5.2.010 and ctsm5.2.011 to the CESM test database.
Thank you!

@samsrabin samsrabin added simple easy for anyone to work on bfb bit-for-bit labels Aug 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bfb bit-for-bit simple easy for anyone to work on
Projects
None yet
4 participants