From a344d814d38b520f75327952f0c640775e745dbb Mon Sep 17 00:00:00 2001 From: Jimmy-INL <52417034+Jimmy-INL@users.noreply.github.com> Date: Tue, 24 Sep 2019 08:30:47 -0600 Subject: [PATCH] Removing sort from RELAPparser.py (#1024) * updated submodule moose * Revert "updated submodule moose" This reverts commit da66d5150dc975e3aa9842cbfb3815238fada553. * Removing sorting from RELAPparser, and fixing a typo in the user manual: colon separated string, instead of column separated string for the string * loosening up the tolerance for the GP test --- doc/user_manual/runInfo.tex | 6 +++--- framework/CodeInterfaces/RELAP5/RELAPparser.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/user_manual/runInfo.tex b/doc/user_manual/runInfo.tex index 091fdb2e14..b2927b38ab 100644 --- a/doc/user_manual/runInfo.tex +++ b/doc/user_manual/runInfo.tex @@ -79,7 +79,7 @@ \subsection{RunInfo: Input of Calculation Flow} Since the main thread is also responsible for collecting the results of previously finished jobs, it is possible that faster jobs may complete before the main thread can replenish the queue. - By increasing this value, you are allowing RAVEN to consume more memory + By increasing this value, you are allowing RAVEN to consume more memory in order to stage more jobs, placing them in a pending job queue, with the benefit that slower job collection times will be masked as the job handler will flush the complete jobs and run whatever is available on the pending @@ -246,7 +246,7 @@ \subsection{RunInfo: Input of Queue Modes} % RAVEN currently supports one pre-defined ``mode'': \begin{itemize} - \item \textbf{mpi}: this ``mode'' uses \xmlNode{MPIExec} command (default: \texttt{mpiexec}) + \item \textbf{mpi}: this ``mode'' uses \xmlNode{MPIExec} command (default: \texttt{mpiexec}) to distribute the running program; more information regarding this protocol can be found in~\cite{MPI}. Mode ``MPI'' can either generate a \texttt{qsub} command or can execute @@ -332,7 +332,7 @@ \subsection{RunInfo: Input of Queue Modes} \default{PBS PROFESSIONAL} %%%%%% EXPECTED TIME -\item \xmlNode{expectedTime}, \xmlDesc{colum separated string, optional field +\item \xmlNode{expectedTime}, \xmlDesc{colon separated string, optional field (mpi or custom mode)}, specifies the time the whole calculation is expected to last. % diff --git a/framework/CodeInterfaces/RELAP5/RELAPparser.py b/framework/CodeInterfaces/RELAP5/RELAPparser.py index 623eace47e..af814f70c5 100644 --- a/framework/CodeInterfaces/RELAP5/RELAPparser.py +++ b/framework/CodeInterfaces/RELAP5/RELAPparser.py @@ -143,7 +143,7 @@ def modifyOrAdd(self,dictionaryList,save=True): if self.maxNumberOfDecks > 1: temp.append('*'+' deckNum: '+str(deckNum)+'\n') for j in sorted(modiDictionaryList): - for var in sorted(modiDictionaryList[j]): + for var in modiDictionaryList[j]: temp.append('* card: '+j+' word: '+str(var['position'])+' value: '+str(var['value'])+'\n') temp.append('*RAVEN INPUT VALUES\n')