Skip to content

Update r-dist for SLES15#381

Open
rlucches wants to merge 10 commits intomainfrom
bugfix/dao_ops/SLES15_fix
Open

Update r-dist for SLES15#381
rlucches wants to merge 10 commits intomainfrom
bugfix/dao_ops/SLES15_fix

Conversation

@rlucches
Copy link

r_dist is used in post-processing utilities in the ops implementation of FP. The version in the tag still had a construct that worked under SLES-12, but fails under SLES-15. This has been fixed.

@rlucches rlucches requested review from a team as code owners May 29, 2025 18:28
@mathomp4
Copy link
Member

Hmmm. I don't think this is meant to go into GEOS-FP. You didn't change 1000 files.

From the git logs this seems to be based off of the g5.42.2 from @rtodling.

I think we need to do a couple things. First, @rtodling should tag off of this branch. But then this PR should go to main, so we get the changes into the mainline of GMAO_Shared development.

@mathomp4 mathomp4 changed the base branch from GEOS-FP to main May 29, 2025 19:30
@mathomp4 mathomp4 requested a review from a team as a code owner May 29, 2025 19:30
@mathomp4
Copy link
Member

mathomp4 commented May 29, 2025

I just changed the base to be to main. Now I see four commits:

https://github.com/GEOS-ESM/GMAO_Shared/pull/381/commits

two from @rtodling and two from @rlucches

@mathomp4 the problem w/ changing the base is that GEOSadas v5.42.7 is not on main!

@rlucches rlucches changed the title Bugfix/dao ops/sles15 fix Update r-dist for SLES15 May 30, 2025
@rlucches rlucches added 0-diff uncoupled 0 diff The changes in this pull request have verified to be zero-diff with the target branch. and removed 0-diff uncoupled labels May 30, 2025
@rlucches
Copy link
Author

I changed the name of this PR to something sensible. I have no idea how changes to hermes and transf ended up in this PR. I did not change anything there. The only change I made was to r_dist and perhaps the CHANGELOG. It looks like those other changes are from Ricardo, but I am not sure how they got lumped into #381.

@mathomp4
Copy link
Member

@rlucches The reason why the @rtodling changes are in this is because you started from g5.42.2 (which is what the ADAS was using). There are changes in that tag that are not yet in main here.

So, when you make a PR from your branch to main, it's all the changes not yet in main.

@mathomp4
Copy link
Member

mathomp4 commented Jun 4, 2025

Note to @rtodling: this didn't affect the GEOSgcm probably because we don't use these codes. So, if you are happy, you can press the Merge button.

sdrabenh
sdrabenh previously approved these changes Jun 25, 2025
@mathomp4
Copy link
Member

Not sure why CI is unhappy. I just pushed an update

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0 diff The changes in this pull request have verified to be zero-diff with the target branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants