Skip to content

FDS Source : Change syntax in some array section assignments. #13779

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
marcosvanella merged 1 commit into from
Nov 19, 2024
Merged

FDS Source : Change syntax in some array section assignments. #13779

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
62 changes: 31 additions & 31 deletions Source/geom.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12304,7 +12304,7 @@ SUBROUTINE COLLAPSE_CROSSINGS(BODINT_PLANE2,X1AXIS,X2AXIS,X3AXIS,X3RAY,X1PLN,ITI
! defined as left_media:
CC_IS_CRS2_AUX(LOW_IND:HIGH_IND,CC_N_CRS_AUX) = LEFT_MEDIA
ELSEIF (IND_LEFT == LEFT_MEDIA) THEN
CC_IS_CRS2_AUX(LOW_IND:HIGH_IND,CC_N_CRS_AUX) = (/ IND_LEFT, IND_RIGHT /) ! GS or SG.
CC_IS_CRS2_AUX((/ LOW_IND, HIGH_IND/),CC_N_CRS_AUX) = (/ IND_LEFT, IND_RIGHT /) ! GS or SG.
ELSE
IF (ITITLE==1) THEN
WRITE(LU_ERR,*) "Error GET_X2INTERSECTIONS: DROP_SS_GG = .TRUE., Didn't find left side continuity."
Expand Down Expand Up @@ -15694,7 +15694,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
NEWSEG = ISEG
COUNT= 1
CTSTART=COUNT
SEG_FACE2(NOD1:NOD3+1,COUNT) = (/ SEG_FACE(NOD1,NEWSEG), SEG_FACE(NOD2,NEWSEG), ICF, NEWSEG /)
SEG_FACE2((/NOD1,NOD2,NOD3,NOD3+1/),COUNT) = (/ SEG_FACE(NOD1,NEWSEG), SEG_FACE(NOD2,NEWSEG), ICF, NEWSEG /)
SEG_FLAG(ISEG) = .FALSE.
NSEG_LEFT = NSEG - 1

Expand Down Expand Up @@ -15725,7 +15725,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
! Found a seg add to SEG_FACE2:
IF ( FOUNDSEG ) THEN
COUNT = COUNT + 1
SEG_FACE2(NOD1:NOD3+1,COUNT) = (/ SEG_FACE(NOD1,NEWSEG), SEG_FACE(NOD2,NEWSEG), ICF, NEWSEG /)
SEG_FACE2((/NOD1,NOD2,NOD3,NOD3+1/),COUNT) = (/ SEG_FACE(NOD1,NEWSEG),SEG_FACE(NOD2,NEWSEG),ICF,NEWSEG /)
SEG_FLAG(NEWSEG) = .FALSE.
NSEG_LEFT = NSEG_LEFT - 1
ENDIF
Expand All @@ -15746,7 +15746,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
IF ( SEG_FLAG(ISEG) ) THEN
COUNT = COUNT + 1
CTSTART= COUNT
SEG_FACE2(NOD1:NOD3+1,COUNT) = (/ SEG_FACE(NOD1,ISEG), SEG_FACE(NOD2,ISEG), ICF, ISEG /)
SEG_FACE2((/NOD1,NOD2,NOD3,NOD3+1/),COUNT) = (/ SEG_FACE(NOD1,ISEG), SEG_FACE(NOD2,ISEG), ICF, ISEG /)
SEG_FLAG(ISEG) = .FALSE.
NSEG_LEFT = NSEG_LEFT - 1
EXIT
Expand Down Expand Up @@ -15797,12 +15797,12 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
DO IPT=2,NP+1
ICF_PT = CFELEM(IPT,ICF)
! Define closed Polygon centered in First Point:
XY(IAXIS:JAXIS,IPT-1) = (/ XYZVERT(X2AXIS,ICF_PT)-XYZVERT(X2AXIS,CFELEM(2,ICF)), &
XYZVERT(X3AXIS,ICF_PT)-XYZVERT(X3AXIS,CFELEM(2,ICF)) /)
XY((/IAXIS,JAXIS/),IPT-1) = (/ XYZVERT(X2AXIS,ICF_PT)-XYZVERT(X2AXIS,CFELEM(2,ICF)), &
XYZVERT(X3AXIS,ICF_PT)-XYZVERT(X3AXIS,CFELEM(2,ICF)) /)
ENDDO
ICF_PT = CFELEM(2,ICF)
XY(IAXIS:JAXIS,NP+1) = (/ XYZVERT(X2AXIS,ICF_PT)-XYZVERT(X2AXIS,CFELEM(2,ICF)), &
XYZVERT(X3AXIS,ICF_PT)-XYZVERT(X3AXIS,CFELEM(2,ICF)) /)
XY((/IAXIS,JAXIS/),NP+1) = (/ XYZVERT(X2AXIS,ICF_PT)-XYZVERT(X2AXIS,CFELEM(2,ICF)), &
XYZVERT(X3AXIS,ICF_PT)-XYZVERT(X3AXIS,CFELEM(2,ICF)) /)

! Get Area and Centroid properties of Cut-face:
AREA = 0._EB
Expand Down Expand Up @@ -15848,7 +15848,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)

