edit test files

ravenframework/CodeInterfaceClasses/MELCOR/melcorCombinedInterface.py

@@ -16,12 +16,12 @@
   @author: Matteo D'Onorio (Sapienza University of Rome)
 """
 
-import sys
 import os
+from . import melcorTools
 from ravenframework.CodeInterfaceBaseClass import CodeInterfaceBase
 from ..Generic import GenericParser
 import pandas as pd
-import time
+
 
 class Melcor(CodeInterfaceBase):
   """
@@ -42,16 +42,19 @@ def _readMoreXML(self,xmlNode):
     melNode = xmlNode.find('MelcorOutput')
     varNode = xmlNode.find('variables')
     plotNode = xmlNode.find('CodePlotFile')
+
     if varNode is None:
       raise IOError("Melcor variables not found, define variables to print")
     if plotNode is None:
       raise IOError("Please define the name of the MELCOR plot file in the CodePlotFile xml node")
     if melNode is None:
       raise IOError("Please enter MELCOR message file name")
+
     self.VarList = [var.strip() for var in varNode.text.split("$,")]
     self.MelcorPlotFile = [var.strip() for var in plotNode.text.split(",")][0]
     self.melcorOutFile = [var.strip() for var in melNode.text.split(",")][0]
-    return self.VarList,self.MelcorPlotFile,self.melcorOutFile
+
+    return self.VarList, self.MelcorPlotFile, self.melcorOutFile
 
   def findInps(self,currentInputFiles):
     """
@@ -141,15 +144,13 @@ def writeDict(self,filen,workDir):
       @ In, workDir, str, current working directory
       @ Out, None
     """
-    from melcorTools import MCRBin
-
     fileDir = os.path.join(workDir,self.MelcorPlotFile)
-    Time,Data,VarUdm = MCRBin(fileDir,self.VarList)
+    Time,Data,VarUdm = melcorTools.MCRBin(fileDir,self.VarList)
     dfTime = pd.DataFrame(Time, columns= ["Time"])
     dfData = pd.DataFrame(Data, columns = self.VarList)
     df = pd.concat([dfTime, dfData], axis=1, join='inner')
     df.drop_duplicates(subset="Time",keep='first',inplace=True)
-    dictionary=df.to_dict()
+    dictionary = df.to_dict()
     return dictionary
 
   def finalizeCodeOutput(self,command,output,workingDir):

ravenframework/CodeInterfaceClasses/MELCOR/melcorTools.py

