Mattdon/new melcor interface #2017

mandd · 2022-11-17T22:29:54Z

Pull Request Description

What issue does this change request address? (Use "#" before the issue to link it, i.e., #42.)

Closes #2125

What are the significant changes in functionality due to this change request?

For Change Control Board: Change Request Review

The following review must be completed by an authorized member of the Change Control Board.

1. Review all computer code.
2. If any changes occur to the input syntax, there must be an accompanying change to the user manual and xsd schema. If the input syntax change deprecates existing input files, a conversion script needs to be added (see Conversion Scripts).
3. Make sure the Python code and commenting standards are respected (camelBack, etc.) - See on the wiki for details.
4. Automated Tests should pass, including run_tests, pylint, manual building and xsd tests. If there are changes to Simulation.py or JobHandler.py the qsub tests must pass.
5. If significant functionality is added, there must be tests added to check this. Tests should cover all possible options. Multiple short tests are preferred over one large test. If new development on the internal JobHandler parallel system is performed, a cluster test must be added setting, in XML block, the node <internalParallel> to True.
6. If the change modifies or adds a requirement or a requirement based test case, the Change Control Board's Chair or designee also needs to approve the change. The requirements and the requirements test shall be in sync.
7. The merge request must reference an issue. If the issue is closed, the issue close checklist shall be done.
8. If an analytic test is changed/added is the the analytic documentation updated/added?
9. If any test used as a basis for documentation examples (currently found in raven/tests/framework/user_guide and raven/docs/workshop) have been changed, the associated documentation must be reviewed and assured the text matches the example.

This reverts commit 49913b9.

…to mattdon/New_MELCOR_Interface

…nterface

moosebuild · 2023-02-22T15:44:21Z

Job Mingw Test on 3eb7f67 : invalidated by @joshua-cogliati-inl

restarted civet

ravenframework/CodeInterfaceClasses/MELCOR/melcorCombinedInterface.py

ravenframework/contrib/melcorTools/melcorTools.py

doc/user_manual/code_interfaces/melcor.tex

ravenframework/CodeInterfaceClasses/MELCOR/melcorCombinedInterface.py

Co-authored-by: Andrea Alfonsi - NuCube <[email protected]>

doc/user_manual/code_interfaces/melcor.tex

ravenframework/CodeInterfaceClasses/MELCOR/melcorCombinedInterface.py

wangcj05

@mandd I have a couple of comments for you to consider.

wangcj05 · 2025-04-15T14:58:26Z

ravenframework/CodeInterfaceClasses/MELCOR/melcorCombinedInterface.py

@@ -13,104 +13,168 @@
 # limitations under the License.
 """
  Created on April 18, 2017
-  @author: Matteo Donorio (University of Rome La Sapienza),
-           Fabio Gianneti (University of Rome La Sapienza),
+  @author: Matteo D'Onorio (Sapienza University of Rome)
           Andrea Alfonsi (INL)


Probably you need to update the affiliation here.

wangcj05 · 2025-04-15T15:00:03Z

ravenframework/CodeInterfaceClasses/MELCOR/melcorCombinedInterface.py

+    This class is used a part of a code dictionary to specialize Model. Code for different MELCOR versions
+    like MELCOR 2.2x, MELCOR 1.86, MELCOR for fusion applications


By the way, is there any way that we can check the MELCOR version?

I am not sure tbh

wangcj05 · 2025-04-15T15:02:27Z

ravenframework/CodeInterfaceClasses/MELCOR/melcorCombinedInterface.py

-from .melgenInterface import MelgenApp
+from ..Generic import GenericParser
+import pandas as pd
+

 class Melcor(CodeInterfaceBase):


Can we make Melcor interface inherit from GenericCodeInterface? I saw you are using GenericParser already.

we rely only on the genericParser which is a separate module also called by GenericCode interface

wangcj05 · 2025-04-15T15:07:46Z

doc/user_manual/code_interfaces/melcor.tex

+Two addtional nodes need to be specified: the first one (i.e., \xmlNode{CodePlotFile}) indicates the name of the MELCOR plot file.
+The second one (i.e., \xmlNode{MelcorOutput}) specifies the name of the MELCOR message file.


I would suggest add more detailed descriptions here. For example, what are the text format for the nodes? I assume the code can only accept one file for each of the nodes.

I have added a small additional description, now that we have a MELCOR user in the group we will gather more experience on this interface

wangcj05 · 2025-04-15T15:09:44Z

ravenframework/CodeInterfaceClasses/MELCOR/melcorCombinedInterface.py

+    self.melcorPlotFile = [var.strip() for var in plotNode.text.split(",")][0]
+    self.melcorOutFile  = [var.strip() for var in melNode.text.split(",")][0]


These lines indicate you may allow users to provide more than one files, but you only use the first file. Could you clarify why you would like to do it in this way? Do you expect to extend the interface to accept more files?

wangcj05 · 2025-04-15T15:27:51Z

ravenframework/CodeInterfaceClasses/MELCOR/melcorCombinedInterface.py

-    returnCommand = melgCommand + melcCommand, melcOut
+    found = False
+
+    melcOut = 'OUTPUT_MELCOR'


I suggest you define the "melcOut" in the init method

wangcj05 · 2025-04-15T15:32:18Z

ravenframework/CodeInterfaceClasses/MELCOR/melcorCombinedInterface.py

+      precommand = executable
+    melgCommand = str(preExec)    + ' ' + melcin.getFilename()
+    melcCommand = str(precommand) + ' ' + melcin.getFilename()
+    returnCommand = [('serial',melgCommand + ' && ' + melcCommand +' ow=o ')],melcOut


By the way, can Melcor run in parallel?

i do not think so

wangcj05 · 2025-04-15T15:33:51Z

ravenframework/CodeInterfaceClasses/MELCOR/melcorCombinedInterface.py

+    parser = GenericParser.GenericParser(inFiles)
+    parser.modifyInternalDictionary(**Kwargs)
+    parser.writeNewInput(currentInputFiles,origFiles)


It seems to me you can make this class inherit from Generic Code Interface class.

see comment above

wangcj05 · 2025-04-15T15:35:04Z

ravenframework/CodeInterfaceClasses/MELCOR/melcorCombinedInterface.py

-    failure = self.melcorInterface.checkForOutputFailure(output, workingDir)
-    return failure
+    failure = True
+    goodWord  = "Normal termination"   # This is for MELCOR 2.2 (todo: list for other MELCOR versions)


I would suggest we define the "goodWord" in init method.

moved to init

moosebuild · 2025-04-17T15:03:47Z

Job Test mac on de9ceac : invalidated by @joshua-cogliati-inl

failed in set python environment with download failure

alfoa · 2025-04-17T17:05:43Z

@mandd I would also move the MELCOR test(s) in its dedicated folder (for better organization of the CodeInterface test folder)

moosebuild · 2025-04-21T17:50:14Z

Job Mingw Test on 1e8fbe9 : invalidated by @joshua-cogliati-inl

restarted civet

wangcj05

@mandd Some minor comments for you to consider.

wangcj05 · 2025-04-23T19:43:19Z

tests/framework/CodeInterfaceTests/test_melcor_interface.xml

+      <author>mattdon</author>
+      <created>2023-02-20</created>


I think we should not change the author here.

wangcj05 · 2025-04-23T19:43:56Z

ravenframework/CodeInterfaceClasses/MELCOR/melcorCombinedInterface.py

-  def finalizeCodeOutput(self, command, output, workingDir):
+    if "dynamicevent" in samplerType.lower():
+      raise IOError("Dynamic Event Tree-based samplers not implemented for MELCOR yet! But we are working on that.")
+    indexes  = []


It seems variable "indexes" is not used.

mandd

addressing latest comments

mandd · 2025-04-23T21:55:28Z

tests/framework/CodeInterfaceTests/test_melcor_interface.xml

+      <author>mattdon</author>
+      <created>2023-02-20</created>


moosebuild · 2025-04-24T14:51:34Z

All jobs on eeebb8c : invalidated by @wangcj05

timeout and fetch issue

moosebuild · 2025-04-24T15:22:27Z

Job Test Ubuntu 18 PIP on eeebb8c : invalidated by @mandd

mattdon and others added 25 commits October 18, 2022 19:31

Update melcorCombinedInterface.py

12d25ce

Delete MELCORdata.py

e74717b

Delete melcorInterface.py

0fa7df7

Delete melgenInterface.py

33bc4ce

Update melcorCombinedInterface.py

e0ead47

Update melcorCombinedInterface.py

9e98ecb

Merge branch 'idaholab:devel' into New_MELCOR_Interface

446f280

Update test_melcor_interface.xml

9f398e0

merge

49913b9

merge

6deb3ab

Merge branch 'devel' into mattdon/New_MELCOR_Interface

216cb92

Revert "merge"

081f5f6

This reverts commit 49913b9.

first cleaning of PR

5b1c43a

Merge branch 'devel' into mattdon/New_MELCOR_Interface

99e71a0

edits

8bcc76f

Merge branch 'devel' into mattdon/New_MELCOR_Interface

2c71868

Merge remote-tracking branch 'origin/mattdon/New_MELCOR_Interface' in…

508d1a0

…to mattdon/New_MELCOR_Interface

edit test files

d0b5a91

edit combinedInterface file

a569931

added test files

4954399

missing test file

ad60e3a

fix for diego

9fdb226

small edits

5f2c16c

Merge remote-tracking branch 'origin/devel' into mattdon/New_MELCOR_I…

879acc3

…nterface

added edits from rome

3eb7f67

edit file

ab83307

wangcj05 added the RAVENv3.0 label May 19, 2023

mandd added 2 commits May 26, 2023 13:14

final files

b065ddb

removed last file

d8c1ae7

alfoa requested changes Apr 2, 2025

View reviewed changes

alfoa reviewed Apr 2, 2025

View reviewed changes

doc/user_manual/code_interfaces/melcor.tex Outdated Show resolved Hide resolved

alfoa reviewed Apr 2, 2025

View reviewed changes

ravenframework/CodeInterfaceClasses/MELCOR/melcorCombinedInterface.py Outdated Show resolved Hide resolved

alfoa reviewed Apr 2, 2025

View reviewed changes

ravenframework/CodeInterfaceClasses/MELCOR/melcorCombinedInterface.py Outdated Show resolved Hide resolved

alfoa reviewed Apr 2, 2025

View reviewed changes

ravenframework/CodeInterfaceClasses/MELCOR/melcorCombinedInterface.py Outdated Show resolved Hide resolved

alfoa reviewed Apr 2, 2025

View reviewed changes

ravenframework/CodeInterfaceClasses/MELCOR/melcorCombinedInterface.py Outdated Show resolved Hide resolved

alfoa reviewed Apr 2, 2025

View reviewed changes

ravenframework/CodeInterfaceClasses/MELCOR/melcorCombinedInterface.py Outdated Show resolved Hide resolved

mandd and others added 4 commits April 2, 2025 16:44

Update doc/user_manual/code_interfaces/melcor.tex

5bfa421

Co-authored-by: Andrea Alfonsi - NuCube <[email protected]>

more edits

df665df

more edits

0f7d2b7

delete whitespaces

90c7fb8

alfoa reviewed Apr 3, 2025

View reviewed changes

doc/user_manual/code_interfaces/melcor.tex Outdated Show resolved Hide resolved

alfoa reviewed Apr 3, 2025

View reviewed changes

doc/user_manual/code_interfaces/melcor.tex Show resolved Hide resolved

alfoa reviewed Apr 3, 2025

View reviewed changes

ravenframework/CodeInterfaceClasses/MELCOR/melcorCombinedInterface.py Outdated Show resolved Hide resolved

addressing new comments

50185b6

alfoa previously approved these changes Apr 4, 2025

View reviewed changes

wangcj05 requested changes Apr 15, 2025

View reviewed changes

addressing new comments

0614367

mandd dismissed alfoa’s stale review via 0614367 April 16, 2025 16:02

mandd added 2 commits April 17, 2025 08:10

delete whitespaces

c517615

merge with devel

de9ceac

restore test file from devel

1e8fbe9

wangcj05 requested changes Apr 23, 2025

View reviewed changes

addressing new comments

eeebb8c

mandd commented Apr 23, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Mattdon/new melcor interface #2017

Mattdon/new melcor interface #2017

mandd commented Nov 17, 2022 •

edited

Loading

moosebuild commented Feb 22, 2023

wangcj05 left a comment

wangcj05 Apr 15, 2025

mandd Apr 16, 2025

wangcj05 Apr 15, 2025

mandd Apr 16, 2025

wangcj05 Apr 15, 2025

mandd Apr 16, 2025

wangcj05 Apr 15, 2025

mandd Apr 16, 2025

wangcj05 Apr 15, 2025

mandd Apr 16, 2025

wangcj05 Apr 15, 2025

mandd Apr 16, 2025

wangcj05 Apr 15, 2025

mandd Apr 16, 2025

wangcj05 Apr 15, 2025

mandd Apr 16, 2025

wangcj05 Apr 15, 2025

mandd Apr 16, 2025

moosebuild commented Apr 17, 2025

alfoa commented Apr 17, 2025

moosebuild commented Apr 21, 2025

wangcj05 left a comment

wangcj05 Apr 23, 2025

mandd Apr 23, 2025

wangcj05 Apr 23, 2025

mandd Apr 23, 2025

mandd left a comment

mandd Apr 23, 2025

moosebuild commented Apr 24, 2025

moosebuild commented Apr 24, 2025

		This class is used a part of a code dictionary to specialize Model. Code for different MELCOR versions
		like MELCOR 2.2x, MELCOR 1.86, MELCOR for fusion applications

		Two addtional nodes need to be specified: the first one (i.e., \xmlNode{CodePlotFile}) indicates the name of the MELCOR plot file.
		The second one (i.e., \xmlNode{MelcorOutput}) specifies the name of the MELCOR message file.

		self.melcorPlotFile = [var.strip() for var in plotNode.text.split(",")][0]
		self.melcorOutFile = [var.strip() for var in melNode.text.split(",")][0]

Mattdon/new melcor interface #2017

Are you sure you want to change the base?

Mattdon/new melcor interface #2017

Conversation

mandd commented Nov 17, 2022 • edited Loading

Pull Request Description

What issue does this change request address? (Use "#" before the issue to link it, i.e., #42.)

What are the significant changes in functionality due to this change request?

For Change Control Board: Change Request Review

moosebuild commented Feb 22, 2023

wangcj05 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

moosebuild commented Apr 17, 2025

alfoa commented Apr 17, 2025

moosebuild commented Apr 21, 2025

wangcj05 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mandd left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

moosebuild commented Apr 24, 2025

moosebuild commented Apr 24, 2025

mandd commented Nov 17, 2022 •

edited

Loading