Merge pull request #5603 from mcgratta/master

FDS Verification: Minor reorg of vegetation cases

Utilities/Matlab/FDS_verification_dataplot_inputs.csv

@@ -361,13 +361,8 @@ d,tmp_lower_limit,Fires/tmp_lower_limit_dt_p001_git.txt,Fires/tmp_lower_limit.cs
 d,tunnel_demo,Pressure_Solver/tunnel_demo_git.txt,Pressure_Solver/tunnel_demo.csv,1,2,iter,v_target,Velocity Error Tolerance,k--,3000,3050,,0,100000,0,Pressure_Solver/tunnel_demo_pressit.csv,1,2,Total,Velocity Error,FDS (Velocity Error),k-o,3000,3050,,0,100000,0,Velocity Error (tunnel\_demo),Iteration,Error (m/s),3000,3050,1,0,10,1,no,0.05 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/tunnel_demo_velocity,Absolute Error,min,100,Pressure_Solver,kd,k
 d,tunnel_demo,Pressure_Solver/tunnel_demo_git.txt,Pressure_Solver/tunnel_demo.csv,1,2,iter,p_target,Pressure Error Tolerance,k--,3000,3050,,0,100000,0,Pressure_Solver/tunnel_demo_pressit.csv,1,2,Total,Pressure Error,FDS (Pressure Error),k-o,3000,3050,,0,100000,0,Pressure Error (tunnel\_demo),Iteration,Error (1/s^2),3000,3050,1,0,20000,1,no,0.05 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/tunnel_demo_pressure,Absolute Error,min,100000,Pressure_Solver,kd,k
 d,two_step_solid_reaction,Pyrolysis/two_step_solid_reaction_git.txt,Pyrolysis/two_step_solid_reaction.csv,1,2,Time,Ya|Yb|Yc,Analytical (Ya)|Analytical (Yb)|Analytical (Yc),go|ro|ko,0,100000,,0,100000,0,Pyrolysis/two_step_solid_reaction_devc.csv,2,3,Time,Ya|Yb|Yc,FDS (Ya)|FDS (Yb)|FDS (Yc),g-|r-|k-,0,100000,,0,100000,0,Solid Density (two\_step\_solid\_reaction),Time (s),Mass Fraction,0,30,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/two_step_solid_reaction,Absolute Error,end,0.01,Pyrolysis,kd,k