@@ -0,0 +1,116 @@
+"""
+  MELCOR FORMAT SUPPORT MODULE
+  Created on March 28, 2017
+  Last update on October 14, 2022
+  @authors:
+           Matteo D'Onorio (University of Rome La Sapienza)
+           Paolo Balestra (University of Rome La Sapienza)
+"""
+from struct import unpack
+import numpy as np
+from collections import Counter
+
+def MCRBin(fileDir, VarSrch):
+  """
+    This method is called to collect the variables to be used in the postprocess
+    @ In, fileDirectory, string, the file directory. This is the directory of the MELCOR plot file
+    @ In, variableSearch, list, list of variables to be collected
+    @ Out, Data, tuple (numpy.ndarray,numpy.ndarray,numpy.ndarray), this contains the extracted data for each declare variable
+  """
+  HdrList = []
+  BlkLenBef = []
+  BlkLenAft = []
+  DataPos=[]
+  cntr = 0
+  Var_dict = {}
+  with open(fileDir, 'rb') as bf:
+    while True:
+      BlkLenBefSlave = bf.read(4)
+      if not BlkLenBefSlave:
+        break
+      BlkLenBef.append(unpack('I', BlkLenBefSlave)[0])
+      if BlkLenBef[cntr] == 4:
+        HdrList.append(str(unpack('4s', bf.read(4))[0], 'utf-8'))
+      elif HdrList[cntr - 1] == 'TITL':
+        probemTitle=str(unpack('%d' % BlkLenBef[cntr] + 's', bf.read(BlkLenBef[cntr]))[0], 'utf-8')
+        HdrList.append([])
+      elif HdrList[cntr - 1] == 'KEY ':
+        VarName=unpack('2I', bf.read(8))
+        HdrList.append([])
+      elif HdrList[cntr - 2] == 'KEY ':
+        a = BlkLenBef[-1]/VarName[0]
+        stringa=str(int(a))+"s"
+        VarNam=[str(i, 'utf-8') for i in unpack(stringa * VarName[0], bf.read(BlkLenBef[cntr]))]
+        HdrList.append([])
+      elif HdrList[cntr - 3] == 'KEY ':
+        VarPos=unpack('%d' % VarName[0] + 'I', bf.read(BlkLenBef[cntr]))
+        HdrList.append([])
+      elif HdrList[cntr - 4] == 'KEY ':
+        VarUdm=[str(i, 'utf-8') for i in unpack('16s' * VarName[0], bf.read(BlkLenBef[cntr]))]
+        HdrList.append([])
+      elif HdrList[cntr - 5] == 'KEY ':
+        VarNum=unpack('%d' % VarName[1] + 'I', bf.read(BlkLenBef[cntr]))
+        VarNameFull=[]
+        VarUdmFull=[]
+        NamCntr=0
+        VarPos = VarPos + (VarName[1]+1,)
+        VarSrchPos=[0]
+        itm_x_Var = []
+        for k in range(0,len(VarNam)):
+          itm_x_Var.append(VarPos[k+1]-VarPos[k])
+        if len(itm_x_Var) != len(VarNam):
+          print("Number of variables different from number of items of offset array")
+          print(itm_x_Var)
+          print(len(VarNam))
+          break
+        Items_Tot = sum(itm_x_Var)
+        if Items_Tot != len(VarNum):
+          print("Somma degli item da associare ad ogni variabile è diversa dalla somma di tutti gli items id VarNum")
+        VarNum_Cntr =0
+        Var_dict = {}
+        for i,Var in enumerate(VarNam):
+          NumOfItems = itm_x_Var[i]
+          end = VarNum_Cntr + NumOfItems
+          Var_dict[Var] = list(VarNum[VarNum_Cntr:end])
+          VarNum_Cntr = VarNum_Cntr+NumOfItems
+        for key in Var_dict.keys():
+          for element in Var_dict[key]:
+            if element == 0:
+              VarNameFull.append(str(key).strip())
+            else:
+              VarNameFull.append(key.strip()+'_%d' %element)
+        for i,item in enumerate(itm_x_Var):
+          for k in range(0,item):
+            VarUdmFull.append(VarUdm[i].strip())
+        VarNameFull=['TIME','CPU','DT','UNKN03']+VarNameFull
+        VarUdmFull=['sec','','','']+VarUdmFull
+        for Nam in VarSrch:
+          VarSrchPos.append(VarNameFull.index(Nam.strip()))
+        VarUdmFull=[VarUdmFull[i] for i in VarSrchPos]
+        SwapPosVarSrch=sorted(range(len(VarSrchPos)), key=lambda k: VarSrchPos[k])
+        SwapPosVarSrch=sorted(range(len(SwapPosVarSrch)), key=lambda k: SwapPosVarSrch[k])
+        VarSrchPos.sort()
+        VarSrchPos.append(VarName[1]+4)
+        HdrList.append([])
+      elif HdrList[cntr - 1] == '.TR/':
+        DataPos.append(bf.tell())
+        bf.seek(BlkLenBef[cntr], 1)
+        HdrList.append([])
+      else:
+        HdrList.append([])
+      BlkLenAft.append(unpack('I', bf.read(4))[0])
+
+      cntr +=1
+
+  data=np.empty([len(DataPos), len(VarSrch)+1])*np.nan
+
+  with open(fileDir, 'rb') as bf:
+    for i,Pos in enumerate(DataPos):
+      bf.seek(Pos, 0)
+      for j in range(len(VarSrchPos)-1):
+        data[i,j]=unpack('f', bf.read(4))[0]
+        bf.seek((VarSrchPos[j+1]-VarSrchPos[j])*4-4, 1)
+
+  data=data[:,SwapPosVarSrch]
+
+  return data[:,0],data[:,1:],VarUdmFull[1:]

tests/framework/CodeInterfaceTests/test_melcor_interface.xml

@@ -20,7 +20,6 @@
   <RunInfo>
     <WorkingDir>MelcorInterface</WorkingDir>
     <Sequence>testMelcor,dumpResults</Sequence>
-    <batchSize>1</batchSize>
   </RunInfo>
 
   <Files>
@@ -29,8 +28,8 @@
 
   <Models>
 	<Code name="MELGEN" subType="Melcor">
-	  <executable>MELCOR_2.2/bin/melcor</executable>
-	  <preexec>MELCOR_2.2/bin/melgen</preexec>
+	  <executable></executable>
+	  <!--preexec>MELCOR_2.2/bin/melgen</preexec-->
 	  <clargs arg="" extension=".inp" type="input"/>
 	  <CodePlotFile>MELPTF.PTF</CodePlotFile>
 	  <variables>CVH-P_1</variables>

tests/framework/CodeInterfaceTests/tests

@@ -78,6 +78,7 @@
    output = 'GenericInterface/samples.xml GenericInterface/sample/1/testSubDirectory/dummy_file_for_subdirectory.dummy GenericInterface/sample/testSubDirectory/dummy_file_for_subdirectory.dummy'
    csv = 'GenericInterface/samples.csv'
  [../]
+
  [./genericInterfaceParallel]
    type = 'RavenFramework'
    input = 'generic_parallel.xml'