Merge pull request #13699 from rmcdermo/master

FDS Verification: add ulmat and ulmat hypre to dancing eddies iterations and timing

Author: rmcdermo

Utilities/Matlab/FDS_verification_dataplot_inputs.csv

@@ -106,10 +106,14 @@ d,convective_cooling,Heat_Transfer/convective_cooling_p1_git.txt,Heat_Transfer/c
 d,couch,Fires/couch_git.txt,Fires/couch.csv,1,2,Time,HRR,Expected HRR,k--,0,100000,,120,240,-1.00E+09,1.00E+09,0,Fires/couch_hrr.csv,2,3,Time,HRR,FDS (HRR),k-,0,100000,,120,240,-1.00E+09,1.00E+09,0,Heat Release Rate (couch),Time (min),Heat Release Rate (kW),0,10,60,0,4000,1,no,0.05 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/couch,Relative Error,max,0.2,Fires,r*,r,TeX
 d,cyl_test,Flowfields/cyl_test_1_git.txt,Flowfields/cyl_test_1_devc.csv,2,3,Time,temp1,?y=2 mm,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Flowfields/cyl_test_2_devc.csv,2,3,Time,temp2,?y=2 cm,r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,"Cylindrical Test, LES (cyl\_test\_1-2)",Time (s),Temperature (°C),0,20,1,0,100,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/cyl_test,Relative Error,end,0.01,Flowfields,r^,r,TeX
 d,cyl_test,Flowfields/cyl_test_3_git.txt,Flowfields/cyl_test_3_devc.csv,2,3,Time,temp1,?y=2 mm,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Flowfields/cyl_test_4_devc.csv,2,3,Time,temp1,?y=4 cm,r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,"Cylindrical Test, DNS (cyl\_test\_3-4)",Time (s),Temperature (°C),0,3,1,0,2000,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/cyl_test_3-4,Relative Error,end,0.01,Flowfields,r^,r,TeX
-d,dancing_eddies,Pressure_Solver/dancing_eddies_tight_git.txt,Pressure_Solver/dancing_eddies_tight_devc.csv,2,3,Time,iter,Preconditioner,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/dancing_eddies_tight_no_precon_devc.csv,2,3,Time,iter,No Preconditioner,r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure Iterations (dancing\_eddies),Time (s),Pressure Iterations,0,2,1,0,100,1,no,0.05 0.90,West,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/dancing_eddies_iterations,N/A,end,0,Pressure Solver,kd,k,TeX
-f,dancing_eddies,Pressure_Solver/dancing_eddies_tight_git.txt,Pressure_Solver/dancing_eddies_tight_devc.csv,2,3,Time,iter,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/dancing_eddies_uglmat_devc.csv,2,3,Time,iter,UGLMAT,b-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure Iterations (dancing\_eddies),Time (s),Pressure Iterations,0,2,1,0,100,1,no,0.05 0.90,West,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/dancing_eddies_iterations,N/A,end,0,Pressure Solver,kd,k,TeX
+d,dancing_eddies,Pressure_Solver/dancing_eddies_tight_git.txt,Pressure_Solver/dancing_eddies_tight_devc.csv,2,3,Time,iter,Preconditioner,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/dancing_eddies_tight_no_precon_devc.csv,2,3,Time,iter,No Preconditioner,k--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure Iterations (dancing\_eddies),Time (s),Pressure Iterations,0,2,1,0,100,1,no,0.05 0.90,West,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/dancing_eddies_iterations,N/A,end,0,Pressure Solver,kd,k,TeX
+f,dancing_eddies,Pressure_Solver/dancing_eddies_tight_git.txt,Pressure_Solver/dancing_eddies_tight_devc.csv,2,3,Time,iter,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/dancing_eddies_uglmat_devc.csv,2,3,Time,iter,UGLMAT,r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure Iterations (dancing\_eddies),Time (s),Pressure Iterations,0,2,1,0,100,1,no,0.05 0.90,West,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/dancing_eddies_iterations,N/A,end,0,Pressure Solver,kd,k,TeX
+f,dancing_eddies,Pressure_Solver/dancing_eddies_tight_git.txt,Pressure_Solver/dancing_eddies_tight_devc.csv,2,3,Time,iter,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/dancing_eddies_ulmat_devc.csv,2,3,Time,iter,ULMAT,b-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure Iterations (dancing\_eddies),Time (s),Pressure Iterations,0,2,1,0,100,1,no,0.05 0.90,West,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/dancing_eddies_iterations,N/A,end,0,Pressure Solver,kd,k,TeX
+f,dancing_eddies,Pressure_Solver/dancing_eddies_tight_git.txt,Pressure_Solver/dancing_eddies_tight_devc.csv,2,3,Time,iter,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/dancing_eddies_ulmat_hypre_devc.csv,2,3,Time,iter,ULMAT HYPRE,g-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure Iterations (dancing\_eddies),Time (s),Pressure Iterations,0,2,1,0,100,1,no,0.05 0.90,West,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/dancing_eddies_iterations,N/A,end,0,Pressure Solver,kd,k,TeX
 d,dancing_eddies,Pressure_Solver/dancing_eddies_tight_git.txt,Pressure_Solver/dancing_eddies_tight_devc.csv,2,3,Time,cpu,Preconditioner,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/dancing_eddies_tight_no_precon_devc.csv,2,3,Time,cpu,No Preconditioner,k--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,CPU Time (dancing\_eddies),Simulated Time (s),CPU Time (s),0,2,1,0,400,1,no,0.05 0.90,West,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/dancing_eddies_tight_precon,N/A,end,0,Pressure Solver,kd,k,TeX
