-
Notifications
You must be signed in to change notification settings - Fork 16
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
Add OpenMC depletion settings to input file #177
Merged
Merged
Changes from 23 commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
6896f02
add machinery to set depletion settings for openmc in main input file
yardasol 745c037
fix json schema (format, defaults)
yardasol 91b1e69
move default schema code to new file; fix missing param in Reactor
yardasol c663d58
fix input schema
yardasol 6ec1362
fix file_interface_serpent integration test
yardasol a33d3c9
Merge branch 'master' into openmc-depletion-settings
yardasol a854654
add reactor fixutres; cleanup timestep handling; fix failing integrat…
yardasol 68b210e
move lowercasing 'codename' to its first needed case
yardasol ee6210b
update releasenotes
yardasol a1b2447
remove cruft comments
yardasol dd6c8cc
cleanup _process_main_input_reactor_params()
yardasol 544f35e
add more coverage to test_read_main_input()
yardasol 434ac51
remove input variables from input files that are equal to their defaults
yardasol d138aa5
add default values for various parameters; consistency changes in cod…
yardasol be03b9d
update releasenotes
yardasol 4b77fd2
Merge branch 'master' into openmc-depletion-settings
yardasol 3bdc6d4
typo fixes in input_schema.json
yardasol ffaf326
overhaul input file description in docpages
yardasol c1f8835
add unevaluatedProperties keyword to limit json input to declared sch…
yardasol 3cc1a18
Revert "add unevaluatedProperties keyword to limit json input to decl…
yardasol 398cb13
Add tests that check various cases for OpenMC depletion input
yardasol 9344619
changes from @LukeSeifert's review
yardasol df31b93
Changes from @LukeSeifert's second review
yardasol 80625ae
Add tests for timestep validating and scaling functions; changes from
yardasol 1f1d8af
update the endfb71 msbr serpent model to match the new syntax
yardasol 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
Large diffs are not rendered by default.
Oops, something went wrong.
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,11 +1,28 @@ | ||
.. _fileformatspec: | ||
|
||
========================== | ||
File Format Specifications | ||
========================== | ||
|
||
.. _fileformatspect_input_files: | ||
|
||
Input Files | ||
----------- | ||
|
||
.. toctree:: | ||
:maxdepth: 1 | ||
|
||
saltproc_input | ||
depcode_input | ||
simulation_input | ||
reactor_input | ||
|
||
|
||
.. _fileformatspec_output_files: | ||
|
||
Output Files | ||
------------ | ||
|
||
.. toctree:: | ||
:maxdepth: 1 | ||
|
||
inputfile | ||
databasefile |
This file was deleted.
Oops, something went wrong.
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 |
---|---|---|
@@ -0,0 +1,118 @@ | ||
.. _reactor_input: | ||
|
||
``reactor`` Properties | ||
========================= | ||
|
||
Required properties: ``volume``, ``mass_flowrate``, ``power_levels``, | ||
``depletion_timesteps``, ``timestep_units`` | ||
|
||
.. _volume_property: | ||
|
||
``volume`` | ||
---------- | ||
:description: | ||
reactor core volume [cm^3] | ||
|
||
:type: | ||
``number`` | ||
|
||
:minimum: | ||
0 | ||
|
||
|
||
.. _mass_flowrate_property: | ||
|
||
``mass_flowrate`` | ||
----------------- | ||
|
||
:description: | ||
Salt mass flowrate through reactor core [g/s] | ||
|
||
:type: | ||
``number`` | ||
|
||
:minimum: | ||
0 | ||
|
||
|
||
.. _power_levels_property: | ||
|
||
``power_levels`` | ||
---------------- | ||
|
||
:description: | ||
Reactor power or power step list durng depletion step [W] | ||
|
||
:type: | ||
``array`` | ||
|
||
:items: | ||
|
||
:type: | ||
``number`` | ||
|
||
:minimum: | ||
0 | ||
|
||
:minItems: | ||
1 | ||
|
||
:uniqueItems: | ||
``false`` | ||
|
||
|
||
.. _depletion_timesteps_property: | ||
|
||
``depletion_timesteps`` | ||
----------------------- | ||
|
||
:description: | ||
Depletion timestep size or list of timestep sizes | ||
|
||
:type: | ||
``array`` | ||
|
||
:items: | ||
|
||
:type: | ||
``number`` | ||
|
||
:minimum: | ||
0 | ||
|
||
:minItems: | ||
1 | ||
|
||
:uniqueItems: | ||
``false`` | ||
|
||
.. _timestep_type_property: | ||
|
||
``timestep_type`` | ||
----------------- | ||
|
||
:description: | ||
Depletion step type | ||
|
||
:type: | ||
``string`` | ||
|
||
:enum: | ||
``cumulative``, ``stepwise`` | ||
|
||
:default: | ||
``stepwise`` | ||
|
||
.. _timestep_unites_property: | ||
|
||
``timestep_units`` | ||
------------------ | ||
|
||
:description: | ||
Timestep unit | ||
|
||
:type: | ||
``string`` | ||
|
||
:enum: | ||
``s``, ``sec``, ``min``, ``minute``, ``h``, ``hr``, ``hour``, ``d``, ``day``, ``a``, ``year``, ``yr``, ``MWd/kg``, ``mwd/kg``, ``MWD/KG``, ``MWD/kg``, ``MWd/KG`` |
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 |
---|---|---|
@@ -0,0 +1,121 @@ | ||
.. _saltproc_input: | ||
|
||
SaltProc Input File | ||
=================== | ||
|
||
The main SaltProc input file is a JSON file validated against a JSON schema. | ||
In this section, we will describe the structure of this schema. The top level | ||
datatype of the schema is a JSON ``object``. | ||
|
||
Required properties are as follows: ``proc_input_file``, ``dot_input_file``, ``output_path``, ``depcode``, ``simulation``, ``reactor``. | ||
|
||
.. _proc_input_file_property: | ||
|
||
``proc_input_file`` | ||
------------------- | ||
|
||
:description: | ||
File containing processing system objects | ||
|
||
:type: | ||
``string`` | ||
|
||
:pattern: | ||
``^(.*)\\.json$`` | ||
|
||
|
||
.. _dot_input_file_property: | ||
|
||
``dot_input_file`` | ||
------------------ | ||
|
||
:description: | ||
Graph file containing processing system structure | ||
|
||
:type: | ||
``string`` | ||
|
||
:pattern: | ||
``^(.*)\\.dot$`` | ||
|
||
|
||
.. _output_path_property: | ||
|
||
``output_path`` | ||
--------------- | ||
|
||
:description: | ||
Path output data storing folder | ||
|
||
:type: | ||
``string`` | ||
|
||
:pattern: | ||
``^(.\\/)*(.*)$`` | ||
|
||
:default: | ||
``saltproc_runtime`` | ||
|
||
|
||
.. _n_depletion_steps_property: | ||
|
||
``n_depletion_steps`` | ||
--------------------- | ||
|
||
:description: | ||
Number of steps for constant power and depletion interval case | ||
|
||
:type: | ||
``number`` | ||
|
||
|
||
.. _depcode_property: | ||
|
||
``depcode`` | ||
----------- | ||
|
||
:description: | ||
Depcode class input parameters | ||
|
||
:type: | ||
``object`` | ||
|
||
:default: | ||
``{}`` | ||
|
||
:properties: | ||
:ref:`depcode_input` | ||
|
||
.. _simulation_property: | ||
|
||
``simulation`` | ||
-------------- | ||
|
||
:description: | ||
Simulation class input parameters | ||
|
||
:type: | ||
``object`` | ||
|
||
:default: | ||
``{}`` | ||
|
||
:properties: | ||
:ref:`simulation_input` | ||
|
||
.. _reactor_property: | ||
|
||
``reactor`` | ||
----------- | ||
|
||
:description: | ||
Reactor class input parameters | ||
|
||
:type: | ||
``object``. See :ref:`reactor_input` for object properties. | ||
|
||
:default: | ||
``{}`` | ||
|
||
:properties: | ||
:ref:`reactor_input` |
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 |
---|---|---|
@@ -0,0 +1,65 @@ | ||
.. _simulation_input: | ||
|
||
``simulation`` Properties | ||
========================= | ||
|
||
Required properties: ``sim_name``, ``db_name`` | ||
|
||
.. _sim_name_property: | ||
|
||
``sim_name`` | ||
------------ | ||
|
||
:description: | ||
Name of simulation | ||
|
||
:type: | ||
``string`` | ||
|
||
|
||
.. _db_name_property: | ||
|
||
``db_name`` | ||
----------- | ||
|
||
:description: | ||
Output HDF5 database file name | ||
|
||
:type: | ||
``string`` | ||
|
||
:default: | ||
``saltproc_results.h5`` | ||
|
||
:pattern: | ||
``^(.*)\\.h5$`` | ||
|
||
|
||
.. _restart_flag_property: | ||
|
||
``restart_flag`` | ||
---------------- | ||
|
||
:description: | ||
Restart simulation from the step when it stopped? | ||
|
||
:type: | ||
``boolean`` | ||
|
||
:default: | ||
``false`` | ||
|
||
|
||
.. _adjust_geo_property: | ||
|
||
``adjust_geo`` | ||
-------------- | ||
|
||
:description: | ||
switch to another geometry when keff drops below 1? | ||
|
||
:type: | ||
``boolean`` | ||
|
||
:default: | ||
``false`` |
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.
How come these are questions? Also,
switch
should be capitalizedThere 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.
They are questions that the variable is the answer to. Maybe that is confusing though?