! Add to cut-face:
AREAV(ICF) = AREA
XYZCEN(IAXIS:KAXIS,ICF) = (/ X1FACE(II), CX2, CX3 /)
XYZCEN((/IAXIS,JAXIS,KAXIS/),ICF) = (/ X1FACE(II), CX2, CX3 /)

! Fields for cut-cell volume/centroid computation:
! dot(e1,nc)*int(x1)dA, where x=x1face(ii) constant and nc=e1:
Expand Down Expand Up @@ -15903,7 +15903,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
DO IPT=2,NP2+1
ICF_PT = CFELEM(IPT,ICF2)
! Define closed Polygon:
XY(IAXIS:JAXIS,IPT-1) = (/ XYZVERT(X2AXIS,ICF_PT), XYZVERT(X3AXIS,ICF_PT) /)
XY((/IAXIS,JAXIS/),IPT-1) = (/ XYZVERT(X2AXIS,ICF_PT), XYZVERT(X3AXIS,ICF_PT) /)
ENDDO

CALL TEST_PT_INPOLY(NP2,XY,XYC1,PTSFLAG)
Expand Down Expand Up @@ -16248,7 +16248,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)

! ADD segment:
NSSEG = NSSEG + 1
SEG_FACE(NOD1:NOD2,NSSEG) = (/ INOD1, INOD2 /)
SEG_FACE((/NOD1,NOD2/),NSSEG) = (/ INOD1, INOD2 /)
DX3 = XYZVERT(X3AXIS,INOD2)-XYZVERT(X3AXIS,INOD1)
DX2 = XYZVERT(X2AXIS,INOD2)-XYZVERT(X2AXIS,INOD1)
ANGSEG(NSSEG) = ATAN2(DX3,DX2)
Expand Down Expand Up @@ -16313,7 +16313,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
CALL SORT_VERTS(CC_MAXVERTS_FACE,NSVERT,XVERT1,XVERT2,X2FACE(JJ-FCELL+1),ASCDESC,NV,V)
DO IV=1,NV-1
NSSEG=NSSEG + 1
SEG_FACE(NOD1:NOD2,NSSEG) = (/ V(IV), V(IV+1) /)
SEG_FACE((/NOD1,NOD2/),NSSEG) = (/ V(IV), V(IV+1) /)
ANGSEG(NSSEG) = PI / 2._EB
ENDDO

Expand All @@ -16324,7 +16324,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
CALL SORT_VERTS(CC_MAXVERTS_FACE,NSVERT,XVERT1,XVERT2,X3FACE(KK-FCELL+1),ASCDESC,NV,V)
DO IV=1,NV-1
NSSEG=NSSEG + 1
SEG_FACE(NOD1:NOD2,NSSEG) = (/ V(IV), V(IV+1) /)
SEG_FACE((/NOD1,NOD2/),NSSEG) = (/ V(IV), V(IV+1) /)
ANGSEG(NSSEG) = PI
ENDDO

Expand All @@ -16335,7 +16335,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
CALL SORT_VERTS(CC_MAXVERTS_FACE,NSVERT,XVERT1,XVERT2,X2FACE(JJ-FCELL),ASCDESC,NV,V)
DO IV=1,NV-1
NSSEG=NSSEG + 1
SEG_FACE(NOD1:NOD2,NSSEG) = (/ V(IV), V(IV+1) /)
SEG_FACE((/NOD1,NOD2/),NSSEG) = (/ V(IV), V(IV+1) /)
ANGSEG(NSSEG) = - PI / 2._EB
ENDDO

