Prepare Simulation and App classes for OpenMC support, rework input file structure
#98
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,5 +9,6 @@ dependencies: | |
| - networkx | ||
| - pydotplus | ||
| - pytest | ||
| - jsonschema | ||
| - pip: | ||
| - argparse==1.4.0 | ||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,29 @@ | ||
| { | ||
| "proc_input_file": "msbr_objects.json", | ||
| "dot_input_file": "msbr.dot", | ||
| "output_path": "./data", | ||
| "num_depsteps": 12, | ||
| "depcode": { | ||
| "codename": "serpent", | ||
| "exec_path": "sss2", | ||
| "template_inputfile_path": "./msbr.serpent", | ||
| "iter_inputfile": "saltproc_serpent", | ||
| "iter_matfile": "saltproc_mat", | ||
| "npop": 50, | ||
| "active_cycles": 20, | ||
| "inactive_cycles": 20, | ||
| "geo_file_paths": ["./geometry/msbr_full.ini"] | ||
| }, | ||
| "simulation": { | ||
| "sim_name": "msbr_example_simulation", | ||
| "db_name": "msbr_kl_100_saltproc.h5", | ||
| "restart_flag": false, | ||
| "adjust_geo": false | ||
| }, | ||
| "reactor": { | ||
| "volume": 1.0, | ||
|
There was a problem hiding this comment. How come the volume is listed as 1? The volume listed in "mats/msbr_saltproc_prepr_comp.ini" is 4.871E7. There was a problem hiding this comment. That's a good point. In v0.3.0, the but the |
||
| "mass_flowrate": 9920000, | ||
| "power_levels": [ 2250000000 ], | ||
| "dep_step_length_cumulative": [ 3 ] | ||
| } | ||
| } | ||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,45 @@ | ||
| { | ||
LukeSeifert marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "proc_input_file": "tap_objects.json", | ||
| "dot_input_file": "tap.dot", | ||
| "output_path": "./data", | ||
| "num_depsteps": 3, | ||
| "depcode": { | ||
| "codename": "serpent", | ||
| "exec_path": "sss2", | ||
| "template_inputfile_path": "./tap.serpent", | ||
| "iter_inputfile": "saltproc_serpent", | ||
| "iter_matfile": "saltproc_mat", | ||
| "npop": 50, | ||
| "active_cycles": 20, | ||
| "inactive_cycles": 20, | ||
| "geo_file_paths": [ | ||
| "./geometry/347_base.ini", | ||
| "./geometry/406.ini", | ||
| "./geometry/427.ini", | ||
| "./geometry/505.ini", | ||
| "./geometry/576.ini", | ||
| "./geometry/633.ini", | ||
| "./geometry/681.ini", | ||
| "./geometry/840.ini", | ||
| "./geometry/880.ini", | ||
| "./geometry/900.ini", | ||
| "./geometry/988.ini", | ||
| "./geometry/1126.ini", | ||
| "./geometry/1338.ini", | ||
| "./geometry/1498.ini", | ||
| "./geometry/1668_all.ini" | ||
| ] | ||
| }, | ||
| "simulation": { | ||
| "sim_name": "test_simulation", | ||
| "db_name": "db_saltproc.h5", | ||
| "restart_flag": false, | ||
| "adjust_geo": true | ||
| }, | ||
| "reactor": { | ||
| "volume": 1.0, | ||
| "mass_flowrate": 9920000, | ||
| "power_levels": [ 1250000000 ], | ||
| "dep_step_length_cumulative": [ 2 ] | ||
| } | ||
| } | ||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,7 @@ pyne | |
| numpy | ||
| scipy | ||
| json | ||
| jsonschema | ||
| pytables | ||
| networkx | ||
| pydotplus | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You don't have any issues with finding these files? Would this need to be changed if it were run on a different machine?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These files are discoverable if the user sets their path variables correctly, which they'll need to do if they want serpent to run properly. I think I added a section in the docs pointing to the serpent wiki, but it may be worth repeating on our own docs.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've added some details about this in issue #109