Skip to content

Revert "FDS Source: Distinguish INIT particles and regions" #15300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcgratta merged 1 commit into from
Oct 10, 2025
Merged

Revert "FDS Source: Distinguish INIT particles and regions" #15300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions Source/part.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 1 addition & 6 deletions Source/read.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading