Merge pull request #11902 from marcosvanella/master

FDS Source : GET_CARTCELL_CUTCELLS avoid integer overflow.
firemodels · Jun 13, 2023 · 755cc22 · 755cc22
2 parents c0a5645 + 63fd9c5
commit 755cc22
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/Source/geom.f90 b/Source/geom.f90
@@ -20736,7 +20736,7 @@ SUBROUTINE GET_CARTCELL_CUTCELLS(NM)
          NUM_FACE     = NFACE_CELL
          CTVAL2       = 0
          MAXSEG       = MAXVAL(FACE_CELL(1,1:NFACE_CELL))
-         THRES        = (MAXSEG*NFACE_CELL)**2
+         THRES        = HUGE(1); IF(REAL(MAXSEG*NFACE_CELL,EB)**2<REAL(THRES,EB)) THRES=(MAXSEG*NFACE_CELL)**2
          CYCLE_CELL   = .FALSE.
          ! Now double infinite loops:
          INF_LOOP1 : DO
@@ -20926,8 +20926,13 @@ SUBROUTINE GET_CARTCELL_CUTCELLS(NM)
                        FACE_LIST(1:CC_NPARAM_CCFACE,NFACE_CELL) = (/ CC_FTYPE_CFINB,0,0,IDCF, NIBFACE,CC_UNDEFINED /)
                     ENDDO SIDE_LOOP
                 ENDDO AXIS_LOOP
-                MESHES(NM)%CUT_FACE(IDCF)%NFACE = NIBFACE
-                MESHES(NM)%CUT_FACE(IDCF)%XYZVERT(IAXIS:KAXIS,1:NVERT_CELL) = XYZVERT(IAXIS:KAXIS,1:NVERT_CELL)
+                IF(NIBFACE==0) THEN
+                   MESHES(NM)%CUT_FACE(IDCF)%STATUS = CC_SOLID
+                   MESHES(NM)%CCVAR(I,J,K,CC_IDCF)  = CC_UNDEFINED
+                ELSE
+                   MESHES(NM)%CUT_FACE(IDCF)%NFACE  = NIBFACE
+                   MESHES(NM)%CUT_FACE(IDCF)%XYZVERT(IAXIS:KAXIS,1:NVERT_CELL) = XYZVERT(IAXIS:KAXIS,1:NVERT_CELL)
+                ENDIF
             ENDIF IDCF_COND
 
             ! Now define a coarse cut-cell (no INBOUNDARY cut-faces):