Multiple Inputs for dummy models #2006
Conversation
mandd
added
priority_normal
task
|
Job Mingw Test on 8a75a8e : canceled by @joshua-cogliati-inl needs to restart |
|
Job Mingw Test on 8a75a8e : invalidated by @joshua-cogliati-inl civet was slow |
| if len(myInput)>1: | ||
| self.raiseAnError(IOError,'Only one input is accepted by the model type '+self.type+' with name'+self.name) | ||
|
|
There was a problem hiding this comment.
@mandd I guess we can remove this constraint for external model, but I think we still need it for ROM. Could you just remove this constraint in the external model.
ravenframework/Models/ROM.py
Outdated
| def _manipulateInput(self,dataIn): | ||
| """ | ||
| Method that is aimed to manipulate the input in order to return a common input understandable by this class | ||
| @ In, dataIn, object, the object that needs to be manipulated | ||
| @ Out, inRun, dict, the manipulated input | ||
| """ | ||
| if len(dataIn)>1: | ||
| self.raiseAnError(IOError,'Only one input is accepted by the model type '+self.type+' with name'+self.name) | ||
| inRun = super()._manipulateInput(dataIn) | ||
| return inRun |
There was a problem hiding this comment.
I think you can remove these lines. I think we only need to keep one check
ravenframework/Models/ROM.py
Outdated
| [(inputDict)],kwargs = super().createNewInput(myInput,samplerType,**kwargs) | ||
| return [(inputDict)],copy.deepcopy(kwargs) |
There was a problem hiding this comment.
It seems a little bit redundant here, may be you can do:
newInput, kwargs = super().createNewInput(myInput,samplerType,**kwargs)
return newInput, kwargsI think there is no need to do deep copy here, since the deep copy is handled in super class.
If you change the code, please also update the docstring.
There was a problem hiding this comment.
deepcopy removed, i kept the original format for consistency
ravenframework/Models/ROM.py
Outdated
| @@ -172,6 +172,35 @@ def applyRunInfo(self, runInfo): | |||
| """ | |||
| self.numThreads = runInfo.get('NumThreads', 1) | |||
|
|
|||
| def _manipulateInput(self,dataIn): | |||
There was a problem hiding this comment.
Can you remove this method from the ROM class? I think it is not needed. @mandd
The check has been performed in createNewInput
|
PR looks good, and checklist is satisfied. |
Pull Request Description
What issue does this change request address? (Use "#" before the issue to link it, i.e., #42.)
close #2005
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.
<internalParallel>to True.raven/tests/framework/user_guideandraven/docs/workshop) have been changed, the associated documentation must be reviewed and assured the text matches the example.