Merge pull request #15300 from mcgratta/master

Revert "FDS Source: Distinguish INIT particles and regions"

Author: mcgratta

Source/part.f90

@@ -1012,14 +1012,15 @@ SUBROUTINE INSERT_VOLUMETRIC_PARTICLES
 
 ! If the INIT volume is outside the current mesh, return
 
-SELECT CASE(IN%SHAPE)
-   CASE ('BLOCK')
-      IF (IN_X1>=XF .OR. IN_X2<=XS .OR. IN_Y1>=YF .OR. IN_Y2<=YS .OR. IN_Z1>=ZF .OR. IN_Z2<=ZS) RETURN
-   CASE ('RING')
-      IF (RING_MESH_INTERSECTION_ARC(NM,IN%X0,IN%Y0,IN%RADIUS)<TWO_EPSILON_EB) RETURN
-   CASE DEFAULT
-      IF (IN_X1>XF .OR. IN_X2<XS .OR. IN_Y1>YF .OR. IN_Y2<YS .OR. IN_Z1>ZF .OR. IN_Z2<ZS) RETURN
-END SELECT
+IF (IN%SHAPE/='RING' .AND. IN%SHAPE/='LINE') THEN
+   IF ((IN_X1-XF)>50._EB*TWO_EPSILON_EB .OR. (IN_X2-XS)<-50._EB*TWO_EPSILON_EB .OR. &
+       (IN_Y1-YF)>50._EB*TWO_EPSILON_EB .OR. (IN_Y2-YS)<-50._EB*TWO_EPSILON_EB .OR. &
+       (IN_Z1-ZF)>50._EB*TWO_EPSILON_EB .OR. (IN_Z2-ZS)<-50._EB*TWO_EPSILON_EB) RETURN
+ELSEIF (IN%SHAPE=='RING') THEN
+   IF (RING_MESH_INTERSECTION_ARC(NM,IN%X0,IN%Y0,IN%RADIUS)<TWO_EPSILON_EB) RETURN
+ELSE
+   IF (IN_X1>XF .OR. IN_X2<XS .OR. IN_Y1>YF .OR. IN_Y2<YS .OR. IN_Z1>ZF .OR. IN_Z2<ZS) RETURN
+ENDIF
 
 ! Skip mesh that is contained completely within a ring
 

Source/read.f90

@@ -12899,7 +12899,6 @@ SUBROUTINE READ_INIT
       XB(1:2) = XYZ(1)
       XB(3:4) = XYZ(2)
       XB(5:6) = XYZ(3)
-      IF (SHAPE=='null') SHAPE = 'POINT'
    ENDIF
 
    ! If an offset has been specified, set the SHAPE to LINE.
@@ -12912,10 +12911,6 @@ SUBROUTINE READ_INIT
       XB(6) = XB(5) + DZ*(N_PARTICLES-1)
    ENDIF
 
-   ! If the INIT region is not a POINT or a LINE, assume it is a BLOCK unless user says otherwise
-
-   IF (SHAPE=='null') SHAPE = 'BLOCK'
-
    ! Create a box around a CONE
 
    IF (SHAPE=='CONE' .OR. SHAPE=='RING' .OR. SHAPE=='CYLINDER') THEN
@@ -13360,7 +13355,7 @@ SUBROUTINE SET_INIT_DEFAULTS
 RAMP_PART                 = 'null'
 RAMP_Q                    = 'null'
 RAMP_TMP_Z                = 'null'
-SHAPE                     = 'null'
+SHAPE                     = 'BLOCK'
 SPEC_ID                   = 'null'
 TEMPERATURE               = -1000._EB
 TREE_HEIGHT               = -1._EB