Skip to content

Commit 34fb1da

Browse files
committed
FDS Source: Add ALT_ID lookup to INIT, BACK, and MATL
1 parent f94328e commit 34fb1da

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

Source/read.f90

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3278,7 +3278,8 @@ SUBROUTINE READ_SPEC
32783278
DO NS=1,MAX_SPECIES
32793279
IF (SPEC_ID(NS)/='null') THEN
32803280
DO N1=1,N_TRACKED_SPECIES
3281-
IF (SPECIES_MIXTURE(N1)%ID==SPEC_ID(NS)) THEN
3281+
IF (TRIM(SPECIES_MIXTURE(N1)%ID)==TRIM(SPEC_ID(NS)) .OR. &
3282+
TRIM(SPECIES_MIXTURE(N1)%ALT_ID)==TRIM(SPEC_ID(NS))) THEN
32823283
SPECIES_MIXTURE(N1)%ZZ0 = MASS_FRACTION(NS)
32833284
EXIT
32843285
ENDIF
@@ -7369,7 +7370,8 @@ SUBROUTINE PROC_MATL
73697370
CALL SHUTDOWN(MESSAGE) ; RETURN
73707371
ENDIF
73717372
DO NS2=1,N_TRACKED_SPECIES
7372-
IF (TRIM(ML%SPEC_ID(NS,NR))==TRIM(SPECIES_MIXTURE(NS2)%ID)) THEN
7373+
IF (TRIM(ML%SPEC_ID(NS,NR))==TRIM(SPECIES_MIXTURE(NS2)%ID) .OR. &
7374+
TRIM(ML%SPEC_ID(NS,NR))==TRIM(SPECIES_MIXTURE(NS2)%ALT_ID)) THEN
73737375
Z_INDEX(NS,NR) = NS2
73747376
ML%NU_GAS(Z_INDEX(NS,NR),NR) = ML%NU_SPEC(NS,NR)
73757377
EXIT
@@ -12784,7 +12786,9 @@ SUBROUTINE READ_INIT
1278412786
DO NS=1,MAX_SPECIES
1278512787
IF (SPEC_ID(NS)=='null') EXIT
1278612788
DO NS2=1,N_TRACKED_SPECIES
12787-
IF (TRIM(SPEC_ID(NS))==TRIM(SPECIES_MIXTURE(NS2)%ID)) THEN
12789+
12790+
IF (TRIM(SPEC_ID(NS))==TRIM(SPECIES_MIXTURE(NS2)%ID) .OR. &
12791+
TRIM(SPEC_ID(NS))==TRIM(SPECIES_MIXTURE(NS2)%ALT_ID)) THEN
1278812792
IF (NS2==1) THEN
1278912793
WRITE(MESSAGE,'(3A)') 'ERROR(847): INIT ',TRIM(ID),' cannot use background species for MASS_FRACTION.'
1279012794
CALL SHUTDOWN(MESSAGE) ; RETURN

0 commit comments

Comments
 (0)