Merge pull request #13190 from drjfloyd/master

FDS Source: Missing ALT_ID in SURF mass flux / fraction lookup
firemodels · Jul 18, 2024 · a320176 · a320176
2 parents c423038 + 74ada71
commit a320176
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/Source/read.f90 b/Source/read.f90
@@ -8272,7 +8272,7 @@ SUBROUTINE READ_SURF(QUICK_READ)
          DO NN=1,MAX_SPECIES
             IF (TRIM(SPEC_ID(NN))=='null') EXIT
             DO NNN=1,N_TRACKED_SPECIES
-               IF (TRIM(SPECIES_MIXTURE(NNN)%ID)==TRIM(SPEC_ID(NN))) THEN
+               IF (TRIM(SPECIES_MIXTURE(NNN)%ID)==TRIM(SPEC_ID(NN)) .OR. TRIM(SPECIES_MIXTURE(NNN)%ALT_ID)==TRIM(SPEC_ID(NN))) THEN
                   SF%MASS_FLUX(NNN)    = MASS_FLUX(NN)
                   SF%MASS_FRACTION(NNN)= MASS_FRACTION(NN)
                   SF%RAMP(NNN)%TAU     = TAU_MF(NN)/TIME_SHRINK_FACTOR
@@ -9029,8 +9029,10 @@ SUBROUTINE PROC_SURF_2
                FUEL_MF = 0._EB
                DO NS=1,N_TRACKED_SPECIES
                   IF (SF%MASS_FRACTION(NS) > 0._EB) THEN
-                     IF (ANY(REAC_FUEL==SPECIES_MIXTURE(NS)%ID)) THEN
+                     IF (ANY(REAC_FUEL==SPECIES_MIXTURE(NS)%ID) .OR. ANY(REAC_FUEL==SPECIES_MIXTURE(NS)%ALT_ID)) THEN
+                        NR = -1
                         NR = FINDLOC(REAC_FUEL,SPECIES_MIXTURE(NS)%ID,1)
+                        IF (NR==-1) NR = FINDLOC(REAC_FUEL,SPECIES_MIXTURE(NS)%ALT_ID,1)
                         RN => REACTION(NR)
                         IF (DUPLICATE_FUEL(NR)) THEN
                            WRITE(MESSAGE,'(5A)') 'ERROR(360): SURF ',TRIM(SF%ID),' uses HRRPUA but SPEC ', &
@@ -9071,8 +9073,11 @@ SUBROUTINE PROC_SURF_2
             IF (ANY(SF%MASS_FRACTION > 0._EB)) THEN
                FUEL_MF = 0._EB
                DO NS=1,N_TRACKED_SPECIES
-                  IF (SF%MASS_FRACTION(NS) > 0._EB .AND. ANY(REAC_FUEL==SPECIES_MIXTURE(NS)%ID)) THEN
+                  IF (SF%MASS_FRACTION(NS) > 0._EB .AND. &
+                     (ANY(REAC_FUEL==SPECIES_MIXTURE(NS)%ID).OR. ANY(REAC_FUEL==SPECIES_MIXTURE(NS)%ALT_ID))) THEN
+                     NR = -1
                      NR = FINDLOC(REAC_FUEL,SPECIES_MIXTURE(NS)%ID,1)
+                     IF (NR==-1) NR = FINDLOC(REAC_FUEL,SPECIES_MIXTURE(NS)%ALT_ID,1)
                      RN => REACTION(NR)
                      IF (DUPLICATE_FUEL(NR)) THEN
                         WRITE(MESSAGE,'(5A)') 'ERROR(362): SURF ',TRIM(SF%ID),' uses MLRPUA and species ', &