Skip to content

Commit 6339569

Browse files
authored
Merge pull request #12655 from mcgratta/master
FDS Source: Issue #12641. Fix bug in algorithm to detect merge pressu…
2 parents 5c6299f + 15df532 commit 6339569

File tree

1 file changed

+18
-10
lines changed

1 file changed

+18
-10
lines changed

Diff for: Source/main.f90

+18-10
Original file line numberDiff line numberDiff line change
@@ -1793,6 +1793,7 @@ SUBROUTINE EXCHANGE_DIVERGENCE_INFO
17931793

17941794
INTEGER :: IPZ,IOPZ,IOPZ2
17951795
REAL(EB) :: TNOW
1796+
LOGICAL :: NEW_CONNECTION
17961797

17971798
TNOW = CURRENT_TIME()
17981799

@@ -1836,16 +1837,23 @@ SUBROUTINE EXCHANGE_DIVERGENCE_INFO
18361837
! Connect zones to others which are not directly connected
18371838

18381839
DO NM=1,NMESHES
1839-
DO IPZ=1,N_ZONE
1840-
DO IOPZ=1,N_ZONE
1841-
IF (IOPZ==IPZ) CYCLE
1842-
IF (CONNECTED_ZONES(IPZ,IOPZ,NM)) THEN
1843-
DO IOPZ2=0,N_ZONE
1844-
IF (IOPZ==IOPZ2) CYCLE
1845-
IF (CONNECTED_ZONES(IOPZ,IOPZ2,NM)) CONNECTED_ZONES(IPZ,IOPZ2,NM) = .TRUE.
1846-
IF (CONNECTED_ZONES(IOPZ,IOPZ2,NM)) CONNECTED_ZONES(IOPZ2,IPZ,NM) = .TRUE.
1847-
ENDDO
1848-
ENDIF
1840+
NEW_CONNECTION = .TRUE.
1841+
DO WHILE (NEW_CONNECTION)
1842+
NEW_CONNECTION = .FALSE.
1843+
DO IPZ=1,N_ZONE
1844+
DO IOPZ=1,N_ZONE
1845+
IF (IOPZ==IPZ) CYCLE
1846+
IF (CONNECTED_ZONES(IPZ,IOPZ,NM)) THEN
1847+
DO IOPZ2=0,N_ZONE
1848+
IF (IOPZ==IOPZ2) CYCLE
1849+
IF (CONNECTED_ZONES(IOPZ,IOPZ2,NM)) THEN
1850+
IF (.NOT.CONNECTED_ZONES(IPZ,IOPZ2,NM)) NEW_CONNECTION = .TRUE.
1851+
CONNECTED_ZONES(IPZ,IOPZ2,NM) = .TRUE.
1852+
CONNECTED_ZONES(IOPZ2,IPZ,NM) = .TRUE.
1853+
ENDIF
1854+
ENDDO
1855+
ENDIF
1856+
ENDDO
18491857
ENDDO
18501858
ENDDO
18511859
ENDDO

0 commit comments

Comments
 (0)