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: 12 additions & 13 deletions Source/init.f90
Original file line number Diff line number Diff line change
Expand Up @@ -4768,21 +4768,20 @@ SUBROUTINE CREATE_OR_REMOVE_OBST(NM,I1,I2,J1,J2,K1,K2,CR_INDEX,OBST_INDEX)

IF (I1/=I2 .AND. J1/=J2 .AND. K1/=K2) CALL BLOCK_CELL(NM,I1+1,I2,J1+1,J2,K1+1,K2,CR_INDEX,OBST_INDEX)

! If the OBSTruction is to be removed, set density and mass fractions to ambient value

IF (REMOVE) THEN
DO K=K1+1,K2
DO J=J1+1,J2
DO I=I1+1,I2
RHOS(I,J,K) = RHO_0(K)
RHO(I,J,K) = RHO_0(K)
IF (SOLID_PHASE_ONLY) TMP(I,J,K) = TMP_0(K)
ZZ(I,J,K,1:N_TRACKED_SPECIES) = SPECIES_MIXTURE(1:N_TRACKED_SPECIES)%ZZ0
ZZS(I,J,K,1:N_TRACKED_SPECIES) = SPECIES_MIXTURE(1:N_TRACKED_SPECIES)%ZZ0
ENDDO
! Set density, mass fractions, temperature, and net diffusion to ambient value in cells covered or uncovered by obstruction.

DO K=K1+1,K2
DO J=J1+1,J2
DO I=I1+1,I2
RHOS(I,J,K) = RHO_0(K)
RHO(I,J,K) = RHO_0(K)
IF (SOLID_PHASE_ONLY) TMP(I,J,K) = TMP_0(K)
ZZ(I,J,K,1:N_TRACKED_SPECIES) = SPECIES_MIXTURE(1:N_TRACKED_SPECIES)%ZZ0
ZZS(I,J,K,1:N_TRACKED_SPECIES) = SPECIES_MIXTURE(1:N_TRACKED_SPECIES)%ZZ0
IF (I1==0.OR.I2==IBAR.OR.J1==0.OR.J2==JBAR.OR.K1==0.OR.K2==KBAR) DEL_RHO_D_DEL_Z(I,J,K,:) = 0._EB
ENDDO
ENDDO
ENDIF
ENDDO

END SUBROUTINE CREATE_OR_REMOVE_OBST

Expand Down
2 changes: 1 addition & 1 deletion Utilities/Matlab/FDS_verification_dataplot_inputs.csv
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ d,ns2d_32_nupt1,NS_Analytical_Solution/ns2d_32_nupt1_git.txt,NS_Analytical_Solut
d,ns2d_64_nupt1,NS_Analytical_Solution/ns2d_64_nupt1_git.txt,NS_Analytical_Solution/ns2d_64_nupt1_exact.csv,1,2,Time,u-vel,Analytical (u-vel),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,NS_Analytical_Solution/ns2d_64_nupt1_devc.csv,2,3,Time,UVEL,FDS (UVEL),k--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Velocity (ns2d\_64\_nupt1),Time (s),Velocity (m/s),0,7,1,0.3,2.4,1,no,0.05 0.90,NorthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/ns2d_64_nupt1,Relative Error,mean,0.01,NS Analytical Solution,kd,k,TeX
d,obst_activation,Pressure_Solver/obst_activation_ulmat_git.txt,Pressure_Solver/obst_activation_exact.csv,1,2,Time,D_max,Tolerance,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/obst_activation_ulmat_devc.csv,2,3,Time,D_max,FDS (ULMAT),r--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Divergence (obst\_activation),Time (s),Divergence (1/s),0,2,1,1e-16,1e-13,1,no,0.05 0.90,SouthEast,,1,semilogy,FDS_Verification_Guide/SCRIPT_FIGURES/obst_activation,Absolute Error,max,1e-13,Pressure Solver,kd,k,TeX
f,obst_activation,Pressure_Solver/obst_activation_default_git.txt,Pressure_Solver/obst_activation_exact.csv,1,2,Time,D_max,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/obst_activation_default_devc.csv,2,3,Time,D_max,FDS (FFT),g--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Divergence (obst\_activation),Time (s),Divergence (1/s),0,2,1,1e-16,1e-13,1,no,0.05 0.90,SouthEast,,1,semilogy,FDS_Verification_Guide/SCRIPT_FIGURES/obst_activation,Absolute Error,max,1e-13,Pressure Solver,kd,k,TeX
d,obst_activation,Pressure_Solver/obst_activation_default_gases_git.txt,Pressure_Solver/obst_activation_default_gases.csv,1,2,Time,T_min|T_max,Lower Bound|Upper Bound,k--|r--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/obst_activation_default_gases_devc.csv,2,3,Time,T_min|T_max,T\_min|T\_max,k-|r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Temperature (obst\_activation\_gases),Time (s),Temperature (°C),0,30,1,19.9,20.1,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/obst_activation_gases,Absolute Error,max,1,Pressure Solver,kd,k,TeX
d,obst_activation,Pressure_Solver/obst_activation_default_gases_git.txt,Pressure_Solver/obst_activation_default_gases.csv,1,2,Time,T_min|T_max,Lower Bound|Upper Bound,k--|r--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/obst_activation_default_gases_devc.csv,2,3,Time,T_min|T_max,T\_min|T\_max,k-|r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Temperature (obst\_activation\_default\_gases),Time (s),Temperature (°C),0,30,1,19.99,20.01,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/obst_activation_gases,Absolute Error,max,0.005,Pressure Solver,kd,k,TeX
d,obst_coarse_fine_interface,Pressure_Effects/obst_coarse_fine_interface_git.txt,Pressure_Effects/obst_coarse_fine_interface_exact.csv,1,2,Time,DP,Analytical (DP),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Effects/obst_coarse_fine_interface_devc.csv,2,3,Time,DP,FDS (DP),k--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Background Pressure (obst\_coarse\_fine\_interface),Time (s),Pressure (Pa),0,10,1,-10,10,1,no,0.05 0.90,NorthEast,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/obst_coarse_fine_interface,Absolute Error,end,2,Pressure Effects,kd,k,TeX
d,opening_ulmat,Pressure_Solver/opening_ulmat_git.txt,Pressure_Solver/opening_pressure_error.csv,1,2,Time,Pressure Tolerance,Ideal (Pressure Tolerance),ko--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/opening_ulmat_devc.csv,2,3,Time,perr-max,FDS (p err max),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure Error (opening\_ulmat),Time (s),Pressure Error (Pa),0,10,1,0,1.00E-06,1,no,0.05 0.90,SouthEast,,1,semilogy,FDS_User_Guide/SCRIPT_FIGURES/opening_ulmat,Absolute Error,tolerance,1.00E-10,Pressure Solver,k+,k,TeX
d,parabolic_profile,Flowfields/parabolic_profile_git.txt,Flowfields/parabolic_profile.csv,1,2,Time,Pressure,Exact (Pressure),ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Flowfields/parabolic_profile_devc.csv,2,3,Time,pres,FDS (pres),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure (parabolic\_profile),Time (s),Pressure (Pa),0,60,1,0,2500,1,no,0.05 0.90,SouthEast,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/parabolic_profile,Relative Error,end,0.01,Pressure Effects,k+,k,TeX
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Time,T_min,T_max
0,19.95,20.05
30,19.95,20.05
0,19.995,20.005
30,19.995,20.005