-d,vege_mass_conservation,Vegetation/vege_mass_conservation_git.txt,Vegetation/vege_mass_conservation.csv,1,2,Time,fuel_gas_mass|water_vapor_mass|solid_mass|total_mass,Expected (fuel\_gas\_mass)|Expected (water\_vapor\_mass)|Expected (solid\_mass)|Expected (total\_mass),ro|bo|ko|go,0,100000,,0,100000,0,Vegetation/vege_mass_conservation_devc.csv,2,3,Time,fuel_gas_mass|water_vapor_mass|solid_mass|total_mass,FDS (fuel\_gas\_mass)|FDS (water\_vapor\_mass)|FDS (solid\_mass)|FDS (total\_mass),r-|b-|k-|g-,0,100000,,0,100000,0,Mass Balance (vege\_mass\_conservation),Time (s),Mass (kg),0,10,1,0,1.2,1,no,0.05 0.90,EastOutside,,1.5,linear,FDS_Verification_Guide/SCRIPT_FIGURES/vege_mass_conservation,Relative Error,end,0.01,Vegetation,g^,g
-d,vege_pressure-drop_cylinder_MPUV2pt0,Vegetation/vege_pressure-drop_cylinder_MPUV2pt0_git.txt,Vegetation/vege_pressure-drop_cylinder_MPUV2pt0.csv,1,2,Time,pressure difference,Expected (pressure difference),ko,0,40000,,30,40,0,Vegetation/vege_pressure-drop_cylinder_MPUV2pt0_devc.csv,2,3,Time,pressure difference,FDS (pressure difference),k-,0,40000,,30,40,0,vege\_pressure-drop\_cylinder\_MPUV2pt0,Time (s),Pressure (Pa),0,40,1,0,30,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/vege_pressure-drop_cylinder_MPUV2pt0,Relative Error,mean,0.05,Vegetation,g^,g
-d,vege_pressure-drop_cylinder_MPUV30pt0,Vegetation/vege_pressure-drop_cylinder_MPUV30pt0_git.txt,Vegetation/vege_pressure-drop_cylinder_MPUV30pt0.csv,1,2,Time,pressure difference,Expected (pressure difference),ko,0,40000,,30,40,0,Vegetation/vege_pressure-drop_cylinder_MPUV30pt0_devc.csv,2,3,Time,pressure difference,FDS (pressure difference),k-,0,40000,,30,40,0,vege\_pressure-drop\_cylinder\_MPUV30pt0,Time (s),Pressure (Pa),0,40,1,0,500,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/vege_pressure-drop_cylinder_MPUV30pt0,Relative Error,mean,0.1,Vegetation,g^,g
-d,vege_pressure-drop_sphere_MPUV2pt0,Vegetation/vege_pressure-drop_sphere_MPUV2pt0_git.txt,Vegetation/vege_pressure-drop_sphere_MPUV2pt0.csv,1,2,Time,pressure difference,Expected (pressure difference),ko,0,40000,,30,40,0,Vegetation/vege_pressure-drop_sphere_MPUV2pt0_devc.csv,2,3,Time,pressure difference,FDS (pressure difference),k-,0,40000,,30,40,0,vege\_pressure-drop\_sphere\_MPUV2pt0,Time (s),Pressure (Pa),0,40,1,0,30,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/vege_pressure-drop_sphere_MPUV2pt0,Relative Error,mean,0.05,Vegetation,g^,g
-d,vege_pressure-drop_sphere_MPUV30pt0,Vegetation/vege_pressure-drop_sphere_MPUV30pt0_git.txt,Vegetation/vege_pressure-drop_sphere_MPUV30pt0.csv,1,2,Time,pressure difference,Expected (pressure difference),ko,0,40000,,30,40,0,Vegetation/vege_pressure-drop_sphere_MPUV30pt0_devc.csv,2,3,Time,pressure difference,FDS (pressure difference),k-,0,40000,,30,40,0,vege\_pressure-drop\_sphere\_MPUV30pt0,Time (s),Pressure (Pa),0,40,1,0,500,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/vege_pressure-drop_sphere_MPUV30pt0,Relative Error,mean,0.12,Vegetation,g^,g
-d,vegetation_drag_1,Sprinklers_and_Sprays/vegetation_drag_1_git.txt,Sprinklers_and_Sprays/vegetation_drag_1.csv,1,2,Time,Pressure|Pressure|Pressure,Ideal (Pressure)|Ideal (Pressure)|Ideal (Pressure),ko|ko|ko,0,100000,,0,100000,0,Sprinklers_and_Sprays/vegetation_drag_1_devc.csv,2,3,Time,p1|p2|p3,FDS (p1)|FDS (p2)|FDS (p3),k-|r-|g-,0,100000,,0,100000,0,Vegetation Drag (vegetation\_drag\_1),Time (s),Pressure Drop (Pa),0,10,1,0,30,1,no,0.05 0.90,South,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/vegetation_drag_1,Relative Error,end,0.03,Sprinklers and Sprays,bs,b
-d,vegetation_drag_2,Sprinklers_and_Sprays/vegetation_drag_2_git.txt,Sprinklers_and_Sprays/vegetation_drag_2.csv,1,2,Time,Pressure|Pressure|Pressure,Ideal (Pressure)|Ideal (Pressure)|Ideal (Pressure),ko|ko|ko,0,100000,,0,100000,0,Sprinklers_and_Sprays/vegetation_drag_2_devc.csv,2,3,Time,p1|p2|p3,FDS (p1)|FDS (p2)|FDS (p3),k-|r-|g-,0,100000,,0,100000,0,Vegetation Drag (vegetation\_drag\_2),Time (s),Pressure Drop (Pa),0,10,1,0,12,1,no,0.05 0.90,South,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/vegetation_drag_2,Relative Error,end,0.02,Sprinklers and Sprays,bs,b
+d,vegetation_drag_1,WUI/vegetation_drag_1_git.txt,WUI/vegetation_drag_1.csv,1,2,Time,Pressure|Pressure|Pressure,Ideal (Pressure)|Ideal (Pressure)|Ideal (Pressure),ko|ko|ko,0,100000,,0,100000,0,WUI/vegetation_drag_1_devc.csv,2,3,Time,p1|p2|p3,FDS (p1)|FDS (p2)|FDS (p3),k-|r-|g-,0,100000,,0,100000,0,Vegetation Drag (vegetation\_drag\_1),Time (s),Pressure Drop (Pa),0,10,1,0,30,1,no,0.05 0.90,South,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/vegetation_drag_1,Relative Error,end,0.03,Sprinklers and Sprays,bs,b
+d,vegetation_drag_2,WUI/vegetation_drag_2_git.txt,WUI/vegetation_drag_2.csv,1,2,Time,Pressure|Pressure|Pressure,Ideal (Pressure)|Ideal (Pressure)|Ideal (Pressure),ko|ko|ko,0,100000,,0,100000,0,WUI/vegetation_drag_2_devc.csv,2,3,Time,p1|p2|p3,FDS (p1)|FDS (p2)|FDS (p3),k-|r-|g-,0,100000,,0,100000,0,Vegetation Drag (vegetation\_drag\_2),Time (s),Pressure Drop (Pa),0,10,1,0,12,1,no,0.05 0.90,South,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/vegetation_drag_2,Relative Error,end,0.02,Sprinklers and Sprays,bs,b
 d,velocity_bc_test,Flowfields/velocity_bc_test_git.txt,Flowfields/velocity_bc_test_line.csv,2,3,x1v,Vel1,Thin Plate (Vel1),k-,-6,21,,-6,21,0,Flowfields/velocity_bc_test_line.csv,2,3,x1v,Vel2|Vel3,Solid Block (Vel2)|Thick Plate (Vel3),r-|g-,-6,21,,-6,21,0,Centerline Velocity (velocity\_bc\_test),Distance (m),Velocity (m/s),-5,20,1,0,3,1,no,0.05 0.90,SouthWest,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/velocity_bc_test_vel,Relative Error,mean_1_2,0.03,Flowfields,kd,k
 d,velocity_bc_test,Flowfields/velocity_bc_test_git.txt,Flowfields/velocity_bc_test_line.csv,2,3,x1p,Pres1,Thin Plate (Pres1),k-,-6,21,,-6,21,0,Flowfields/velocity_bc_test_line.csv,2,3,x1p,Pres2|Pres3,Solid Block (Pres2)|Thick Plate (Pres3),r-|g-,-6,21,,-6,21,0,Centerline Pressure (velocity\_bc\_test),Distance (m),Pressure (Pa),-5,20,1,-0.5,1,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/velocity_bc_test_pres,Absolute Error,mean_1_2,0.05,Flowfields,kd,k
 d,volume_flow_1,Flowfields/volume_flow_1_git.txt,Flowfields/volume_flow.csv,1,2,Time,vflow,Expected,ko,0,100000,,50,100,0,Flowfields/volume_flow_1_devc.csv,2,3,Time,vflow,FDS,k-,0,100000,,50,100,0,Flow Test (volume\_flow\_1),Time (s),Volume Flow (m^3/s),0,100,1,0,0.015,1,no,0.05 0.90,SouthEast,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/volume_flow_1,Relative Error,mean,0.01,Flowfields,kd,k

Verification/FDS_Cases.sh

@@ -415,8 +415,6 @@ $QFDS -d Sprinklers_and_Sprays water_fuel_sprays.fds
 $QFDS -d Sprinklers_and_Sprays screen_drag_1.fds
 $QFDS -d Sprinklers_and_Sprays screen_drag_2.fds
 $QFDS -d Sprinklers_and_Sprays porous_media.fds
-$QFDS -d Sprinklers_and_Sprays vegetation_drag_1.fds
-$QFDS -d Sprinklers_and_Sprays vegetation_drag_2.fds
 $QFDS -d Sprinklers_and_Sprays water_evap_1_const_gamma.fds
 
 $QFDS -d Scalar_Analytical_Solution pulsating_FL0_16.fds
@@ -515,6 +513,8 @@ $QFDS -d WUI dragon_5a.fds
 $QFDS -d WUI pine_needles.fds
 $QFDS -d WUI random_walk_1.fds
 $QFDS -d WUI random_walk_2.fds
+$QFDS -d WUI vegetation_drag_1.fds
+$QFDS -d WUI vegetation_drag_2.fds
 
 $QFDS -p 4 -d Adaptive_Mesh_Refinement random_meshes.fds