Skip to content
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.

Sign up for GitHub

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

Address RELAP interface issue #2426

Open
wants to merge 3 commits into
base: devel
Choose a base branch
from
Open

Address RELAP interface issue #2426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
630a8cc
resolve relap parser issue when processing continuation with operator
wangcj05 Jan 17, 2025
ce97b4e
regold generated inputs
wangcj05 Jan 17, 2025
4fccdbc
update test info
wangcj05 Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ravenframework/CodeInterfaceClasses/RELAP5/RELAPparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,12 +385,14 @@ def retrieveCardValues(self, listOfCards):
cnt = 1
while moveToNextLine:
if self.deckLines[deck][lineNum+cnt].strip().startswith("+"):
currentNumberWords = self.countNumberOfWords(self.deckLines[deck][lineNum+cnt])
currentLine = self.deckLines[deck][lineNum+cnt]
currentNumberWords = self.countNumberOfWords(currentLine)
if int(word) <= numberOfWords+currentNumberWords:
cardValues[(deck,readCard,word)] = line.split()[word-currentNumberWords]
cardValues[(deck,readCard,word)] = currentLine.split()[word-numberOfWords]
foundWord = True
moveToNextLine = False
numberOfWords+=currentNumberWords
cnt += 1
else:
moveToNextLine=False
if not foundWord:
Expand Down
3 changes: 2 additions & 1 deletion tests/framework/CodeInterfaceTests/RELAP5/gold/RELAP5interfaceTest/testDummyStep/1/snc01.i
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*RAVEN INPUT VALUES
* card: 13550801 word: 6 value: 4.790482e-01
* card: 13550801 word: 7 value: 4.790482e-01
* card: 20100154 word: 1 value: 3.920277e+02
* card: 20100154 word: 2 value: 4.479190e+01
* card: 20100155 word: 2 value: 4.624756e+01
Expand Down Expand Up @@ -1658,7 +1659,7 @@
13550601 0 0 0 1 0.5 1
13550701 0 0.0 0.0 0.0 1
13550801 0.0 3.0 3.0 0.0
+ 0.0 4.790482e-01 0.0 1.0 1
+ 0.0 4.790482e-01 4.790482e-01 1.0 1
13550901 0.0 3.0 3.0 0.0 0.0 0.0 0.0 1.0 1
*
* vessel wall
Expand Down
3 changes: 2 additions & 1 deletion tests/framework/CodeInterfaceTests/RELAP5/gold/RELAP5interfaceTest/testDummyStep/2/snc01.i
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*RAVEN INPUT VALUES
* card: 13550801 word: 6 value: 4.482297e-01
* card: 13550801 word: 7 value: 4.482297e-01
* card: 20100154 word: 1 value: 3.920310e+02
* card: 20100154 word: 2 value: 4.397478e+01
* card: 20100155 word: 2 value: 4.514053e+01
Expand Down Expand Up @@ -1658,7 +1659,7 @@
13550601 0 0 0 1 0.5 1
13550701 0 0.0 0.0 0.0 1
13550801 0.0 3.0 3.0 0.0
+ 0.0 4.482297e-01 0.0 1.0 1
+ 0.0 4.482297e-01 4.482297e-01 1.0 1
13550901 0.0 3.0 3.0 0.0 0.0 0.0 0.0 1.0 1
*
* vessel wall
Expand Down
6 changes: 6 additions & 0 deletions tests/framework/CodeInterfaceTests/RELAP5/test_relap5_code_interface.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
<revision author="alfoa" date="2019-12-05">Modified to check we can handle multiple words in the same card.</revision>
<revision author="alfoa" date="2020-10-31">Added csv xml node in the Code block for showing how to use it.</revision>
<revision author="alfoa" date="2021-10-21">Removed clearRunDir flag since in case of interfaceCheck this is set to False automatically (see issue #1688)</revision>
<revision author="wangc" date="2025-01-17">Added operator card to test operator issue with continuation lines (see issue #2425)</revision>

</revisions>
<requirements>R-SI-1</requirements>
</TestInfo>
Expand All @@ -40,6 +42,10 @@
<!-- /path/to/relap/executable/relap5.x -->
<!-- here we should put the executable. Since we want to test the interface only, it is going to be empty -->
</executable>
<operator variables="13550801:6">
<expression> %card%+13550801:6</expression>
<cards>13550801:7</cards>
</operator>
<!-- The following flag indicates that we will write a CSV with the data (by default we return the data directly to RAVEN) -->
<csv>True</csv>
</Code>
Expand Down