@@ -4667,7 +4667,7 @@ SUBROUTINE READ_REAC
46674667ALLOCATE(REACTION(N_REACTIONS+N_REVERSE),STAT=IZERO)
46684668ALLOCATE(SIMPLE_FUEL_DEFINED(N_REACTIONS),STAT=IZERO)
46694669SIMPLE_FUEL_DEFINED = .FALSE.
4670-
4670+ WRITE(LU_ERR,*) 'RNA:',REACTION(1)%AIT_EXCLUSION_ZONE(1)%AIT
46714671! Read and store the reaction parameters
46724672N_REVERSE = 0
46734673REAC_READ_LOOP: DO NR=1,N_REACTIONS
@@ -4790,6 +4790,7 @@ SUBROUTINE READ_REAC
47904790 RN%AIT_EXCLUSION_ZONE(IZ)%CTRL_ID = AIT_EXCLUSION_ZONE_CTRL_ID(IZ)
47914791 ENDIF
47924792 ENDDO
4793+ WRITE(LU_ERR,*) 'RNB:',REACTION(1)%AIT_EXCLUSION_ZONE(1)%AIT,AIT_EXCLUSION_ZONE_TEMPERATURE(1)
47934794 RN%E = E*1000._EB
47944795 RN%E_IN = E
47954796 RN%EQUATION = EQUATION
@@ -5034,6 +5035,7 @@ SUBROUTINE READ_REAC
50345035 CALL SHUTDOWN(MESSAGE) ; RETURN
50355036 ENDIF
50365037ENDDO
5038+ WRITE(LU_ERR,*) 'RNC:',REACTION(1)%AIT_EXCLUSION_ZONE(1)%AIT
50375039
50385040DEALLOCATE (REAC_FUEL_2)
50395041
@@ -5046,6 +5048,7 @@ SUBROUTINE SET_REAC_DEFAULTS
50465048A = -1._EB
50475049AUTO_IGNITION_TEMPERATURE = -TMPM
50485050AIT_EXCLUSION_ZONE = -1.E6_EB
5051+ AIT_EXCLUSION_ZONE_TEMPERATURE = -TMPM
50495052AIT_EXCLUSION_ZONE_CTRL_ID = 'null'
50505053AIT_EXCLUSION_ZONE_DEVC_ID = 'null'
50515054C = 0._EB
@@ -5542,13 +5545,13 @@ SUBROUTINE PROC_REAC_1
55425545 ELSEIF(TRIM(SPECIES_MIXTURE(NS)%ID) == "O2" .OR. TRIM(SPECIES_MIXTURE(NS)%ID) == "OXYGEN") THEN
55435546 I_O2 = NS
55445547 ELSEIF(TRIM(SPECIES_MIXTURE(NS)%ID) == "CO2" .OR. TRIM(SPECIES_MIXTURE(NS)%ID) == "CARBON DIOXIDE") THEN
5545- I_CO2 = NS
5548+ I_CO2 = NS
55465549 ELSEIF(TRIM(SPECIES_MIXTURE(NS)%ID) == "H2O" .OR. TRIM(SPECIES_MIXTURE(NS)%ID) == "WATER VAPOR") THEN
5547- I_H2O = NS
5548- ENDIF
5550+ I_H2O = NS
5551+ ENDIF
55495552 ENDDO
55505553
5551- ENDIF
5554+ ENDIF
55525555
55535556END SUBROUTINE PROC_REAC_1
55545557
@@ -6605,7 +6608,7 @@ SUBROUTINE READ_PROP
66056608 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)
66066609 ENDDO
66076610 ENDIF
6608- PY%SPECIFIC_HEAT = PY%SPECIFIC_HEAT/TIME_SHRINK_FACTOR
6611+ PY%SPECIFIC_HEAT = PY%SPECIFIC_HEAT/TIME_SHRINK_FACTOR
66096612 IF (SPECIFIC_HEAT_RAMP /= 'null') CALL GET_RAMP_INDEX(SPECIFIC_HEAT_RAMP,'TEMPERATURE',PY%SPECIFIC_HEAT_RAMP_INDEX)
66106613 PY%C_FACTOR = C_FACTOR
66116614 PY%CHARACTERISTIC_VELOCITY = CHARACTERISTIC_VELOCITY
@@ -6852,7 +6855,7 @@ SUBROUTINE SET_PROP_DEFAULTS
68526855DIAMETER = 0.001 ! m
68536856EMISSIVITY = 0.85_EB
68546857HEAT_TRANSFER_COEFFICIENT= -1._EB ! W/m2/K
6855- SPECIFIC_HEAT = -1._EB ! kJ/kg/K
6858+ SPECIFIC_HEAT = -1._EB ! kJ/kg/K
68566859SPECIFIC_HEAT_RAMP = 'null'
68576860C_FACTOR = 0.0_EB
68586861CHARACTERISTIC_VELOCITY = 1.0_EB ! m/s
@@ -7019,7 +7022,7 @@ SUBROUTINE PROC_PROP
70197022 PY%V_FACTOR = PY%PARTICLE_VELOCITY/SQRT(PY%OPERATING_PRESSURE)
70207023 ENDIF
70217024 ENDIF
7022-
7025+
70237026 ! Check units of specific heat
70247027
70257028 IF (PY%SPECIFIC_HEAT_RAMP_INDEX > 0) THEN
@@ -8857,8 +8860,8 @@ SUBROUTINE READ_SURF(QUICK_READ)
88578860 IF (DELAMINATION_TMP(NL) > 0._EB) SF%DELAMINATION_TMP(NL) = DELAMINATION_TMP(NL) + TMPM
88588861 IF (DELAMINATION_DENSITY(NL) > 0._EB) SF%DELAMINATION_DENSITY(NL) = DELAMINATION_DENSITY(NL)
88598862 ENDDO
8860-
8861-
8863+
8864+
88628865 ! Adjust min and max temperature and convert C to K
88638866
88648867 IF (TMP_FRONT >= -TMPM) TMPMIN = MIN(TMPMIN,TMP_FRONT+TMPM)
@@ -13700,7 +13703,7 @@ SUBROUTINE READ_DEVC
1370013703 IF (PROP_ID/='null') THEN
1370113704 CALL GET_PROPERTY_INDEX(PROP_INDEX,'DEVC',PROP_ID)
1370213705 IF (PROPERTY(PROP_INDEX)%IGNITION_ZONE) XB_XYZ= .FALSE.
13703- ENDIF
13706+ ENDIF
1370413707 IF (POINTS==1 .AND. SPATIAL_STATISTIC=='null' .AND. ALL(XB>-1E6_EB) .AND. ALL(XYZ<=-1E6_EB) .AND. XB_XYZ) THEN
1370513708 XYZ(1) = 0.5_EB*(XB(1)+XB(2))
1370613709 XYZ(2) = 0.5_EB*(XB(3)+XB(4))
@@ -14929,7 +14932,7 @@ SUBROUTINE PROC_DEVC
1492914932 WRITE(MESSAGE,'(3A)') 'ERROR(899): DEVC ',TRIM(DV%ID),' should not contain a + sign.'
1493014933 CALL SHUTDOWN(MESSAGE) ; RETURN
1493114934 ENDIF
14932-
14935+
1493314936 ! Check for HVAC outputs with no HVAC inputs
1493414937
1493514938 IF ((DV%DUCT_ID/='null' .OR. DV%NODE_ID(1)/='null') .AND. .NOT. HVAC_SOLVE) THEN
@@ -15006,7 +15009,7 @@ SUBROUTINE PROC_DEVC
1500615009 ENDIF
1500715010 IGNITION_ZONES(N_IGNITION_ZONES)%DEVC_INDEX = N
1500815011 IGNITION_ZONES(N_IGNITION_ZONES)%DEVC_ID = DV%ID
15009- ENDIF
15012+ ENDIF
1501015013 ENDIF
1501115014
1501215015 IF(TRIM(ODE_SOLVER)=='CVODE' .AND. N_IGNITION_ZONES >= 1) THEN
@@ -15526,7 +15529,7 @@ SUBROUTINE READ_PROF
1552615529 CALL SHUTDOWN(MESSAGE) ; RETURN
1552715530 ENDIF
1552815531 ENDIF
15529-
15532+
1553015533 IF (INIT_ID/='null') THEN
1553115534 INIT_DO: DO I=1,N_INIT
1553215535 IF (INIT_ID==INITIALIZATION(I)%ID) THEN
0 commit comments