FDS Source: add back changes that were overwritten

firemodels · Feb 11, 2021 · 128c291 · 128c291
1 parent da8342f
commit 128c291
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/Source/read.f90 b/Source/read.f90
@@ -6144,7 +6144,7 @@ SUBROUTINE READ_PROP
    PY%SPRAY_ANGLE = SPRAY_ANGLE*DEG2RAD
    IF(ANY(PY%SPRAY_ANGLE(1:2,2)<0)) PY%SPRAY_ANGLE(1:2,2)=PY%SPRAY_ANGLE(1:2,1)
    SPRAY_PATTERN_MU=SPRAY_PATTERN_MU*DEG2RAD
-   IF (PART_ID/='null' .AND. SPRAY_PATTERN_TABLE == 'null' ) THEN
+   IF (PART_ID/='null' .AND. SPRAY_PATTERN_TABLE == 'null' .AND. PDPA_RADIUS<TWO_EPSILON_EB) THEN
       ALLOCATE(PY%SPRAY_LON_CDF(0:NDC2),PY%SPRAY_LON(0:NDC2),PY%SPRAY_LAT(0:NDC2),PY%SPRAY_LAT_CDF(0:NDC2,0:NDC2))
       IF(SPRAY_PATTERN_MU<0._EB) THEN
          IF(SPRAY_ANGLE(1,1)>0._EB) THEN
@@ -6154,8 +6154,7 @@ SUBROUTINE READ_PROP
          ENDIF
       ENDIF
       CALL SPRAY_ANGLE_DISTRIBUTION(PY%SPRAY_LON,PY%SPRAY_LAT,PY%SPRAY_LON_CDF,PY%SPRAY_LAT_CDF, &
-                                      SPRAY_PATTERN_BETA,SPRAY_PATTERN_MU,PY%SPRAY_ANGLE &
-                                      ,SPRAY_PATTERN_SHAPE,NDC2)
+                                    SPRAY_PATTERN_BETA,SPRAY_PATTERN_MU,PY%SPRAY_ANGLE,SPRAY_PATTERN_SHAPE,NDC2)
    ENDIF
 
    ! PDPA model