bring dev branch upto date with main #66
Merged
Conversation
This file contains 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
shimwell
changed the title
psauvan
added a commit
that referenced
this pull request
Apr 23, 2024
* update Fuzzy write function * several stp file update * script to color CAD document following material label * fix rounding error of z value acos(z) evaluation * Add a bug report template and .gitignore (#44) * Removed unused imports and variables (#35) * raise value error instead of exit (#41) * Update to testing path (#40) * changed hardcoded path to work for all users * path update * Update bug_report.md * raising catchable error instead of exit (#47) * raising catchable error instead of exit * added new line * added try for freecad import (#48) * Solve SyntaxtError producing a bug (#49) * Solve SyntaxtError producing a bug * Limit the amount of decimals printed in the enclosure comment * fixed error units in OpenMC output * GEOUNED training presentation added (#53) * Adding minimal ci to check cad converts (#52) * added minimal CI * all step files * added ci yml * removed freecadcmd arg * Update pyproject.toml Update url links to "GEOUNED-org" * typo correction to test if CI is working (#54) * typo correction * [skip ci] added ci status badge * opening up ci to all os systems * fix small bug with torus (bad identification of closed mozaic faces) * Adding minimal volume checking CI comparing CAD and CSG volumes (#56) * added volume test to ci * removed if os cond * added csg vs cad volume for **most** stp files * Added mkdocs (#57) * added example docs * added docs deps * Reverting mkdocs PR 57 (#58) * Revert "added example docs" This reverts commit bd1c67a. * Revert "added docs deps" This reverts commit f31d241. * Adding minimal particle transport tests on resulting csg files (#59) * added transport tests * removed files that break, raised issue * [skip ci] remove prints * added link to issue * Add the name to the cells in OpenMC to improve identification (#61) The name is the same that is used in MCNP inputs cell.Comments * converting with no simplification = more geometry works (#62) * reduced number of skiped geoms (#63) * [skip ci] corrected bade to main branch (#64) * Improved import statements (#65) * changed single file from package to relative imports * 2nd file converted to relative imports * converted more fiels to relative import * relative imports everywhere * isort on all imports * Add bug report and .gitignore to main (#45) (#66) Co-authored-by: AlvaroCubi <[email protected]> * added standard gitignore for python project (#68) --------- Co-authored-by: psauvan <[email protected]> Co-authored-by: Tony <[email protected]> Co-authored-by: Jonathan Shimwell <[email protected]> Co-authored-by: Aljaz Kolsek (F4E) <[email protected]> Co-authored-by: Emilio Castro <[email protected]>
Closed
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.
Looks like a file was added to the main branch without first going to the dev branch
So the dev branch is missing this file and therefore out of sync
This PR brings dev branch upto date with the changes on main, then when/if there is a desire in the future to merge from dev to main (e.g. for a release) then this will be possible without conflicts