-f,dancing_eddies,Pressure_Solver/dancing_eddies_tight_git.txt,Pressure_Solver/dancing_eddies_tight_devc.csv,2,3,Time,cpu,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/dancing_eddies_uglmat_devc.csv,2,3,Time,cpu,UGLMAT,b-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,CPU Time (dancing\_eddies),Simulated Time (s),CPU Time (s),0,2,1,0,400,1,no,0.05 0.90,West,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/dancing_eddies_tight_precon,N/A,end,0,Pressure Solver,kd,k,TeX
+f,dancing_eddies,Pressure_Solver/dancing_eddies_tight_git.txt,Pressure_Solver/dancing_eddies_tight_devc.csv,2,3,Time,cpu,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/dancing_eddies_uglmat_devc.csv,2,3,Time,cpu,UGLMAT,r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,CPU Time (dancing\_eddies),Simulated Time (s),CPU Time (s),0,2,1,0,400,1,no,0.05 0.90,West,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/dancing_eddies_tight_precon,N/A,end,0,Pressure Solver,kd,k,TeX
+f,dancing_eddies,Pressure_Solver/dancing_eddies_tight_git.txt,Pressure_Solver/dancing_eddies_tight_devc.csv,2,3,Time,cpu,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/dancing_eddies_ulmat_devc.csv,2,3,Time,cpu,ULMAT,b-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,CPU Time (dancing\_eddies),Simulated Time (s),CPU Time (s),0,2,1,0,400,1,no,0.05 0.90,West,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/dancing_eddies_tight_precon,N/A,end,0,Pressure Solver,kd,k,TeX
+f,dancing_eddies,Pressure_Solver/dancing_eddies_tight_git.txt,Pressure_Solver/dancing_eddies_tight_devc.csv,2,3,Time,cpu,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/dancing_eddies_ulmat_hypre_devc.csv,2,3,Time,cpu,ULMAT HYPRE,g-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,CPU Time (dancing\_eddies),Simulated Time (s),CPU Time (s),0,2,1,0,400,1,no,0.05 0.90,West,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/dancing_eddies_tight_precon,N/A,end,0,Pressure Solver,kd,k,TeX
 d,dancing_eddies,Pressure_Solver/dancing_eddies_tight_git.txt,Pressure_Solver/dancing_eddies_1mesh_devc.csv,2,3,Time,pres,"FDS, 1 mesh",k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/dancing_eddies_tight_devc.csv,2,3,Time,pres,"FDS, 4 mesh, tol=1E-5 m/s",r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure (dancing\_eddies\_tight),Time (s),Pressure (Pa),0,2,1,-0.3,0.2,1,no,0.05 0.90,SouthWest,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/dancing_eddies_tight,Absolute Error,end,0.3,Pressure Solver,kd,k,TeX
 d,dancing_eddies,Pressure_Solver/dancing_eddies_default_git.txt,Pressure_Solver/dancing_eddies_1mesh_devc.csv,2,3,Time,pres,"FDS, 1 mesh",k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/dancing_eddies_default_devc.csv,2,3,Time,pres,"FDS, 4 mesh, tol=5E-4 m/s",r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure (dancing\_eddies\_default),Time (s),Pressure (Pa),0,2,1,-0.3,0.2,1,no,0.05 0.90,SouthWest,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/dancing_eddies_default,Absolute Error,end,0.01,Pressure Solver,kd,k,TeX
 d,dancing_eddies,Pressure_Solver/dancing_eddies_uglmat_git.txt,Pressure_Solver/dancing_eddies_1mesh_devc.csv,2,3,Time,pres,"FDS, 1 mesh",k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/dancing_eddies_uglmat_devc.csv,2,3,Time,pres,"FDS, 4 mesh, uglmat",r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure (dancing\_eddies\_uglmat),Time (s),Pressure (Pa),0,2,1,-0.3,0.2,1,no,0.05 0.90,SouthWest,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/dancing_eddies_uglmat,Absolute Error,end,0.01,Pressure Solver,kd,k,TeX

Verification/Pressure_Solver/dancing_eddies_ulmat.fds

@@ -30,6 +30,7 @@
 &DEVC XYZ=0.2,0.,0.0, QUANTITY='PRESSURE', ID='pres' /
 &DEVC XYZ=0.,0.,0.,   QUANTITY='MAXIMUM VELOCITY ERROR', ID='error' /
 &DEVC XYZ=0.,0.,0.,   QUANTITY='PRESSURE ITERATIONS', ID='iter' /
+&DEVC XYZ=0.,0.,0.,   QUANTITY='CPU TIME', ID='cpu' /
 
 &TAIL /
 

Verification/Pressure_Solver/dancing_eddies_ulmat_hypre.fds

@@ -30,6 +30,7 @@
 &DEVC XYZ=0.2,0.,0.0, QUANTITY='PRESSURE', ID='pres' /
 &DEVC XYZ=0.,0.,0.,   QUANTITY='MAXIMUM VELOCITY ERROR', ID='error' /
 &DEVC XYZ=0.,0.,0.,   QUANTITY='PRESSURE ITERATIONS', ID='iter' /
+&DEVC XYZ=0.,0.,0.,   QUANTITY='CPU TIME', ID='cpu' /
 
 &TAIL /