fix cluster tests (#566)

* fix cluster tests * fix parallelPP test
idaholab · Feb 3, 2018 · 7c58f90 · 7c58f90
1 parent 82bae95
commit 7c58f90
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/tests/cluster_tests/InternalParallel/test_internal_parallel_PP_LS.xml b/tests/cluster_tests/InternalParallel/test_internal_parallel_PP_LS.xml
@@ -31,6 +31,7 @@
       <integralType>MonteCarlo</integralType>
       <seed>20021986</seed>
       <target>goalFunctionForLimitSurface</target>
+      <outputName>EventProbability</outputName>
       <variable name="x0">
         <distribution>x0_distrib</distribution>
       </variable>
@@ -43,6 +44,7 @@
       <integralType>MonteCarlo</integralType>
       <seed>20021986</seed>
       <target>goalFunctionForLimitSurface</target>
+      <outputName>EventProbability</outputName>
       <variable name="x0">
         <lowerBound>-2.0</lowerBound>
         <upperBound>12.0</upperBound>
@@ -116,14 +118,12 @@
       <Model class="Models" type="PostProcessor">LimitSurfaceIntegralWeighted</Model>
       <Output class="DataObjects" type="PointSet">LimitSurfaceWeightedPb</Output>
       <Output class="OutStreams" type="Print">LimitSurfaceWeightedPb_dump</Output>
-      <Output class="Files" type="">LimitSurfaceWeightedPb_FileObj.csv</Output>
     </PostProcess>
     <PostProcess name="ComputeLimitSurfaceIntegralUnWeighted">
       <Input class="DataObjects" type="PointSet">LimitSurfacePositiveNegative</Input>
       <Model class="Models" type="PostProcessor">LimitSurfaceIntegralUnWeightedWithBounds</Model>
       <Output class="DataObjects" type="PointSet">LimitSurfaceUnWeightedPb</Output>
       <Output class="OutStreams" type="Print">LimitSurfaceUnWeightedPb_dump</Output>
-      <Output class="Files" type="">LimitSurfaceUnWeightedPb_FileObj.csv</Output>
     </PostProcess>
   </Steps>
 
@@ -157,11 +157,11 @@
     </PointSet>
     <PointSet name="LimitSurfaceWeightedPb">
       <Input>x0,y0</Input>
-      <Output>goalFunctionForLimitSurface</Output>
+      <Output>EventProbability, goalFunctionForLimitSurface</Output>
     </PointSet>
     <PointSet name="LimitSurfaceUnWeightedPb">
       <Input>x0,y0</Input>
-      <Output>goalFunctionForLimitSurface</Output>
+      <Output>EventProbability, goalFunctionForLimitSurface</Output>
     </PointSet>
     <PointSet name="Dummy">
       <Input>x0,y0</Input>

diff --git a/tests/cluster_tests/simple_gp_test.i b/tests/cluster_tests/simple_gp_test.i
@@ -1,5 +1,5 @@
 [outputParams]
-  names = "pipe_Area pipe_Hw pipe_Tw"
-  start = "2.0 3.0 5.0"
-  increment = "0.5 0.1 -0.5"
+  names = "pipe_Area pipe_Hw pipe_Tw time"
+  start = "2.0 3.0 5.0 0.0"
+  increment = "0.5 0.1 -0.5 1.0"
 []
diff --git a/tests/cluster_tests/test_pbspro.sh b/tests/cluster_tests/test_pbspro.sh
@@ -119,7 +119,7 @@ rm -Rf InternalParallelPostProcessorLS/*.csv
 
 python ../../../framework/Driver.py test_internal_parallel_PP_LS.xml ../pbspro_mpi.xml ../cluster_runinfo.xml
 
-wait_lines 'InternalParallelPostProcessorLS/*.csv' 6 parallelPP
+wait_lines 'InternalParallelPostProcessorLS/*.csv' 4 parallelPP
 
 cd ..
 

diff --git a/tests/cluster_tests/test_qsubs.sh b/tests/cluster_tests/test_qsubs.sh
@@ -117,7 +117,7 @@ rm -Rf InternalParallelPostProcessorLS/*.csv
 
 python ../../../framework/Driver.py test_internal_parallel_PP_LS.xml ../pbspro_mpi.xml ../cluster_runinfo_legacy.xml
 
-wait_lines 'InternalParallelPostProcessorLS/*.csv' 6 parallelPP
+wait_lines 'InternalParallelPostProcessorLS/*.csv' 4 parallelPP
 
 cd ..
 

diff --git a/tests/cluster_tests/torque_test.sh b/tests/cluster_tests/torque_test.sh
@@ -117,7 +117,7 @@ rm -Rf InternalParallelPostProcessorLS/*.csv
 
 python ../../../framework/Driver.py test_internal_parallel_PP_LS.xml ../torque_mpi.xml ../cluster_runinfo.xml
 
-wait_lines 'InternalParallelPostProcessorLS/*.csv' 6 parallelPP
+wait_lines 'InternalParallelPostProcessorLS/*.csv' 4 parallelPP
 
 cd ..
-Original file line number
+Diff line change
@@ Expand Up / @@ -119,7 +119,7 @@ rm -Rf InternalParallelPostProcessorLS/*.csv @@
     python ../../../framework/Driver.py test_internal_parallel_PP_LS.xml ../pbspro_mpi.xml ../cluster_runinfo.xml
-    wait_lines 'InternalParallelPostProcessorLS/*.csv' 6 parallelPP
+    wait_lines 'InternalParallelPostProcessorLS/*.csv' 4 parallelPP
     cd ..
@@ Expand Down @@