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.

Sign up for GitHub

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

Jump to bottom

Update MAPL3 time averaging to use a pointwise counter #3189

Merged
merged 18 commits into from
Nov 22, 2024
Merged

Update MAPL3 time averaging to use a pointwise counter #3189

merged 18 commits into from
Nov 22, 2024

Conversation

darianboggs
Copy link
Contributor

Types of change(s)

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Trivial change (affects only documentation or cleanup)
  • Refactor (no functional changes, no api changes)

Checklist

  • Tested this change with a run of GEOSgcm
  • Ran the Unit Tests (make tests)

Description

Time Averaging in MAPL3 needs a counter for each grid point so that the counts can vary points to account for a variable number of updates to the accumulation field over the field.

@darianboggs darianboggs added 0 Diff The changes in this pull request have verified to be zero-diff with the target branch. 📈 MAPL3 MAPL 3 Related labels Nov 20, 2024
@darianboggs darianboggs self-assigned this Nov 20, 2024
@darianboggs
Copy link
Contributor Author

I missed a few commented out lines that should be deleted. Will delete in next push

tclune
tclune reviewed Nov 20, 2024
View reviewed changes
Copy link
Collaborator

@tclune tclune left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See inline comments. (I know this is draft.)

generic3g/actions/AccumulatorAction.F90 Outdated Show resolved Hide resolved
generic3g/actions/MeanAction.F90 Outdated Show resolved Hide resolved
@darianboggs darianboggs marked this pull request as ready for review November 20, 2024 21:37
@darianboggs darianboggs requested a review from a team as a code owner November 20, 2024 21:37
tclune
tclune requested changes Nov 22, 2024
View reviewed changes
Copy link
Collaborator

@tclune tclune left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comments inline.

@darianboggs
Copy link
Contributor Author

Changes to field/FieldPointerUtilities.F90:

  • Replace if block with select block.

Changes to generic3g/actions/AccumulatorAction.F90:

  • comments
  • blank lines
  • reorder (slight)

@darianboggs darianboggs requested a review from tclune November 22, 2024 17:47
@darianboggs
Merge branch 'feature/wdboggs/mapl3_time_averaging_update' of github.…
f3c3910 
…com:GEOS-ESM/MAPL into feature/wdboggs/mapl3_time_averaging_update
tclune
tclune requested changes Nov 22, 2024
View reviewed changes
Copy link
Collaborator

@tclune tclune left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One very small change.

@darianboggs
Copy link
Contributor Author

Merging despite the adas failures

@darianboggs darianboggs merged commit 96c97ee into release/MAPL-v3 Nov 22, 2024
35 of 37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tclune tclune tclune approved these changes

@atrayano atrayano Awaiting requested review from atrayano

Assignees

@darianboggs darianboggs

Labels
0 Diff The changes in this pull request have verified to be zero-diff with the target branch. 📈 MAPL3 MAPL 3 Related
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@darianboggs @tclune