-
Notifications
You must be signed in to change notification settings - Fork 25
Support READ cards #30
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
Open
tjlaboss
wants to merge
9
commits into
openmc-dev:main
Choose a base branch
from
tjlaboss:read
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
ae92cf2
Separate read_file() function. Close the file handle.
tjlaboss 2930c18
Add regex for READ FILE=
tjlaboss 2ff0d7a
Insert contents of READ file
tjlaboss 705f5d0
Recursion
tjlaboss c1d2be3
Merge branch 'openmc-dev:main' into read
tjlaboss 6e778d2
Begin testing read file= inputs.
tjlaboss b5ef964
Add test files
tjlaboss be32a65
Test 'read file=' card against ref solution
tjlaboss c767d10
Test recursive read case with mcnp_to_model()
tjlaboss 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
Testing read card | ||
C this is a comment | ||
read echo file=testReadTarget.imcnp encode | ||
|
||
1 so 0.5 | ||
|
||
mode n |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
2 0 +1 $ lowest level |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
Testing read card | ||
C this is a comment | ||
1 0 -1 | ||
2 0 +1 $ lowest level | ||
c | ||
|
||
1 so 0.5 | ||
|
||
mode n |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
1 0 -1 | ||
read file=testReadRecursive.imcnp | ||
c |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
import os | ||
import textwrap | ||
import pytest | ||
|
||
from openmc_mcnp_adapter import mcnp_str_to_model, mcnp_to_model | ||
from openmc_mcnp_adapter.parse import read_file | ||
|
||
here = os.path.dirname(os.path.abspath(__file__)) | ||
input_dir = os.path.join(here, "inputs") | ||
|
||
|
||
def test_read_not_found(): | ||
deck = textwrap.dedent(""" | ||
title | ||
c The next line points to an invalid file | ||
read file=/badfile.path | ||
""") | ||
with pytest.raises(FileNotFoundError): | ||
mcnp_str_to_model(deck) | ||
|
||
|
||
def test_read_recursive(): | ||
reference = read_file(os.path.join(input_dir, "testReadReference.imcnp")) | ||
trial = read_file(os.path.join(input_dir, "testRead.imcnp")) | ||
assert trial == reference | ||
|
||
|
||
def test_recursive_mcnp_to_model(): | ||
mcnp_to_model(os.path.join(input_dir, "testRead.imcnp")) |
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.
Not going to be perfectly robust in that it may be overly generous with what counts as a read, but I think it's probably robust enough.