Skip to content

Hot fixes to the mainline#433

Merged
mpaiao merged 1 commit intomasterfrom
mpaiao-pr-thinning-hotfix
Apr 1, 2026
Merged

Hot fixes to the mainline#433
mpaiao merged 1 commit intomasterfrom
mpaiao-pr-thinning-hotfix

Conversation

@mpaiao
Copy link
Copy Markdown
Contributor

@mpaiao mpaiao commented Apr 1, 2026

Description

This pull request has some hot fixes to the code after merging #282. That pull request was in the queue for a very long time, so there are a few remaining inconsistencies that the merge did not catch.

Collaborators

Types of changes

  • Hot fix (emergential bug fix to make ED2 run again)
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Other (fix or feature that would cause existing functionality to change)

Changes in Settings, Input Files or Output Files

  • This feature requires changes in ED2IN
  • This feature requires changes in the XML parameter file
  • This feature requires changes in other input files
  • This feature will change output files

Expectation of Answer Changes:

  • No changes expected (bit-for-bit compatibility)
  • Changes expected with specific configurations (see details below)
  • Changes expected in all simulations (see details below)

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • ED2 Wiki update:

Testing :

  • All new and existing tests passed.

This pull request has some hot fixes to the code after merging #282. That pull request was in the queue for a very long time, so there are a few remaining inconsistencies that the merge did not catch.
@mpaiao mpaiao marked this pull request as ready for review April 1, 2026 16:16
@mpaiao mpaiao requested review from crollinson and xiangtaoxu April 1, 2026 16:16
@mpaiao
Copy link
Copy Markdown
Contributor Author

mpaiao commented Apr 1, 2026

It turned out to be only one minor spelling fix (hite has become height...). I did not touch the Docker configurations, but apparently it is working again ;), and all CI tests ran successfully.

Copy link
Copy Markdown
Contributor

@crollinson crollinson 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 to me!

@mpaiao
Copy link
Copy Markdown
Contributor Author

mpaiao commented Apr 1, 2026

Thanks @crollinson! I will go ahead and merge it, so the main version is functional.

@mpaiao mpaiao merged commit d971a62 into master Apr 1, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants