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

fixes #2487 #2490

Merged
merged 2 commits into from
Dec 11, 2023
Merged

fixes #2487 #2490

merged 2 commits into from
Dec 11, 2023

Conversation

bena-nasa
Copy link
Collaborator

Fixes #2487
I think @metdyn was doing some work and committed a line he did not mean to which was resetting the current file every timestep which is should not.
This fixes it. I did confirm that the multi-step History as exercised by the SCM works once this is removed.

I didn't make this a hot fix because the offending code is not yet on main, so would not make sense to do a PR to main...

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Types of changes

  • 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)

Checklist:

  • I have tested this change with a run of GEOSgcm (if non-trivial)
  • I have added one of the required labels (0 diff, 0 diff trivial, 0 diff structural, non 0-diff)
  • I have updated the CHANGELOG.md accordingly following the style of Keep a Changelog

@bena-nasa bena-nasa requested a review from a team as a code owner December 11, 2023 17:09
@tclune
Copy link
Collaborator

tclune commented Dec 11, 2023

This is a hotfix. Might be better to apply to main?

@metdyn
Copy link
Contributor

metdyn commented Dec 11, 2023 •
edited
Loading

This is a hotfix. Might be better to apply to main?

Like Ben said, the erroneous line does not exist in the main branch. This PR solves some of my puzzling on the output file names.

@mathomp4 mathomp4 added the 0 Diff The changes in this pull request have verified to be zero-diff with the target branch. label Dec 11, 2023
@bena-nasa bena-nasa added the 0 Diff Trivial The changes in this pull request are trivially zero-diff (documentation, build failure, &c.) label Dec 11, 2023
@mathomp4 mathomp4 merged commit 22c1714 into develop Dec 11, 2023
30 of 33 checks passed
@mathomp4 mathomp4 deleted the feature/bmauer/fixes-#2487 branch December 11, 2023 19:52
@tclune
Copy link
Collaborator

tclune commented Dec 11, 2023

This is a hotfix. Might be better to apply to main?

Like Ben said, the erroneous line does not exist in the main branch. This PR solves some of my puzzling on the output file names.

Ah - yes not hotfix then.

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

Assignees
No one assigned
Labels
0 Diff Trivial The changes in this pull request are trivially zero-diff (documentation, build failure, &c.) 0 Diff The changes in this pull request have verified to be zero-diff with the target branch.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@bena-nasa @tclune @metdyn @mathomp4