-
Notifications
You must be signed in to change notification settings - Fork 577
Differentiate materials in DAGMC universes #3056
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.
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
Merged
Merged
Changes from 108 commits
Commits
Show all changes
128 commits
Select commit
Hold shift + click to select a range
903d114
start commenting
bam241 66a2be4
test
afd5a96
up
538313a
new state
e2c41c6
new state
ceb12fb
removing print
42dc9c3
removing unnecessary comment
2102210
fix
52dcd3f
add differente_mats into model
b6df271
syntax
8f827cc
docstring
a71e488
tmp commit
6a80008
computer change
394d585
computer change
4ec6b2b
in progress
5dc39fb
in progress
0a1e6c5
temp
7aa6f64
temp
f7a9b23
up
bam241 f3acb0b
cleaning printout
bam241 9bfab40
adding openmc_get_dagmc_cell_ids to compilation without DAGMC
bam241 635f1f5
Adding some test for dagmc_split
bam241 44ae1ad
put test restriction on dagmc model test if there is no DAGMC
bam241 25d29a6
adding missing import
bam241 f53ec5c
Apply suggestions from code review
bam241 4b84f67
updatE
bam241 657da23
formating
bam241 ca2efe3
cells now contain distribmat after differentiate with match_cell
bam241 c403854
move dagmc related methods into dagmc.py, factorise Universes method
bam241 b215d9e
update dagmc.cpp
bam241 fd2a7a2
raise an error if diff_volume_method is unknown and correct mat name …
bam241 95ff5bf
forgot to close the parenthesis
bam241 0fa8a44
missing a loop
bam241 7ce1b0a
proper order if
bam241 3197ee4
diff without option is ok
bam241 3a7c19c
rm commented code
bam241 8f3ffa5
my enforcing was not the problem
bam241 8e5c3ef
this adds a diff_volume_method as None by default, and just split mat…
bam241 55e59ca
Merge remote-tracking branch 'upstream/develop' into dagmc_decoupling
bam241 293e2f0
fixing dagmc geometry name
bam241 f96d6e3
pointer should be POINTER
bam241 81168e0
Update openmc/lib/dagmc.py
bam241 23a3108
Update openmc/model/model.py
bam241 94f04ce
Update openmc/model/model.py
bam241 429ee4a
Update openmc/dagmc.py
bam241 8baa99a
Update openmc/model/model.py
bam241 01b4c9d
fixe a to_lower shortcut typo
bam241 c8de658
adding docstring in dagmc.py
bam241 86cff56
forgot renameing file open
bam241 95136d7
no run necesseray
bam241 610bc95
restore old behavior for diff_deplet_mat, warning instead of error fo…
bam241 6756288
Apply suggestions from code review
bam241 c0680dd
adressing most @pshriwise comments
bam241 31fbcdc
cleaning
bam241 ebc9829
Merge remote-tracking branch 'upstream/develop' into dagmc_decoupling
bam241 9d55c28
update
bam241 416e794
fixing compilation error when searching in map
bam241 f6a7e76
add safeguard against overridings DAGMC cell with more materials than…
bam241 e2f392f
add single mat override
bam241 8148957
Update src/dagmc.cpp
bam241 ce99675
quickfix depletable only
bam241 b6ad4b7
factoring method form Universe to UniverseBase, do DAGMCUniverse can …
bam241 8b0906d
allow assignement overload per cell_id for DAGMC universe
bam241 c25d34e
Merge remote-tracking branch 'upstream/develop' into dagmc_decoupling
bam241 569348e
reset fmt to upstream/develop val
bam241 a9e0306
Apply suggestions from code review
bam241 dae5527
adressing third round of comment from @pshriwise
bam241 182d991
Merge remote-tracking branch 'upstream/develop' into dagmc_decoupling
bam241 50cfcab
Adding missing import for input_path
bam241 46f1ecf
Apply suggestions from code review
bam241 6b4efa9
add missing docstring
bam241 1d49274
direct import in init
bam241 89b4e37
adressing @pshriwise comments
bam241 af80702
updte test and adding test to check differentiation and volume calcul…
bam241 117e3ce
Merge remote-tracking branch 'upstream/develop' into dagmc_decoupling
bam241 4297bc7
factorising dagmc model tests
bam241 0b7411e
add comments
bam241 3078dc4
update
bam241 8f7d9af
typo
bam241 8579ae1
forgot the return...
bam241 5fdc49a
Apply suggestions from code review
bam241 58ce43b
new round of edits
bam241 2783196
Merge remote-tracking branch 'upstream/develop' into dagmc_decoupling
bam241 d6f0913
fixing not working tests
bam241 9f458c4
Update src/dagmc.cpp
bam241 387f648
Update tests/unit_tests/dagmc/test_model.py
bam241 e63f285
addressing comment, improving tests
bam241 c4f7259
ongoing
bam241 84898c5
can't check n_instance match number of override as n_instance is coun…
bam241 d6f9af8
factorizing adding override
bam241 da8cf37
add a missing error
bam241 f71acc4
add a missing error
bam241 1b9b58e
update from_xml for dagmc
bam241 f1e9935
update docs
bam241 287201a
using material ID for the xml istead of the name per default
bam241 d88a4bb
changing xml layout
bam241 bec954e
removing ; separator, changing docs accordingly
bam241 783547d
Apply suggestions from code review
bam241 1ff5d61
Apply suggestions from code review
bam241 06133ed
Addressing next round of comment
bam241 ed04232
Refactor DAGMC material diferentiation tests
pshriwise ee1bec8
Update IO format docs for material_overrides
paulromano 415e614
Remove unused imports
paulromano 383a878
Cleanup with material_overrides
paulromano 2a8747a
Get rid of unused overload for split
paulromano 548c04e
Simplifications in lib/dagmc.py
paulromano ff947b8
Remove get_all_dagmc_universes
paulromano 6b00d66
Cell Id as key
bam241 11a6b50
Altering override data structure type on the C++ side.
pshriwise bf714c7
Docstring updates and build_override_mat_from_cells method simplifica…
pshriwise 31e6ebc
removing build_override_mat_from_cells method as it's just a few line…
pshriwise 3898c2b
Skipping cells with a None fill while building material override to m…
pshriwise 4729309
Simplify control flow in diff mats. Docstring updates
pshriwise ad6a877
Better position for try in existing test. Add test for ValueErro when…
pshriwise e1655e2
Style fixes
pshriwise 4576e26
adding test for XML generation and creation from, fixing _from_XML me…
bam241 2340aac
Apply suggestion from @bam241
pshriwise 76564cd
Separate and simplify how cell override assignments are set and creat…
pshriwise 9801c80
Update C++ tags to reflect XML structure changes
pshriwise 92ed191
Update tests related to XML IO
pshriwise a08663a
Adding test with full roundtrip
pshriwise 4da07c6
Simplifying further
pshriwise 1f28a9e
Removing errant print
pshriwise 23f2bc6
consolidating all test related to dagmc material override xml generation
bam241 af175cd
Adding test for bad name for replacement, bad override type, override…
bam241 120a1de
Simplifying tests. Assigning materials directly to cells and adding m…
pshriwise 08fa0a9
C++ style
pshriwise 636160e
Updates throughout dagmc.py and tests
paulromano File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.