Skip to content

Commit 1ad3439

Browse files
marcosvanellamarcosvanella
authored
Merge pull request #13779 from marcosvanella/master
FDS Source : Change syntax in some array section assignments.
2 parents d820b58 + 8194ab8 commit 1ad3439

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

‎Source/geom.f90‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12304,7 +12304,7 @@ SUBROUTINE COLLAPSE_CROSSINGS(BODINT_PLANE2,X1AXIS,X2AXIS,X3AXIS,X3RAY,X1PLN,ITI
1230412304
! defined as left_media:
1230512305
CC_IS_CRS2_AUX(LOW_IND:HIGH_IND,CC_N_CRS_AUX) = LEFT_MEDIA
1230612306
ELSEIF (IND_LEFT == LEFT_MEDIA) THEN
12307-
CC_IS_CRS2_AUX(LOW_IND:HIGH_IND,CC_N_CRS_AUX) = (/ IND_LEFT, IND_RIGHT /) ! GS or SG.
12307+
CC_IS_CRS2_AUX((/ LOW_IND, HIGH_IND/),CC_N_CRS_AUX) = (/ IND_LEFT, IND_RIGHT /) ! GS or SG.
1230812308
ELSE
1230912309
IF (ITITLE==1) THEN
1231012310
WRITE(LU_ERR,*) "Error GET_X2INTERSECTIONS: DROP_SS_GG = .TRUE., Didn't find left side continuity."
@@ -15694,7 +15694,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
1569415694
NEWSEG = ISEG
1569515695
COUNT= 1
1569615696
CTSTART=COUNT
15697-
SEG_FACE2(NOD1:NOD3+1,COUNT) = (/ SEG_FACE(NOD1,NEWSEG), SEG_FACE(NOD2,NEWSEG), ICF, NEWSEG /)
15697+
SEG_FACE2((/NOD1,NOD2,NOD3,NOD3+1/),COUNT) = (/ SEG_FACE(NOD1,NEWSEG), SEG_FACE(NOD2,NEWSEG), ICF, NEWSEG /)
1569815698
SEG_FLAG(ISEG) = .FALSE.
1569915699
NSEG_LEFT = NSEG - 1
1570015700

@@ -15725,7 +15725,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
1572515725
! Found a seg add to SEG_FACE2:
1572615726
IF ( FOUNDSEG ) THEN
1572715727
COUNT = COUNT + 1
15728-
SEG_FACE2(NOD1:NOD3+1,COUNT) = (/ SEG_FACE(NOD1,NEWSEG), SEG_FACE(NOD2,NEWSEG), ICF, NEWSEG /)
15728+
SEG_FACE2((/NOD1,NOD2,NOD3,NOD3+1/),COUNT) = (/ SEG_FACE(NOD1,NEWSEG),SEG_FACE(NOD2,NEWSEG),ICF,NEWSEG /)
1572915729
SEG_FLAG(NEWSEG) = .FALSE.
1573015730
NSEG_LEFT = NSEG_LEFT - 1
1573115731
ENDIF
@@ -15746,7 +15746,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
1574615746
IF ( SEG_FLAG(ISEG) ) THEN
1574715747
COUNT = COUNT + 1
1574815748
CTSTART= COUNT
15749-
SEG_FACE2(NOD1:NOD3+1,COUNT) = (/ SEG_FACE(NOD1,ISEG), SEG_FACE(NOD2,ISEG), ICF, ISEG /)
15749+
SEG_FACE2((/NOD1,NOD2,NOD3,NOD3+1/),COUNT) = (/ SEG_FACE(NOD1,ISEG), SEG_FACE(NOD2,ISEG), ICF, ISEG /)
1575015750
SEG_FLAG(ISEG) = .FALSE.
1575115751
NSEG_LEFT = NSEG_LEFT - 1
1575215752
EXIT
@@ -15797,12 +15797,12 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
1579715797
DO IPT=2,NP+1
1579815798
ICF_PT = CFELEM(IPT,ICF)
1579915799
! Define closed Polygon centered in First Point:
15800-
XY(IAXIS:JAXIS,IPT-1) = (/ XYZVERT(X2AXIS,ICF_PT)-XYZVERT(X2AXIS,CFELEM(2,ICF)), &
15801-
XYZVERT(X3AXIS,ICF_PT)-XYZVERT(X3AXIS,CFELEM(2,ICF)) /)
15800+
XY((/IAXIS,JAXIS/),IPT-1) = (/ XYZVERT(X2AXIS,ICF_PT)-XYZVERT(X2AXIS,CFELEM(2,ICF)), &
15801+
XYZVERT(X3AXIS,ICF_PT)-XYZVERT(X3AXIS,CFELEM(2,ICF)) /)
1580215802
ENDDO
1580315803
ICF_PT = CFELEM(2,ICF)
15804-
XY(IAXIS:JAXIS,NP+1) = (/ XYZVERT(X2AXIS,ICF_PT)-XYZVERT(X2AXIS,CFELEM(2,ICF)), &
15805-
XYZVERT(X3AXIS,ICF_PT)-XYZVERT(X3AXIS,CFELEM(2,ICF)) /)
15804+
XY((/IAXIS,JAXIS/),NP+1) = (/ XYZVERT(X2AXIS,ICF_PT)-XYZVERT(X2AXIS,CFELEM(2,ICF)), &
15805+
XYZVERT(X3AXIS,ICF_PT)-XYZVERT(X3AXIS,CFELEM(2,ICF)) /)
1580615806

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

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

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

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

1624916249
! ADD segment:
1625016250
NSSEG = NSSEG + 1
16251-
SEG_FACE(NOD1:NOD2,NSSEG) = (/ INOD1, INOD2 /)
16251+
SEG_FACE((/NOD1,NOD2/),NSSEG) = (/ INOD1, INOD2 /)
1625216252
DX3 = XYZVERT(X3AXIS,INOD2)-XYZVERT(X3AXIS,INOD1)
1625316253
DX2 = XYZVERT(X2AXIS,INOD2)-XYZVERT(X2AXIS,INOD1)
1625416254
ANGSEG(NSSEG) = ATAN2(DX3,DX2)
@@ -16313,7 +16313,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
1631316313
CALL SORT_VERTS(CC_MAXVERTS_FACE,NSVERT,XVERT1,XVERT2,X2FACE(JJ-FCELL+1),ASCDESC,NV,V)
1631416314
DO IV=1,NV-1
1631516315
NSSEG=NSSEG + 1
16316-
SEG_FACE(NOD1:NOD2,NSSEG) = (/ V(IV), V(IV+1) /)
16316+
SEG_FACE((/NOD1,NOD2/),NSSEG) = (/ V(IV), V(IV+1) /)
1631716317
ANGSEG(NSSEG) = PI / 2._EB
1631816318
ENDDO
1631916319

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

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

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

@@ -16469,7 +16469,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
1646916469
NEWSEG = ISEG
1647016470
COUNT= 1
1647116471
CTSTART=COUNT
16472-
SEG_FACE2(NOD1:NOD3,COUNT) = (/ SEG_FACE(NOD1,NEWSEG), SEG_FACE(NOD2,NEWSEG), ICF /)
16472+
SEG_FACE2((/NOD1,NOD2,NOD3/),COUNT) = (/ SEG_FACE(NOD1,NEWSEG),SEG_FACE(NOD2,NEWSEG),ICF /)
1647316473
SEG_FLAG(ISEG) = .FALSE.
1647416474
NSEG_LEFT = NSSEG - 1
1647516475

@@ -16501,7 +16501,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
1650116501
! Found a seg add to SEG_FACE2:
1650216502
IF ( FOUNDSEG ) THEN
1650316503
COUNT = COUNT + 1
16504-
SEG_FACE2(NOD1:NOD3,COUNT) = (/ SEG_FACE(NOD1,NEWSEG), SEG_FACE(NOD2,NEWSEG), ICF /)
16504+
SEG_FACE2((/NOD1,NOD2,NOD3/),COUNT) = (/ SEG_FACE(NOD1,NEWSEG), SEG_FACE(NOD2,NEWSEG), ICF /)
1650516505
SEG_FLAG(NEWSEG) = .FALSE.
1650616506
NSEG_LEFT = NSEG_LEFT - 1
1650716507
ENDIF
@@ -16522,7 +16522,7 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
1652216522
IF ( SEG_FLAG(ISEG) ) THEN
1652316523
COUNT = COUNT + 1
1652416524
CTSTART= COUNT
16525-
SEG_FACE2(NOD1:NOD3,COUNT) = (/ SEG_FACE(NOD1,ISEG), SEG_FACE(NOD2,ISEG), ICF /)
16525+
SEG_FACE2((/NOD1,NOD2,NOD3/),COUNT) = (/ SEG_FACE(NOD1,ISEG), SEG_FACE(NOD2,ISEG), ICF /)
1652616526
SEG_FLAG(ISEG) = .FALSE.
1652716527
NSEG_LEFT = NSEG_LEFT - 1
1652816528
EXIT
@@ -16556,10 +16556,10 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
1655616556
DO IPT=2,NP+1
1655716557
ICF_PT = CFELEM(IPT,COUNT)
1655816558
! Define closed Polygon:
16559-
XY(IAXIS:JAXIS,IPT-1) = (/ XYZVERT(X2AXIS,ICF_PT), XYZVERT(X3AXIS,ICF_PT) /)
16559+
XY((/IAXIS,JAXIS/),IPT-1) = (/ XYZVERT(X2AXIS,ICF_PT), XYZVERT(X3AXIS,ICF_PT) /)
1656016560
ENDDO
1656116561
ICF_PT = CFELEM(2,COUNT)
16562-
XY(IAXIS:JAXIS,NP+1) = (/ XYZVERT(X2AXIS,ICF_PT), XYZVERT(X3AXIS,ICF_PT) /) ! Close Polygon.
16562+
XY((/IAXIS,JAXIS/),NP+1) = (/ XYZVERT(X2AXIS,ICF_PT), XYZVERT(X3AXIS,ICF_PT) /) ! Close Polygon.
1656316563
AREA = 0._EB
1656416564
DO II2=1,NP
1656516565
AREA = AREA + ( XY(IAXIS,II2) * XY(JAXIS,II2+1) - &
@@ -16581,12 +16581,12 @@ SUBROUTINE GET_CARTFACE_CUTFACES(NM,ISTR,IEND,JSTR,JEND,KSTR,KEND,BNDINT_FLAG)
1658116581
DO IPT=2,NP+1
1658216582
ICF_PT = CFELEM(IPT,ICF)
1658316583
! Define closed Polygon centered in First Point:
16584-
XY(IAXIS:JAXIS,IPT-1) = (/ XYZVERT(X2AXIS,ICF_PT)-XYZVERT(X2AXIS,CFELEM(2,ICF)), &
16585-
XYZVERT(X3AXIS,ICF_PT)-XYZVERT(X3AXIS,CFELEM(2,ICF)) /)
16584+
XY((/IAXIS,JAXIS/),IPT-1) = (/ XYZVERT(X2AXIS,ICF_PT)-XYZVERT(X2AXIS,CFELEM(2,ICF)), &
16585+
XYZVERT(X3AXIS,ICF_PT)-XYZVERT(X3AXIS,CFELEM(2,ICF)) /)
1658616586
ENDDO
1658716587
ICF_PT = CFELEM(2,ICF)
16588-
XY(IAXIS:JAXIS,NP+1) = (/ XYZVERT(X2AXIS,ICF_PT)-XYZVERT(X2AXIS,CFELEM(2,ICF)), &
16589-
XYZVERT(X3AXIS,ICF_PT)-XYZVERT(X3AXIS,CFELEM(2,ICF)) /)
16588+
XY((/IAXIS,JAXIS/),NP+1) = (/ XYZVERT(X2AXIS,ICF_PT)-XYZVERT(X2AXIS,CFELEM(2,ICF)), &
16589+
XYZVERT(X3AXIS,ICF_PT)-XYZVERT(X3AXIS,CFELEM(2,ICF)) /)
1659016590

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

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

1662516625
ENDDO
1662616626

@@ -21640,9 +21640,9 @@ SUBROUTINE GET_TRIANG_FACE_INT(X2AXIS,X3AXIS,FVERT,CEI,NM, &
2164021640
! Define and Insertion add segments to CFELEM, indseg
2164121641
EDGETRI = CC_UNDEFINED
2164221642
DO IEDGE=1,NINTP_TRI-1
21643-
EDGETRI(NOD1:NOD2,IEDGE) = (/ TRINODS(IEDGE), TRINODS(IEDGE+1) /)
21643+
EDGETRI((/NOD1,NOD2/),IEDGE) = (/ TRINODS(IEDGE), TRINODS(IEDGE+1) /)
2164421644
ENDDO
21645-
EDGETRI(NOD1:NOD2,NINTP_TRI) = (/ TRINODS(NINTP_TRI), TRINODS(1) /)
21645+
EDGETRI((/NOD1,NOD2/),NINTP_TRI) = (/ TRINODS(NINTP_TRI), TRINODS(1) /)
2164621646

2164721647
LOCTRI = BODINT_PLANE%INDTRI(1,ITRI)
2164821648
LOCBOD = BODINT_PLANE%INDTRI(2,ITRI)
@@ -21712,9 +21712,9 @@ SUBROUTINE GET_TRIANG_FACE_INT(X2AXIS,X3AXIS,FVERT,CEI,NM, &
2171221712
VEC3(1) = GEOMETRY(LOCBOD)%EDGE_FACES(1,EDGE_TRI) ! WSEDTRI
2171321713
VEC3(2) = GEOMETRY(LOCBOD)%EDGE_FACES(2,EDGE_TRI)
2171421714
VEC3(3) = GEOMETRY(LOCBOD)%EDGE_FACES(4,EDGE_TRI)
21715-
INDSEG(1:4,NEDGE) = (/ VEC3(1), VEC3(2), VEC3(3), LOCBOD /)
21715+
INDSEG((/1,2,3,4/),NEDGE) = (/ VEC3(1), VEC3(2), VEC3(3), LOCBOD /)
2171621716
ELSE
21717-
INDSEG(1:4,NEDGE) = (/ 1, LOCTRI, 0, LOCBOD /)
21717+
INDSEG((/1,2,3,4/),NEDGE) = (/ 1, LOCTRI, 0, LOCBOD /)
2171821718
ENDIF
2171921719
ENDIF
2172021720
ENDDO
@@ -25900,9 +25900,9 @@ SUBROUTINE TRIANGULATE(DIR,VERTS,NVERTS,VERT_OFFSET,FACES,LOCTYPE)
2590025900
VERT_LIST(NLIST+1) = VERT_LIST(1)
2590125901
NODE_EXISTS(1:NLIST+1) = .TRUE.
2590225902
DO I = 1, NLIST-1
25903-
EDGE_LIST(1:2,I) = (/ VERT_LIST(I), VERT_LIST(I+1) /)
25903+
EDGE_LIST((/1,2/),I) = (/ VERT_LIST(I), VERT_LIST(I+1) /)
2590425904
ENDDO
25905-
EDGE_LIST(1:2,NLIST) = (/ VERT_LIST(NEDGES), VERT_LIST(1) /)
25905+
EDGE_LIST((/1,2/),NLIST) = (/ VERT_LIST(NEDGES), VERT_LIST(1) /)
2590625906
FACES(1:3*(NVERTS-2)) = VERT_OFFSET+VERT_LIST(NLIST)
2590725907

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

0 commit comments

Comments
 (0)