diff --git a/Source/dump.f90 b/Source/dump.f90 index 072926f2614..eaa07080ffb 100644 --- a/Source/dump.f90 +++ b/Source/dump.f90 @@ -2181,9 +2181,9 @@ SUBROUTINE WRITE_SMOKEVIEW_FILE IF (.NOT.SETUP_ONLY) THEN ! Mesh grid dimensions and neighbor information. - ! Determine if the six mesh faces abut a single mesh (MESH_NEIGHBOR>0), nothing (MESH_NEIGHBOR=0), + ! Determine if the six mesh faces abut a single mesh (MESH_NEIGHBOR>0), nothing (MESH_NEIGHBOR=0), ! or a combination of nothing and/or multiple meshes (MESH_NEIGHBOR=-1). Write six values to GRID line. - + DO I=1,6 SELECT CASE(I) CASE(1) ; IW1=1 ; IW2=IW1+M%JBAR*M%KBAR-1 @@ -2203,7 +2203,7 @@ SUBROUTINE WRITE_SMOKEVIEW_FILE ENDDO ENDIF - + CALL EOL WRITE(MYSTR,'(A,3X,A)') 'GRID',TRIM(MESH_NAME(NM)); CALL ADDSTR WRITE(MYSTR,'(9I6)') M%IBAR,M%JBAR,M%KBAR,MESH_NEIGHBOR(1:6) ; CALL ADDSTR @@ -7882,9 +7882,9 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z ELSE PROBE_TMP = TMP(II,JJ,KK) ENDIF - UU = U(II,JJ,KK) - VV = V(II,JJ,KK) - WW = W(II,JJ,KK) + UU = 0.5_EB*(U(MAX(0,II-1),JJ,KK)+U(MIN(IBAR,II),JJ,KK)) + VV = 0.5_EB*(V(II,MAX(0,JJ-1),KK)+V(II,MIN(JBAR,JJ),KK)) + WW = 0.5_EB*(W(II,JJ,MAX(0,KK-1))+W(II,JJ,MIN(KBAR,KK))) VEL2 = UU**2+VV**2+WW**2 VEL = SQRT(VEL2) DP = 0.5_EB*VEL2*RHO(II,JJ,KK) @@ -8293,7 +8293,7 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z IF(FCVAR(II,JJ,KK,CC_IDRC,JAXIS)>0) GAS_PHASE_OUTPUT_RES = REAL(RC_FACE(FCVAR(II,JJ,KK,CC_IDRC,JAXIS))%UNKF,EB) ENDIF - CASE(194) ! F_Z UNKNOWN NUMBER + CASE(194) ! F_Z UNKNOWN NUMBER GAS_PHASE_OUTPUT_RES = 0._EB IF (CC_IBM) THEN GAS_PHASE_OUTPUT_RES = REAL(FCVAR(II,JJ,KK,CC_UNKF,KAXIS),EB) @@ -10608,7 +10608,7 @@ SUBROUTINE DUMP_BNDF(T,DT,NM) ! Interpolate the boundary quantity PP at cell corners, PPN IF (.NOT.BF%CELL_CENTERED) THEN - + ! Dont include undetermined values in interpolation for FIRE ARRIVAL TIME IF (OUTPUT_QUANTITY(BF%INDEX)%NAME=='FIRE ARRIVAL TIME') THEN WHERE(PP>9.E5_FB) IBK=0 @@ -11569,7 +11569,7 @@ SUBROUTINE DUMP_CVODE_SUBSTEPS() DO ROWI = 1, TOTAL_SUBSTEPS_TAKEN WRITE(LU_CVODE_SUBSTEPS,TCFORM) (CVODE_SUBSTEP_DATA(ROWI,COLI),COLI=1,NCOLS) ENDDO -ENDIF +ENDIF END SUBROUTINE DUMP_CVODE_SUBSTEPS diff --git a/Validation/WTC/FDS_Input_Files/WTC_01.fds b/Validation/WTC/FDS_Input_Files/WTC_01.fds index 06d08a20914..7ed278b7dbe 100644 --- a/Validation/WTC/FDS_Input_Files/WTC_01.fds +++ b/Validation/WTC/FDS_Input_Files/WTC_01.fds @@ -17,7 +17,7 @@ &OBST XB= 4.4, 4.4,-1.0, 1.0, 0.0, 0.1, SURF_ID='STEEL PAN' / &PART ID='heptane droplets',SPEC_ID='N-HEPTANE' , - DIAMETER=1000.,HEAT_OF_COMBUSTION=45000., + DIAMETER=1000., SAMPLING_FACTOR=1 / &PROP ID='nozzle', PART_ID='heptane droplets', FLOW_RATE=1.901, FLOW_RAMP='FIRE_RAMP', @@ -251,7 +251,7 @@ Bi-directional Probes &DEVC XYZ=7.21,1.26,2.36,QUANTITY='BI-DIRECTIONAL PROBE' ,PROP_ID='BI-DIR',ORIENTATION=1,0,0 ,ID='PO7' / Ch 56 &DEVC XYZ=7.21,1.26,2.15,QUANTITY='BI-DIRECTIONAL PROBE' ,PROP_ID='BI-DIR',ORIENTATION=1,0,0 ,ID='PO8' / Ch 57 -&PROP ID='BI-DIR',TC=F/ +&PROP ID='BI-DIR',TC=T/ &DEVC XYZ=4.35,0.17,3.20,QUANTITY='VELOCITY' ,ID='PH1' / Ch 58 &DEVC XYZ=4.81,0.17,3.20,QUANTITY='VELOCITY' ,ID='PH2' / Ch 59 diff --git a/Validation/WTC/FDS_Input_Files/WTC_02.fds b/Validation/WTC/FDS_Input_Files/WTC_02.fds index 905e374123b..31884d874a0 100644 --- a/Validation/WTC/FDS_Input_Files/WTC_02.fds +++ b/Validation/WTC/FDS_Input_Files/WTC_02.fds @@ -7,9 +7,10 @@ &REAC FUEL='N-HEPTANE' FYI='60% Heptane, 40% Toluene, C_7 H_12' + HEAT_OF_COMBUSTION=47800,IDEAL=T RADIATIVE_FRACTION=0.39 C=7. - H=12. + H=12.64 CO_YIELD=0.042 SOOT_YIELD=0.114 / @@ -20,7 +21,7 @@ &OBST XB= 4.4, 4.4,-1.0, 1.0, 0.0, 0.1, SURF_ID='STEEL PAN' / &PART ID='heptane droplets',SPEC_ID='N-HEPTANE' , - DIAMETER=1000.,HEAT_OF_COMBUSTION=45000., + DIAMETER=1000., SAMPLING_FACTOR=1 / &PROP ID='nozzle', PART_ID='heptane droplets', FLOW_RATE=2.335, FLOW_RAMP='FIRE_RAMP', @@ -254,7 +255,7 @@ Bi-directional Probes &DEVC XYZ=7.21,-1.26,2.61,QUANTITY='BI-DIRECTIONAL PROBE' ,PROP_ID='BI-DIR',ORIENTATION=1,0,0 ,ID='PO9' / Ch 45 (Tests 2-6) &DEVC XYZ=7.21,-1.26,2.15,QUANTITY='BI-DIRECTIONAL PROBE' ,PROP_ID='BI-DIR',ORIENTATION=1,0,0 ,ID='PO10'/ Ch 46 (Tests 2-6) -&PROP ID='BI-DIR',TC=F/ +&PROP ID='BI-DIR',TC=T/ &DEVC XYZ=4.35,0.17,3.20,QUANTITY='VELOCITY' ,ID='PH1' / Ch 58 &DEVC XYZ=4.81,0.17,3.20,QUANTITY='VELOCITY' ,ID='PH2' / Ch 59 diff --git a/Validation/WTC/FDS_Input_Files/WTC_03.fds b/Validation/WTC/FDS_Input_Files/WTC_03.fds index 1283744e04f..319c8657177 100644 --- a/Validation/WTC/FDS_Input_Files/WTC_03.fds +++ b/Validation/WTC/FDS_Input_Files/WTC_03.fds @@ -7,9 +7,10 @@ &REAC FUEL='N-HEPTANE' FYI='60% Heptane, 40% Toluene, C_7 H_12' + HEAT_OF_COMBUSTION=47800,IDEAL=T RADIATIVE_FRACTION=0.39 C=7. - H=12. + H=12.64 CO_YIELD=0.042 SOOT_YIELD=0.114 / @@ -20,7 +21,7 @@ &OBST XB= 4.4, 4.4,-1.0, 1.0, 0.0, 0.1, SURF_ID='STEEL PAN' / &PART ID='heptane droplets',SPEC_ID='N-HEPTANE' , - DIAMETER=1000.,HEAT_OF_COMBUSTION=45000., + DIAMETER=1000., SAMPLING_FACTOR=1 / &PROP ID='nozzle', PART_ID='heptane droplets', FLOW_RATE=1.870, FLOW_RAMP='FIRE_RAMP', @@ -254,7 +255,7 @@ Bi-directional Probes &DEVC XYZ=7.21,-1.26,2.61,QUANTITY='BI-DIRECTIONAL PROBE' ,PROP_ID='BI-DIR',ORIENTATION=1,0,0 ,ID='PO9' / Ch 45 (Tests 2-6) &DEVC XYZ=7.21,-1.26,2.15,QUANTITY='BI-DIRECTIONAL PROBE' ,PROP_ID='BI-DIR',ORIENTATION=1,0,0 ,ID='PO10'/ Ch 46 (Tests 2-6) -&PROP ID='BI-DIR',TC=F/ +&PROP ID='BI-DIR',TC=T/ &DEVC XYZ=4.35,0.17,3.20,QUANTITY='VELOCITY' ,ID='PH1' / Ch 58 &DEVC XYZ=4.81,0.17,3.20,QUANTITY='VELOCITY' ,ID='PH2' / Ch 59 diff --git a/Validation/WTC/FDS_Input_Files/WTC_04.fds b/Validation/WTC/FDS_Input_Files/WTC_04.fds index c4158f36113..fd2fb97d74d 100644 --- a/Validation/WTC/FDS_Input_Files/WTC_04.fds +++ b/Validation/WTC/FDS_Input_Files/WTC_04.fds @@ -17,7 +17,7 @@ &OBST XB= 4.4, 4.4,-1.0, 1.0, 0.0, 0.1, SURF_ID='STEEL PAN' / &PART ID='heptane droplets',SPEC_ID='N-HEPTANE' , - DIAMETER=1000.,HEAT_OF_COMBUSTION=45000., + DIAMETER=1000., SAMPLING_FACTOR=1 / &PROP ID='nozzle', PART_ID='heptane droplets', FLOW_RATE=2.820, FLOW_RAMP='FIRE_RAMP', @@ -287,7 +287,7 @@ Bi-directional Probes &DEVC XYZ=7.21,-1.26,2.61,QUANTITY='BI-DIRECTIONAL PROBE' ,PROP_ID='BI-DIR',ORIENTATION=1,0,0 ,ID='PO9' / Ch 45 (Tests 2-6) &DEVC XYZ=7.21,-1.26,2.15,QUANTITY='BI-DIRECTIONAL PROBE' ,PROP_ID='BI-DIR',ORIENTATION=1,0,0 ,ID='PO10'/ Ch 46 (Tests 2-6) -&PROP ID='BI-DIR',TC=F/ +&PROP ID='BI-DIR',TC=T/ &DEVC XYZ=4.35,0.17,3.20,QUANTITY='VELOCITY' ,ID='PH1' / Ch 58 &DEVC XYZ=4.81,0.17,3.20,QUANTITY='VELOCITY' ,ID='PH2' / Ch 59 diff --git a/Validation/WTC/FDS_Input_Files/WTC_05.fds b/Validation/WTC/FDS_Input_Files/WTC_05.fds index 6935009fd5a..d38f8198468 100644 --- a/Validation/WTC/FDS_Input_Files/WTC_05.fds +++ b/Validation/WTC/FDS_Input_Files/WTC_05.fds @@ -17,7 +17,7 @@ &OBST XB= 4.4, 4.4,-1.0, 1.0, 0.0, 0.1, SURF_ID='STEEL PAN' / &PART ID='heptane droplets',SPEC_ID='N-HEPTANE' , - DIAMETER=1000.,HEAT_OF_COMBUSTION=45000., + DIAMETER=1000., SAMPLING_FACTOR=1 / &PROP ID='nozzle', PART_ID='heptane droplets', FLOW_RATE=2.791, FLOW_RAMP='FIRE_RAMP', @@ -281,7 +281,7 @@ Bi-directional Probes &DEVC XYZ=7.21,-1.26,2.61,QUANTITY='BI-DIRECTIONAL PROBE' ,PROP_ID='BI-DIR',ORIENTATION=1,0,0 ,ID='PO9' / Ch 45 (Tests 2-6) &DEVC XYZ=7.21,-1.26,2.15,QUANTITY='BI-DIRECTIONAL PROBE' ,PROP_ID='BI-DIR',ORIENTATION=1,0,0 ,ID='PO10'/ Ch 46 (Tests 2-6) -&PROP ID='BI-DIR',TC=F/ +&PROP ID='BI-DIR',TC=T/ &DEVC XYZ=4.35,0.17,3.20,QUANTITY='VELOCITY' ,ID='PH1' / Ch 58 &DEVC XYZ=4.81,0.17,3.20,QUANTITY='VELOCITY' ,ID='PH2' / Ch 59 diff --git a/Validation/WTC/FDS_Input_Files/WTC_06.fds b/Validation/WTC/FDS_Input_Files/WTC_06.fds index 0e862d6f62d..29ef5485ea7 100644 --- a/Validation/WTC/FDS_Input_Files/WTC_06.fds +++ b/Validation/WTC/FDS_Input_Files/WTC_06.fds @@ -17,7 +17,7 @@ &OBST XB= 4.4, 4.4,-1.0, 1.0, 0.0, 0.1, SURF_ID='STEEL PAN' / &PART ID='heptane droplets',SPEC_ID='N-HEPTANE' , - DIAMETER=1000.,HEAT_OF_COMBUSTION=45000., + DIAMETER=1000., SAMPLING_FACTOR=1 / &PROP ID='nozzle', PART_ID='heptane droplets', FLOW_RATE=2.771, FLOW_RAMP='FIRE_RAMP', @@ -269,7 +269,7 @@ Bi-directional Probes &DEVC XYZ=7.21,-1.26,2.61,QUANTITY='BI-DIRECTIONAL PROBE' ,PROP_ID='BI-DIR',ORIENTATION=1,0,0 ,ID='PO9' / Ch 45 (Tests 2-6) &DEVC XYZ=7.21,-1.26,2.15,QUANTITY='BI-DIRECTIONAL PROBE' ,PROP_ID='BI-DIR',ORIENTATION=1,0,0 ,ID='PO10'/ Ch 46 (Tests 2-6) -&PROP ID='BI-DIR',TC=F/ +&PROP ID='BI-DIR',TC=T/ &DEVC XYZ=4.35,0.17,3.20,QUANTITY='VELOCITY' ,ID='PH1' / Ch 58 &DEVC XYZ=4.81,0.17,3.20,QUANTITY='VELOCITY' ,ID='PH2' / Ch 59