diff --git a/Source/read.f90 b/Source/read.f90 index 8112569ded3..5c055c5b1c7 100644 --- a/Source/read.f90 +++ b/Source/read.f90 @@ -4790,6 +4790,7 @@ SUBROUTINE READ_REAC RN%AIT_EXCLUSION_ZONE(IZ)%CTRL_ID = AIT_EXCLUSION_ZONE_CTRL_ID(IZ) ENDIF ENDDO + RN%E = E*1000._EB RN%E_IN = E RN%EQUATION = EQUATION @@ -5046,6 +5047,7 @@ SUBROUTINE SET_REAC_DEFAULTS A = -1._EB AUTO_IGNITION_TEMPERATURE = -TMPM AIT_EXCLUSION_ZONE = -1.E6_EB +AIT_EXCLUSION_ZONE_TEMPERATURE = -TMPM AIT_EXCLUSION_ZONE_CTRL_ID = 'null' AIT_EXCLUSION_ZONE_DEVC_ID = 'null' C = 0._EB @@ -5542,13 +5544,13 @@ SUBROUTINE PROC_REAC_1 ELSEIF(TRIM(SPECIES_MIXTURE(NS)%ID) == "O2" .OR. TRIM(SPECIES_MIXTURE(NS)%ID) == "OXYGEN") THEN I_O2 = NS ELSEIF(TRIM(SPECIES_MIXTURE(NS)%ID) == "CO2" .OR. TRIM(SPECIES_MIXTURE(NS)%ID) == "CARBON DIOXIDE") THEN - I_CO2 = NS + I_CO2 = NS ELSEIF(TRIM(SPECIES_MIXTURE(NS)%ID) == "H2O" .OR. TRIM(SPECIES_MIXTURE(NS)%ID) == "WATER VAPOR") THEN - I_H2O = NS - ENDIF + I_H2O = NS + ENDIF ENDDO -ENDIF +ENDIF END SUBROUTINE PROC_REAC_1 @@ -6605,7 +6607,7 @@ SUBROUTINE READ_PROP PY%SPECIFIC_HEAT(J) = 451.5_EB+0.001_EB*(REAL(MAX(293,MIN(1493,J)),EB)-293._EB)*(601.0_EB-451.5_EB) ENDDO ENDIF - PY%SPECIFIC_HEAT = PY%SPECIFIC_HEAT/TIME_SHRINK_FACTOR + PY%SPECIFIC_HEAT = PY%SPECIFIC_HEAT/TIME_SHRINK_FACTOR IF (SPECIFIC_HEAT_RAMP /= 'null') CALL GET_RAMP_INDEX(SPECIFIC_HEAT_RAMP,'TEMPERATURE',PY%SPECIFIC_HEAT_RAMP_INDEX) PY%C_FACTOR = C_FACTOR PY%CHARACTERISTIC_VELOCITY = CHARACTERISTIC_VELOCITY @@ -6852,7 +6854,7 @@ SUBROUTINE SET_PROP_DEFAULTS DIAMETER = 0.001 ! m EMISSIVITY = 0.85_EB HEAT_TRANSFER_COEFFICIENT= -1._EB ! W/m2/K -SPECIFIC_HEAT = -1._EB ! kJ/kg/K +SPECIFIC_HEAT = -1._EB ! kJ/kg/K SPECIFIC_HEAT_RAMP = 'null' C_FACTOR = 0.0_EB CHARACTERISTIC_VELOCITY = 1.0_EB ! m/s @@ -7019,7 +7021,7 @@ SUBROUTINE PROC_PROP PY%V_FACTOR = PY%PARTICLE_VELOCITY/SQRT(PY%OPERATING_PRESSURE) ENDIF ENDIF - + ! Check units of specific heat IF (PY%SPECIFIC_HEAT_RAMP_INDEX > 0) THEN @@ -8857,8 +8859,8 @@ SUBROUTINE READ_SURF(QUICK_READ) IF (DELAMINATION_TMP(NL) > 0._EB) SF%DELAMINATION_TMP(NL) = DELAMINATION_TMP(NL) + TMPM IF (DELAMINATION_DENSITY(NL) > 0._EB) SF%DELAMINATION_DENSITY(NL) = DELAMINATION_DENSITY(NL) ENDDO - - + + ! Adjust min and max temperature and convert C to K IF (TMP_FRONT >= -TMPM) TMPMIN = MIN(TMPMIN,TMP_FRONT+TMPM) @@ -13700,7 +13702,7 @@ SUBROUTINE READ_DEVC IF (PROP_ID/='null') THEN CALL GET_PROPERTY_INDEX(PROP_INDEX,'DEVC',PROP_ID) IF (PROPERTY(PROP_INDEX)%IGNITION_ZONE) XB_XYZ= .FALSE. - ENDIF + ENDIF IF (POINTS==1 .AND. SPATIAL_STATISTIC=='null' .AND. ALL(XB>-1E6_EB) .AND. ALL(XYZ<=-1E6_EB) .AND. XB_XYZ) THEN XYZ(1) = 0.5_EB*(XB(1)+XB(2)) XYZ(2) = 0.5_EB*(XB(3)+XB(4)) @@ -14929,7 +14931,7 @@ SUBROUTINE PROC_DEVC WRITE(MESSAGE,'(3A)') 'ERROR(899): DEVC ',TRIM(DV%ID),' should not contain a + sign.' CALL SHUTDOWN(MESSAGE) ; RETURN ENDIF - + ! Check for HVAC outputs with no HVAC inputs IF ((DV%DUCT_ID/='null' .OR. DV%NODE_ID(1)/='null') .AND. .NOT. HVAC_SOLVE) THEN @@ -15006,7 +15008,7 @@ SUBROUTINE PROC_DEVC ENDIF IGNITION_ZONES(N_IGNITION_ZONES)%DEVC_INDEX = N IGNITION_ZONES(N_IGNITION_ZONES)%DEVC_ID = DV%ID - ENDIF + ENDIF ENDIF IF(TRIM(ODE_SOLVER)=='CVODE' .AND. N_IGNITION_ZONES >= 1) THEN @@ -15228,7 +15230,6 @@ SUBROUTINE PROC_DEVC 2._EB*PY%DENSITY*PY%SPECIFIC_HEAT(293)*PY%DIAMETER PY%DIAMETER = PY%DIAMETER - F/DFDD TOL = ABS(F/DFDD) - WRITE(*,*)'C',TRIM(PY%ID),PY%DIAMETER ENDDO ENDIF ENDIF @@ -15526,7 +15527,7 @@ SUBROUTINE READ_PROF CALL SHUTDOWN(MESSAGE) ; RETURN ENDIF ENDIF - + IF (INIT_ID/='null') THEN INIT_DO: DO I=1,N_INIT IF (INIT_ID==INITIALIZATION(I)%ID) THEN