Expand All @@ -16346,7 +16346,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
CALL SORT_VERTS(CC_MAXVERTS_FACE,NSVERT,XVERT1,XVERT2,X3FACE(KK-FCELL),ASCDESC,NV,V)
DO IV=1,NV-1
NSSEG=NSSEG + 1
SEG_FACE(NOD1:NOD2,NSSEG) = (/ V(IV), V(IV+1) /)
SEG_FACE((/NOD1,NOD2/),NSSEG) = (/ V(IV), V(IV+1) /)
ANGSEG(NSSEG) = 0._EB
ENDDO

Expand Down Expand Up @@ -16469,7 +16469,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
NEWSEG = ISEG
COUNT= 1
CTSTART=COUNT
SEG_FACE2(NOD1:NOD3,COUNT) = (/ SEG_FACE(NOD1,NEWSEG), SEG_FACE(NOD2,NEWSEG), ICF /)
SEG_FACE2((/NOD1,NOD2,NOD3/),COUNT) = (/ SEG_FACE(NOD1,NEWSEG),SEG_FACE(NOD2,NEWSEG),ICF /)
SEG_FLAG(ISEG) = .FALSE.
NSEG_LEFT = NSSEG - 1

Expand Down Expand Up @@ -16501,7 +16501,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
! Found a seg add to SEG_FACE2:
IF ( FOUNDSEG ) THEN
COUNT = COUNT + 1
SEG_FACE2(NOD1:NOD3,COUNT) = (/ SEG_FACE(NOD1,NEWSEG), SEG_FACE(NOD2,NEWSEG), ICF /)
SEG_FACE2((/NOD1,NOD2,NOD3/),COUNT) = (/ SEG_FACE(NOD1,NEWSEG), SEG_FACE(NOD2,NEWSEG), ICF /)
SEG_FLAG(NEWSEG) = .FALSE.
NSEG_LEFT = NSEG_LEFT - 1
ENDIF
Expand All @@ -16522,7 +16522,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
IF ( SEG_FLAG(ISEG) ) THEN
COUNT = COUNT + 1
CTSTART= COUNT
SEG_FACE2(NOD1:NOD3,COUNT) = (/ SEG_FACE(NOD1,ISEG), SEG_FACE(NOD2,ISEG), ICF /)
SEG_FACE2((/NOD1,NOD2,NOD3/),COUNT) = (/ SEG_FACE(NOD1,ISEG), SEG_FACE(NOD2,ISEG), ICF /)
SEG_FLAG(ISEG) = .FALSE.
NSEG_LEFT = NSEG_LEFT - 1
EXIT
Expand Down Expand Up @@ -16556,10 +16556,10 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
DO IPT=2,NP+1
ICF_PT = CFELEM(IPT,COUNT)
! Define closed Polygon:
XY(IAXIS:JAXIS,IPT-1) = (/ XYZVERT(X2AXIS,ICF_PT), XYZVERT(X3AXIS,ICF_PT) /)
XY((/IAXIS,JAXIS/),IPT-1) = (/ XYZVERT(X2AXIS,ICF_PT), XYZVERT(X3AXIS,ICF_PT) /)
ENDDO
ICF_PT = CFELEM(2,COUNT)
XY(IAXIS:JAXIS,NP+1) = (/ XYZVERT(X2AXIS,ICF_PT), XYZVERT(X3AXIS,ICF_PT) /) ! Close Polygon.
XY((/IAXIS,JAXIS/),NP+1) = (/ XYZVERT(X2AXIS,ICF_PT), XYZVERT(X3AXIS,ICF_PT) /) ! Close Polygon.
AREA = 0._EB
DO II2=1,NP
AREA = AREA + ( XY(IAXIS,II2) * XY(JAXIS,II2+1) - &
Expand All @@ -16581,12 +16581,12 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
DO IPT=2,NP+1
ICF_PT = CFELEM(IPT,ICF)
! Define closed Polygon centered in First Point:
XY(IAXIS:JAXIS,IPT-1) = (/ XYZVERT(X2AXIS,ICF_PT)-XYZVERT(X2AXIS,CFELEM(2,ICF)), &
XYZVERT(X3AXIS,ICF_PT)-XYZVERT(X3AXIS,CFELEM(2,ICF)) /)
XY((/IAXIS,JAXIS/),IPT-1) = (/ XYZVERT(X2AXIS,ICF_PT)-XYZVERT(X2AXIS,CFELEM(2,ICF)), &
XYZVERT(X3AXIS,ICF_PT)-XYZVERT(X3AXIS,CFELEM(2,ICF)) /)
ENDDO
ICF_PT = CFELEM(2,ICF)
XY(IAXIS:JAXIS,NP+1) = (/ XYZVERT(X2AXIS,ICF_PT)-XYZVERT(X2AXIS,CFELEM(2,ICF)), &
XYZVERT(X3AXIS,ICF_PT)-XYZVERT(X3AXIS,CFELEM(2,ICF)) /)
XY((/IAXIS,JAXIS/),NP+1) = (/ XYZVERT(X2AXIS,ICF_PT)-XYZVERT(X2AXIS,CFELEM(2,ICF)), &
XYZVERT(X3AXIS,ICF_PT)-XYZVERT(X3AXIS,CFELEM(2,ICF)) /)

! Get Area and Centroid properties of Cut-face:
AREA = 0._EB
Expand Down Expand Up @@ -16620,7 +16620,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)

