Conversation
…third-party imports
… aligned Delta Cp
… final XFOIL run, install confirmation
… seed, XFOIL uses the user's paneling
…ults, about 50x faster)
… (VTK) and OpenFOAM (STL)
feat: export for CAD, ParaView and OpenFOAM
…ap section (now in TODO.md)
PSamuele
force-pushed
the
chore/merge-into-main
branch
from
September 23, 2026 14:18
c135811 to
1901902
Compare
Contributor
|
Per me va bene, vedo solo che dei pezzi di codice nella review sono stati interamente cancellati. Se intendevi toglierli, allora approvo |
Contributor
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
PRs #4 to #16 were merged into their own base branch, not into
main, so the work never reachedmain: it all sits on top ofchore/remove-example-results. This PR closes the chain.It also brings
main(PR #15 roadmap and PR #19 README) into the chain, so the merge is clean.Conflict resolved
One conflict in
README.md, in the "Aerodynamics" section: PR #19 added "(uniformally distributed)" to the panel-method description, PR #8 changed the XFOIL line just below. Both changes are kept. "uniformally" is spelled "uniformly".Also in this commit
The "Roadmap" section is removed from the README: the same items are in
TODO.md(#15), and two lists would drift apart. The Limitations section now links toTODO.md.Verified
Merge reproduced locally:
README.mdis the only conflict, and on the merged treepython tests/baseline_check.pygives 24/24.After merging
mainwill contain everything:naca_core/with the shared core and the export,tests/, the updated READMEs andTODO.md. The branches of the merged PRs can be deleted.