Merge pull request #13424 from drjfloyd/master

FDS Source: Fix error check for AEROSOL with no MEAN_DIAMETER. Issue …
firemodels · Sep 11, 2024 · b23f88d · b23f88d
2 parents a6824ab + 6418248
commit b23f88d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Source/read.f90 b/Source/read.f90
@@ -2522,7 +2522,7 @@ SUBROUTINE READ_SPEC
             WRITE(MESSAGE,'(A,I0,A)') 'ERROR(133): SPEC ',N_SPEC_READ,': AEROSOL must be .TRUE. to use N_BINS.'
             CALL SHUTDOWN(MESSAGE) ; RETURN
          ENDIF
-         IF (ABS(MEAN_DIAMETER - 1.E-6_EB) < TWO_EPSILON_EB) THEN
+         IF (MEAN_DIAMETER > TWO_EPSILON_EB) THEN
             WRITE(MESSAGE,'(A,I0,A)') 'ERROR(134): SPEC ',N_SPEC_READ,': Do not specify MEAN_DIAMETER and N_BINS.'
             CALL SHUTDOWN(MESSAGE) ; RETURN
          ENDIF
@@ -2663,8 +2663,8 @@ SUBROUTINE READ_SPEC
                                 ': If one of SPECIFIC_HEAT_LIQUID (or RAMP_CL_L) or HEAT_OF_VAPORIZATION defined, both must be'
       CALL SHUTDOWN(MESSAGE) ; RETURN
    ENDIF
-   IF (N_BINS==0 .AND. AEROSOL .AND. MEAN_DIAMETER < 0._EB) THEN
-      WRITE(MESSAGE,'(A,I0,A)') 'ERROR(158): SPEC ',N_SPEC_READ,': No MEAN_DIAMETER given.'
+   IF (N_BINS<0 .AND. AEROSOL .AND. MEAN_DIAMETER < 0._EB) THEN
+      WRITE(MESSAGE,'(A,A,A)') 'ERROR(158): SPEC ',TRIM(ID),', No MEAN_DIAMETER given.'
       CALL SHUTDOWN(MESSAGE) ; RETURN
    ENDIF
    IF (ANY(MASS_FRACTION>0._EB) .AND. ANY(VOLUME_FRACTION>0._EB)) THEN