Merge pull request #5270 from drjfloyd/master

FDS Validation: Waterloo Methanol Updates (not .125)
firemodels · Jul 21, 2017 · c96cd18 · c96cd18
2 parents abdb304 + 174c3a0
commit c96cd18
Show file tree

Hide file tree

Showing 9 changed files with 1,980 additions and 1,019 deletions.
diff --git a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_0p25cm.fds b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_0p25cm.fds
diff --git a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_0p5cm.fds b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_0p5cm.fds
diff --git a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_1cm.fds b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_1cm.fds
diff --git a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_2cm.fds b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_2cm.fds
diff --git a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_0p25cm.fds b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_0p25cm.fds
diff --git a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_0p5cm.fds b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_0p5cm.fds
diff --git a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_1cm.fds b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_1cm.fds
diff --git a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_2cm.fds b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_2cm.fds
diff --git a/Validation/Waterloo_Methanol/Run_All.sh b/Validation/Waterloo_Methanol/Run_All.sh
@@ -5,14 +5,17 @@
 export SVNROOT=`pwd`/../..
 source $SVNROOT/Validation/Common_Run_All.sh
 
-$QFDS $DEBUG -p 16 $QUEUE -d $INDIR Waterloo_Methanol_Prescribed_1cm.fds
-$QFDS $DEBUG -p 16 $QUEUE -d $INDIR Waterloo_Methanol_Predicted_1cm.fds
+$QFDS $DEBUG -p 1 $QUEUE -d $INDIR Waterloo_Methanol_Prescribed_2cm.fds
+$QFDS $DEBUG -p 1 $QUEUE -d $INDIR Waterloo_Methanol_Predicted_2cm.fds
 
-$QFDS $DEBUG -p 32 $QUEUE -d $INDIR Waterloo_Methanol_Prescribed_0p5cm.fds
-$QFDS $DEBUG -p 32 $QUEUE -d $INDIR Waterloo_Methanol_Predicted_0p5cm.fds
+$QFDS $DEBUG -p 8 $QUEUE -d $INDIR Waterloo_Methanol_Prescribed_1cm.fds
+$QFDS $DEBUG -p 8 $QUEUE -d $INDIR Waterloo_Methanol_Predicted_1cm.fds
 
-$QFDS $DEBUG -p 32 $QUEUE -d $INDIR Waterloo_Methanol_Prescribed_0p25cm.fds
-$QFDS $DEBUG -p 32 $QUEUE -d $INDIR Waterloo_Methanol_Predicted_0p25cm.fds
+$QFDS $DEBUG -p 16 $QUEUE -d $INDIR Waterloo_Methanol_Prescribed_0p5cm.fds
+$QFDS $DEBUG -p 16 $QUEUE -d $INDIR Waterloo_Methanol_Predicted_0p5cm.fds
+
+$QFDS $DEBUG -p 64 $QUEUE -d $INDIR Waterloo_Methanol_Prescribed_0p25cm.fds
+$QFDS $DEBUG -p 64 $QUEUE -d $INDIR Waterloo_Methanol_Predicted_0p25cm.fds
 
 #$QFDS $DEBUG -p 128 -n 8 $QUEUE -d $INDIR Waterloo_Methanol_Prescribed_0p125cm.fds
 #$QFDS $DEBUG -p 128 -n 8 $QUEUE -d $INDIR Waterloo_Methanol_Predicted_0p125cm.fds