Merge pull request #2020 from preneke/master

CFAST: Updating calc of pressure across vents to outside
firemodels · Jan 13, 2023 · 6b52d0c · 6b52d0c
2 parents 0619a96 + b364384
commit 6b52d0c
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/Source/CFAST/flowhorizontal.f90 b/Source/CFAST/flowhorizontal.f90
@@ -666,22 +666,34 @@ subroutine get_wall_flow_variables(from_room,to_room,zflor,zceil,zlay,pflor,denl
 
     integer :: iprod, ip, room_index(2), iroom, i
 
-    type(room_type), pointer :: roomptr
-
+    type(room_type), pointer :: roomptr, otherptr
+    
     room_index(1) = from_room
     room_index(2) = to_room
 
     do i = 1, 2
         iroom = room_index(i)
         roomptr=>roominfo(iroom)
-        zflor(i) = roomptr%z0
         zceil(i) = roomptr%z1
-        pflor(i) = roomptr%relp
         zlay(i) = roomptr%depth(l)
         tu(i) = roomptr%temp(u)
         tl(i) = roomptr%temp(l)
-        denu(i) = roomptr%rho(u)
-        denl(i) = roomptr%rho(l)
+        if (iroom .eq. n_rooms+1) then
+            if (i .eq. 1) then
+                otherptr=>roominfo(room_index(2))
+            else
+                otherptr=>roominfo(room_index(1))
+            end if
+            zflor(i) = otherptr%z0
+            pflor(i) = otherptr%exterior_relp_initial
+            denu(i) = otherptr%exterior_den_initial
+            denl(i) = otherptr%exterior_den_initial
+        else
+            zflor(i) = roomptr%z0
+            pflor(i) = roomptr%relp
+            denu(i) = roomptr%rho(u)
+            denl(i) = roomptr%rho(l)
+        end if
         do iprod = 1, ns
             ip = i_speciesmap(iprod+2) - 2
             conl(iprod,i) = roomptr%species_fraction(l,ip)