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

Fix long names for RH2M_R, AZSUN, and update nofates and fates history variable lists in User's Guide #2512

Merged
merged 4 commits into from
May 6, 2024

Conversation

olyson
Copy link
Contributor

@olyson olyson commented May 2, 2024

Description of changes

Fix the long names for history variables for RH2M_R and AZSUN. Update nofates and fates history variable lists in User's Guide.

Specific notes

Note that the nofates and fates history variable lists contain other updates than just RH2M_R and AZSUN, as it appears these haven't been updated recently. In particular, the updates to the fates list are substantial.

Contributors other than yourself, if any: @cathyxinchangli

CTSM Issues Fixed (include github issue #): Issues #2511 , #2506

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

Any User Interface Changes (namelist or namelist defaults changes)? No

Copy link
Collaborator

@samsrabin samsrabin 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, Keith. What sort of testing have you done? I'm pretty sure long_name changes shouldn't trigger diffs from baseline, but it'd be good to make sure.

@olyson
Copy link
Contributor Author

olyson commented May 2, 2024

clm_short testing is in progress. I was going to try to build the documentation but docker isn't working on my laptop and I need ISG help to install/update.

@olyson
Copy link
Contributor Author

olyson commented May 2, 2024

clm_short tests pass. Except for MEMCOMP tests which fail due to missing cpl-mem.log in ctsm5.1.001 baselines. I assume this is not a problem

@samsrabin
Copy link
Collaborator

Good that ctsm_short works! Looking back at the procedure, it does specify that the entire aux_clm suite should be run. However, I think that's probably overkill here—the only lines changed in the code are the long_name specifications.

@olyson
Copy link
Contributor Author

olyson commented May 2, 2024

I was going to perform the rest of the procedure, e.g., beginning with step 1, once I had the prerequisite completed which was to have an approved PR. My b4bdev branch is now behind since you just committed a new version. So I imagine I should do steps 1-6 now.

@samsrabin
Copy link
Collaborator

Ah okay good point! Carry on then :-)

@olyson
Copy link
Contributor Author

olyson commented May 2, 2024

If I understand the process correctly, I guess I should wait for PR #2514 to complete, which merges master back into b4b-dev.

@olyson
Copy link
Contributor Author

olyson commented May 3, 2024

Ok, steps 1-6 have been completed. aux_clm testing passes as expected. I don't have permissions to do step 7.

@ekluzek
Copy link
Collaborator

ekluzek commented May 3, 2024

@olyson I think you should be given those permissions. Are you good with me adding your capability to merge to b4b-dev?

@olyson
Copy link
Contributor Author

olyson commented May 3, 2024

Sure, thanks.

@ekluzek
Copy link
Collaborator

ekluzek commented May 3, 2024

@olyson I invited you to the ctsm-b4b-dev team. Did you get that invite? Once you accept you should be able to push the green merge button.

@olyson
Copy link
Contributor Author

olyson commented May 4, 2024

Hmm, I don't see the invite. I assume it comes via email.

@ekluzek
Copy link
Collaborator

ekluzek commented May 6, 2024

@olyson I checked and there was a permission issue I needed to fix. And you now are in the ctsm-b4bdev group (you must have accepted the email invite and maybe didn't notice).

So try again and hopefully it works now. It should also work for @TeaganKing now as well.

@TeaganKing
Copy link
Contributor

Ah, yes, I do see that I can merge PRs now.

@olyson olyson merged commit 8964b0b into ESCOMP:b4b-dev May 6, 2024
2 checks passed
@olyson
Copy link
Contributor Author

olyson commented May 6, 2024

Yes, thanks, just merged now.

slevis-lmwg added a commit to slevis-lmwg/ctsm that referenced this pull request Jun 21, 2024
…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.
ekluzek added a commit to ekluzek/CTSM that referenced this pull request Jun 21, 2024
…ximod

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.

 Conflicts:
	doc/ChangeLog
	doc/ChangeSum
@samsrabin samsrabin added simple 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants