Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions Source/velo.f90
Original file line number Diff line number Diff line change
Expand Up @@ -2326,23 +2326,24 @@ SUBROUTINE VELOCITY_BC(T,NM,APPLY_TO_ESTIMATED_VARIABLES)

CASE (WALL_MODEL_BC) BOUNDARY_CONDITION

ITMP = MIN(I_MAX_TEMP,NINT(0.5_EB*(TMP(IIGM,JJGM,KKGM)+TMP(IIGP,JJGP,KKGP))))
MU_WALL = MU_RSQMW_Z(ITMP,1)/RSQ_MW_Z(1)
RHO_WALL = 0.5_EB*( RHOP(IIGM,JJGM,KKGM) + RHOP(IIGP,JJGP,KKGP) )

CALL WALL_MODEL(SLIP_COEF,U_TAU,Y_PLUS,MU_WALL/RHO_WALL,SF%ROUGHNESS,0.5_EB*DXX(ICD),VEL_GAS-VEL_T)

! SLIP_COEF = -1, no slip, VEL_GHOST = 2*VEL_T - VEL_GAS
! SLIP_COEF = 0, half slip, VEL_GHOST = VEL_T
! SLIP_COEF = 1, free slip, VEL_GHOST = VEL_GAS

IF ((IWM==0.OR.IWP==0) .AND. .NOT.ED%EXTERNAL) SLIP_COEF = 0._EB ! Corner
VEL_GHOST = VEL_T + SLIP_COEF*(VEL_GAS-VEL_T)
DUIDXJ(ICD_SGN) = I_SGN*(VEL_GAS-VEL_GHOST)/DXX(ICD)
MU_DUIDXJ(ICD_SGN) = RHO_WALL*U_TAU**2 * SIGN(1._EB,DUIDXJ(ICD_SGN))
IF ((IWM==0.OR.IWP==0) .AND. .NOT.ED%EXTERNAL) THEN ! Special case for a corner
VEL_GHOST = 2._EB*VEL_T - VEL_GAS
DUIDXJ(ICD_SGN) = I_SGN*(VEL_GAS-VEL_GHOST)/DXX(ICD)
MU_DUIDXJ(ICD_SGN) = MUA*DUIDXJ(ICD_SGN)
ELSE
ITMP = MIN(I_MAX_TEMP,NINT(0.5_EB*(TMP(IIGM,JJGM,KKGM)+TMP(IIGP,JJGP,KKGP))))
MU_WALL = MU_RSQMW_Z(ITMP,1)/RSQ_MW_Z(1)
RHO_WALL = 0.5_EB*( RHOP(IIGM,JJGM,KKGM) + RHOP(IIGP,JJGP,KKGP) )
CALL WALL_MODEL(SLIP_COEF,U_TAU,Y_PLUS,MU_WALL/RHO_WALL,SF%ROUGHNESS,0.5_EB*DXX(ICD),VEL_GAS-VEL_T)
VEL_GHOST = VEL_T + SLIP_COEF*(VEL_GAS-VEL_T)
DUIDXJ(ICD_SGN) = I_SGN*(VEL_GAS-VEL_GHOST)/DXX(ICD)
MU_DUIDXJ(ICD_SGN) = RHO_WALL*U_TAU**2 * SIGN(1._EB,DUIDXJ(ICD_SGN))
ENDIF
ALTERED_GRADIENT(ICD_SGN) = .TRUE.
! After stress and velocity gradient have been computed, reset VEL_GHOST to NO_SLIP for visualizaiton
! VEL_GHOST = 2._EB*VEL_T - VEL_GAS

CASE (BOUNDARY_FUEL_MODEL_BC) BOUNDARY_CONDITION

Expand Down
6 changes: 3 additions & 3 deletions Utilities/Matlab/FDS_verification_dataplot_inputs.csv
Original file line number Diff line number Diff line change
Expand Up @@ -480,8 +480,8 @@ d,Morvan_TGA,WUI/Morvan_TGA_git.txt,WUI/Morvan_Data_Mass.csv,1,2,T (C),Normalize
d,Morvan_TGA,WUI/Morvan_TGA_git.txt,WUI/Morvan_Data_SG_Deriv.csv,1,2,T (C),normalized Savitsky-Golay derivative,SG deriv (Morvan 2004),k--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,WUI/Morvan_TGA_tga.csv,2,3,Temp,Total MLR,FDS TGA (Total MLR),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Morvan TGA; 1.6 °C/min,Temperature (°C),Mass Loss Rate (1/s),0,700,1,0,1.50E-04,1,no,0.05 0.90,East,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/Morvan_TGA_Total_MLR,N/A,mean,0,Needle TGA,kd,k,TeX
d,Morvan_TGA,WUI/Morvan_TGA_2_git.txt,WUI/Morvan_Data_Mass.csv,1,2,T (C),Normalized Mass (M/M0),Exp (Morvan 2004),k^,0,100000,,0,100000,-1.00E+09,1.00E+09,0,WUI/Morvan_TGA_2_tga.csv,2,3,Temp,Total Mass,FDS TGA (Total Mass),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Morvan TGA; 1.6 °C/min,Temperature (°C),Normalized Mass,0,700,1,0,1.2,1,no,0.05 0.90,East,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/Morvan_TGA_2_Total_Mass,N/A,mean,0,Needle TGA,kd,k,TeX
d,Morvan_TGA,WUI/Morvan_TGA_2_git.txt,WUI/Morvan_Data_SG_Deriv.csv,1,2,T (C),normalized Savitsky-Golay derivative,SG deriv (Morvan 2004),k--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,WUI/Morvan_TGA_2_tga.csv,2,3,Temp,Total MLR,FDS TGA (Total MLR),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Morvan TGA; 1.6 °C/min,Temperature (°C),Mass Loss Rate (1/s),0,700,1,0,1.50E-04,1,no,0.05 0.90,East,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/Morvan_TGA_2_Total_MLR,N/A,mean,0,Needle TGA,kd,k,TeX
d,mwtest_cfl,Flowfields/mwtest_cfl_git.txt,Flowfields/mwtest.csv,2,3,Time,Isothermal,Isothermal,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Flowfields/mwtest_cfl_devc.csv,2,3,Time,maxT,FDS (max T),r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Large MW Difference (mwtest\_cfl),Time (s),Temperature (°C),0,20,1,0,50,1,no,0.05 0.90,West,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/mwtest_cfl_maxT,Absolute Error,max,1.00E-06,Flowfields,r^,r,TeX
d,mwtest_cfl,Flowfields/mwtest_cfl_git.txt,Flowfields/mwtest.csv,2,3,Time,Isothermal,Isothermal,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Flowfields/mwtest_cfl_devc.csv,2,3,Time,minT,FDS (min T),b-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Large MW Difference (mwtest\_cfl),Time (s),Temperature (°C),0,20,1,0,50,1,no,0.05 0.90,West,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/mwtest_cfl_minT,Absolute Error,min,1.00E-06,Flowfields,r^,r,TeX
d,mwtest_cfl,Flowfields/mwtest_cfl_git.txt,Flowfields/mwtest.csv,2,3,Time,Isothermal,Isothermal,ko,0,20,,0,20,-1.00E+09,1.00E+09,0,Flowfields/mwtest_cfl_devc.csv,2,3,Time,maxT,FDS (max T),r-,0,20,,0,20,-1.00E+09,1.00E+09,0,Large MW Difference (mwtest\_cfl),Time (s),Temperature (°C),0,20,1,0,50,1,no,0.05 0.90,West,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/mwtest_cfl_maxT,Absolute Error,max,1.00E-06,Flowfields,r^,r,TeX
d,mwtest_cfl,Flowfields/mwtest_cfl_git.txt,Flowfields/mwtest.csv,2,3,Time,Isothermal,Isothermal,ko,0,20,,0,20,-1.00E+09,1.00E+09,0,Flowfields/mwtest_cfl_devc.csv,2,3,Time,minT,FDS (min T),b-,0,20,,0,20,-1.00E+09,1.00E+09,0,Large MW Difference (mwtest\_cfl),Time (s),Temperature (°C),0,20,1,0,50,1,no,0.05 0.90,West,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/mwtest_cfl_minT,Absolute Error,min,1.00E-06,Flowfields,r^,r,TeX
d,Needle_TGA,WUI/Needle_TGA_A_cat_git.txt,WUI/USDA_FPL_Longleaf_Pine_Needle_TGA_Data.csv,2,3,A-Temperature,A-Mdot,Exp (Mdot),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,WUI/Needle_TGA_A_cat_devc.csv,2,3,T,mlr,FDS (mlr),k--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Case A; 10 °C/min; M=0.075; Inert,Temperature (°C),Normalized Mass Loss Rate (1/s),0,800,1,0,0.002,1,no,0.05 0.90,East,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/Needle_TGA_A_MLR_temp,N/A,end,0,Needle TGA,kd,k,TeX
d,Needle_TGA,WUI/Needle_TGA_B_cat_git.txt,WUI/USDA_FPL_Longleaf_Pine_Needle_TGA_Data.csv,2,3,B-Temperature,B-Mdot,Exp (Mdot),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,WUI/Needle_TGA_B_cat_devc.csv,2,3,T,mlr,FDS (mlr),k--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Case B; 10 °C/min; M=0.053; Air,Temperature (°C),Normalized Mass Loss Rate (1/s),0,800,1,0,0.002,1,no,0.05 0.90,East,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/Needle_TGA_B_MLR_temp,N/A,end,0,Needle TGA,kd,k,TeX
d,Needle_TGA,WUI/Needle_TGA_A_cat_git.txt,WUI/USDA_FPL_Longleaf_Pine_Needle_TGA_Data.csv,2,3,A-Time,A-Mass,Exp (Mass),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,WUI/Needle_TGA_A_cat_devc.csv,2,3,Time,mass,FDS (mass),k--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Case A; 10 °C/min; M=0.075; Inert,Time (min),Normalized Mass,0,70,60,0,1.2,1,no,0.05 0.90,East,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/Needle_TGA_A_Mass,N/A,end,0,Needle TGA,kd,k,TeX
Expand Down Expand Up @@ -773,7 +773,7 @@ d,zone_break_fast,Pressure_Effects/zone_break_fast_git.txt,Pressure_Effects/zone
d,zone_break_slow_ulmat,Pressure_Effects/zone_break_slow_ulmat_git.txt,Pressure_Effects/zone_break.csv,1,2,Time,Pres1|Pres2|Pres3,Ideal (Pres1)|Ideal (Pres2)|Ideal (Pres3),g-|r-|k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Effects/zone_break_slow_ulmat_devc.csv,2,3,Time,pres_1|pres_2|pres_3,ULMAT (pres\_1)|ULMAT (pres\_2)|ULMAT (pres\_3),g--|r--|k--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure (zone\_break\_slow\_ulmat),Time (s),Pressure (Pa),0,30,1,0,2500,1,no,0.05 0.90,NorthEast,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/zone_break_slow_ulmat,Relative Error,max,0.02,Pressure Effects,k+,k,TeX
d,zone_break_fast_ulmat,Pressure_Effects/zone_break_fast_ulmat_git.txt,Pressure_Effects/zone_break.csv,1,2,Time,Pres1|Pres2|Pres3,Ideal (Pres1)|Ideal (Pres2)|Ideal (Pres3),g-|r-|k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Effects/zone_break_fast_ulmat_devc.csv,2,3,Time,pres_1|pres_2|pres_3,ULMAT (pres\_1)|ULMAT (pres\_2)|ULMAT (pres\_3),g--|r--|k--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure (zone\_break\_fast\_ulmat),Time (s),Pressure (Pa),0,30,1,0,2500,1,no,0.05 0.90,NorthEast,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/zone_break_fast_ulmat,Relative Error,max,0.02,Pressure Effects,k+,k,TeX
d,zone_shape,Pressure_Effects/zone_shape_git.txt,Pressure_Effects/zone_shape.csv,1,2,Time,Pres,Ideal (Pres),ko,0,100000,,14,15,-1.00E+09,1.00E+09,0,Pressure_Effects/zone_shape_devc.csv,2,3,Time,pres_1,FDS (pres\_1),k-,0,100000,,14,15,-1.00E+09,1.00E+09,0,Pressure (zone\_shape),Time (s),Pressure (Pa),0,25,1,0,4000,1,no,0.05 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/zone_shape,Relative Error,mean,0.015,Pressure Effects,k+,k,TeX
d,zone_shape_2,Pressure_Effects/zone_shape_2_git.txt,Pressure_Effects/zone_shape_2.csv,1,2,Time,Delta p,Ideal (Delta p),ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Effects/zone_shape_2_devc.csv,2,3,Time,Delta p,FDS (Delta p),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure Difference (zone\_shape\_2),Time (s),Pressure (Pa),0,300,1,0,150,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/zone_shape_2_pres,Relative Error,end,0.01,Pressure Effects,k+,k,TeX
d,zone_shape_2,Pressure_Effects/zone_shape_2_git.txt,Pressure_Effects/zone_shape_2.csv,1,2,Time,Delta p,Ideal (Delta p),ko,0,100000,,200,300,-1.00E+09,1.00E+09,0,Pressure_Effects/zone_shape_2_devc.csv,2,3,Time,Delta p,FDS (Delta p),k-,0,100000,,200,300,-1.00E+09,1.00E+09,0,Pressure Difference (zone\_shape\_2),Time (s),Pressure (Pa),0,300,1,0,150,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/zone_shape_2_pres,Relative Error,mean,0.01,Pressure Effects,k+,k,TeX
d,zone_shape_2,Pressure_Effects/zone_shape_2_git.txt,Pressure_Effects/zone_shape_2.csv,1,2,Time,Mass,Ideal (Mass),ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Effects/zone_shape_2_mass.csv,2,3,Time,Total,FDS (Total),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Mass (zone\_shape\_2),Time (s),Mass (kg),0,300,1,0,400,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/zone_shape_2_mass,Relative Error,end,0.01,Pressure Effects,k+,k,TeX
d,humidity,Species/humidity_git.txt,Species/humidity.csv,1,2,Time,H2Ov,Expected,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Species/humidity_devc.csv,2,3,Time,H2Ov,FDS,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Humidity Test (humidity),Time (s),Water Vapor Mass Fraction (kg/kg),0,1,1,0,0.1,1,no,0.05 0.90,NorthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/humidity,Relative Error,end,0.001,Humidity,kd,k,TeX
d,matl_e_cons,Pyrolysis/matl_e_cons_1.txt,Pyrolysis/matl_e_cons_1.csv,1,2,Time,M1,Exact,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pyrolysis/matl_e_cons_1_devc.csv,2,3,Time,H_M1,FDS,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,(matl\_e\_cons\_1),Time (s),Enthalpy (kJ/kg),0,1,1,-2000,1000,1,no,0.05 0.90,NorthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/matl_e_cons_1,Relative Error,end,0.005,Energy Budget,ks,k,TeX
Expand Down
Loading