Merge pull request #13137 from mcgratta/master

FDS Source: Issue #13134. Fix bug related to thin OBSTs
firemodels · Jul 8, 2024 · d8d6479 · d8d6479
2 parents c0d0285 + f5022d5
commit d8d6479
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/Source/read.f90 b/Source/read.f90
@@ -10334,6 +10334,16 @@ SUBROUTINE READ_OBST(QUICK_READ)
                   XB6 = XB(6) + MR%DZ0 + II*MR%DXB(6)
                ENDIF
 
+               ! Save the original, undivided obstruction lengths and face areas.
+
+               UNDIVIDED_INPUT_LENGTH(1) = ABS(XB2-XB1)
+               UNDIVIDED_INPUT_LENGTH(2) = ABS(XB4-XB3)
+               UNDIVIDED_INPUT_LENGTH(3) = ABS(XB6-XB5)
+
+               UNDIVIDED_INPUT_AREA(1) = (XB4-XB3)*(XB6-XB5)
+               UNDIVIDED_INPUT_AREA(2) = (XB2-XB1)*(XB6-XB5)
+               UNDIVIDED_INPUT_AREA(3) = (XB2-XB1)*(XB4-XB3)
+
                ! Increase the OBST counter
 
                N = N + 1
@@ -10442,16 +10452,6 @@ SUBROUTINE READ_OBST(QUICK_READ)
                   ENDIF
                ENDIF
 
-               ! Save the original, undivided obstruction lengths and face areas.
-
-               UNDIVIDED_INPUT_LENGTH(1) = ABS(XB2-XB1)
-               UNDIVIDED_INPUT_LENGTH(2) = ABS(XB4-XB3)
-               UNDIVIDED_INPUT_LENGTH(3) = ABS(XB6-XB5)
-
-               UNDIVIDED_INPUT_AREA(1) = (XB4-XB3)*(XB6-XB5)
-               UNDIVIDED_INPUT_AREA(2) = (XB2-XB1)*(XB6-XB5)
-               UNDIVIDED_INPUT_AREA(3) = (XB2-XB1)*(XB4-XB3)
-
                ! Throw out obstructions that are not within computational domain
 
                XB1 = MAX(XB1,XS)