! Add to cut-face:
AREAV(ICF) = AREA
XYZCEN(IAXIS:KAXIS,ICF) = (/ X1FACE(II), CX2, CX3 /)
XYZCEN((/IAXIS,JAXIS,KAXIS/),ICF) = (/ X1FACE(II), CX2, CX3 /)

ENDDO

Expand Down Expand Up @@ -21640,9 +21640,9 @@ SUBROUTINE GET_TRIANG_FACE_INT(X2AXIS,X3AXIS,FVERT,CEI,NM, &
! Define and Insertion add segments to CFELEM, indseg
EDGETRI = CC_UNDEFINED
DO IEDGE=1,NINTP_TRI-1
EDGETRI(NOD1:NOD2,IEDGE) = (/ TRINODS(IEDGE), TRINODS(IEDGE+1) /)
EDGETRI((/NOD1,NOD2/),IEDGE) = (/ TRINODS(IEDGE), TRINODS(IEDGE+1) /)
ENDDO
EDGETRI(NOD1:NOD2,NINTP_TRI) = (/ TRINODS(NINTP_TRI), TRINODS(1) /)
EDGETRI((/NOD1,NOD2/),NINTP_TRI) = (/ TRINODS(NINTP_TRI), TRINODS(1) /)

LOCTRI = BODINT_PLANE%INDTRI(1,ITRI)
LOCBOD = BODINT_PLANE%INDTRI(2,ITRI)
Expand Down Expand Up @@ -21712,9 +21712,9 @@ SUBROUTINE GET_TRIANG_FACE_INT(X2AXIS,X3AXIS,FVERT,CEI,NM, &
VEC3(1) = GEOMETRY(LOCBOD)%EDGE_FACES(1,EDGE_TRI) ! WSEDTRI
VEC3(2) = GEOMETRY(LOCBOD)%EDGE_FACES(2,EDGE_TRI)
VEC3(3) = GEOMETRY(LOCBOD)%EDGE_FACES(4,EDGE_TRI)
INDSEG(1:4,NEDGE) = (/ VEC3(1), VEC3(2), VEC3(3), LOCBOD /)
INDSEG((/1,2,3,4/),NEDGE) = (/ VEC3(1), VEC3(2), VEC3(3), LOCBOD /)
ELSE
INDSEG(1:4,NEDGE) = (/ 1, LOCTRI, 0, LOCBOD /)
INDSEG((/1,2,3,4/),NEDGE) = (/ 1, LOCTRI, 0, LOCBOD /)
ENDIF
ENDIF
ENDDO
Expand Down Expand Up @@ -25900,9 +25900,9 @@ SUBROUTINE TRIANGULATE(DIR,VERTS,NVERTS,VERT_OFFSET,FACES,LOCTYPE)
VERT_LIST(NLIST+1) = VERT_LIST(1)
NODE_EXISTS(1:NLIST+1) = .TRUE.
DO I = 1, NLIST-1
EDGE_LIST(1:2,I) = (/ VERT_LIST(I), VERT_LIST(I+1) /)
EDGE_LIST((/1,2/),I) = (/ VERT_LIST(I), VERT_LIST(I+1) /)
ENDDO
EDGE_LIST(1:2,NLIST) = (/ VERT_LIST(NEDGES), VERT_LIST(1) /)
EDGE_LIST((/1,2/),NLIST) = (/ VERT_LIST(NEDGES), VERT_LIST(1) /)
FACES(1:3*(NVERTS-2)) = VERT_OFFSET+VERT_LIST(NLIST)

IF (DIR == 0) THEN ! INBOUNDARY cut-face, always convex polygon.
Expand Down