FireX: Merge with firemodels/master

Manuals/FDS_User_Guide/FDS_User_Guide.tex

@@ -14261,9 +14261,9 @@ \chapter{Error Codes}
 357  \> \ct{SURF ... has a specified HRRPUA/MLRPUA and a pyrolysis model.} \> Section~\ref{info:gas_burner}  \\
 359  \> \ct{SURF ... cannot have a specified velocity or volume flux.} \> Section~\ref{info:gas_burner}  \\
 360  \> \ct{SURF ... uses HRRPUA and species ... is the FUEL for ...} \> Section~\ref{info:gas_burner}  \\
-361  \> \ct{SURF ... uses HRRPUA and MASS_FRACTION but no REAC ...} \> Section~\ref{info:simple_chemistry}  \\
+361  \> \ct{SURF ... uses HRRPUA and MASS_FRACTION but no REAC ...} \> Section~\ref{info:gas_burner}  \\
 362  \> \ct{SURF ... uses MLRPUA and species ... is the FUEL for ...} \> Section~\ref{info:gas_burner}  \\
-363  \> \ct{SURF ... uses MLRPUA and MASS_FRACTION but no REAC ...} \> Section~\ref{info:simple_chemistry}  \\
+363  \> \ct{SURF ... uses MLRPUA and MASS_FRACTION but no REAC ...} \> Section~\ref{info:gas_burner}  \\
 364  \> \ct{SURF ... cannot specify mass fraction with mass flux ...} \> Section~\ref{info:MASS_FLUX}  \\
 365  \> \ct{SURF ... cannot specify mass fraction and outflow velocity.} \> Section~\ref{info:MASS_FLUX}  \\
 366  \> \ct{SURF ... cannot leak and specify flow or pyrolysis ...} \> Section~\ref{info:Leaks}  \\

Manuals/FDS_Verification_Guide/FDS_Verification_Guide.tex

@@ -3307,7 +3307,7 @@ \section{Radiation Shield (\texorpdfstring{\ct{radiation_shield}}{radiation_shie
 \section{Radiation from a gas-fired panel (\texorpdfstring{\ct{radiation_gas_panel}}{radiation_gas_panel}) }
 \label{radiation_gas_panel}
 
-A gas-fired panel is often used as a source of thermal radiation in laboratory experiments.  Here, the heat flux from an $h=30.48$~cm square panel is computed at distances of 10~cm, 15~cm, 25~cm, 38~cm, 46~cm, 61~cm, and 76~cm along its perpendicular center axis, and along a perpendicular line that is displaced laterally 14~cm and vertically 14~cm from the center axis, as illustrated in Fig.~\ref{radiation_gas_panel_plot}.  We compare the results computed by FDS to those calculated using configuration factors. The temperature and emissivity of the panel are set to 1250~K and 0.7, respectively, and the ambient temperature is 273~K.
+A gas-fired panel is often used as a source of thermal radiation in laboratory experiments.  Here, the heat flux from an $h=30.48$~cm square panel is computed at distances of 10~cm, 15~cm, 25~cm, 38~cm, 46~cm, 61~cm, and 76~cm along its perpendicular center axis, and along a perpendicular line that is displaced laterally 14~cm and vertically 14~cm from the center axis, as illustrated in Fig.~\ref{radiation_gas_panel_plot}.  We compare the results computed by FDS to those calculated using configuration factors. The temperature and emissivity of the panel are set to 1250~K and 0.7, respectively, and the ambient temperature is 10~K.
 
 The configuration factor, $\d F_{2 \rightarrow 1}$, describing the energy exchange between the radiant panel and a target with differential area $\d A_1$ located on a perpendicular line extending from the panel at the point  $(\overline{x}, \overline{y})$ is computed from the following:
 \begin{align}

Source/read.f90

@@ -6328,7 +6328,7 @@ SUBROUTINE READ_PART
          LPC%PERMEABILITY(1:3) = 3.44E-9_EB*LPC%FREE_AREA_FRACTION**1.6_EB
          LPC%DRAG_COEFFICIENT(1:3) = 4.30E-2_EB*LPC%FREE_AREA_FRACTION**2.13_EB
       CASE('POROUS MEDIA')
-         IF (ANY(DRAG_COEFFICIENT<TWO_EPSILON_EB) .OR. ANY(PERMEABILITY<TWO_EPSILON_EB)) THEN
+         IF (ANY(DRAG_COEFFICIENT < 0._EB) .OR. ANY(PERMEABILITY < TWO_EPSILON_EB)) THEN
             WRITE(MESSAGE,'(A,I0,A)') 'ERROR(222): PART ',N,'. Specify all compoents for DRAG_COEFFICIENT and PERMEABILTIY.'
             CALL SHUTDOWN(MESSAGE) ; RETURN
          ENDIF

Source/type.f90

@@ -89,7 +89,7 @@ MODULE TYPES
    REAL(EB) :: INITIAL_MASS=-1._EB        !< Initial mass of single particle (kg)
    REAL(EB) :: FTPR                       !< 4/3 * PI * SPECIES(N)\%DENSITY_LIQUID (kg/m3)
    REAL(EB) :: FREE_AREA_FRACTION         !< Area fraction of cell open for flow in SCREEN_DRAG model
-   REAL(EB) :: POROUS_VOLUME_FRACTION     !< Volume fraction of cell open to flow in porous media model
+   REAL(EB) :: POROUS_VOLUME_FRACTION     !< Volume fraction of cell occupied by porous media in the porous media model
    REAL(EB) :: MEAN_DROPLET_VOLUME=0._EB  !< Mean droplet volume
    REAL(EB) :: RUNNING_AVERAGE_FACTOR     !< Fraction of older value to use for particle statistics summations
    REAL(EB) :: SHAPE_FACTOR               !< Ratio of particle cross sectional area to surface area

Source/velo.f90

@@ -1815,7 +1815,7 @@ SUBROUTINE VELOCITY_BC(T,NM,APPLY_TO_ESTIMATED_VARIABLES)
 LOGICAL, INTENT(IN) :: APPLY_TO_ESTIMATED_VARIABLES
 REAL(EB) :: MUA,TSI,WGT,T_NOW,RAMP_T,OMW,MU_WALL,RHO_WALL,SLIP_COEF,VEL_T, &
             UUP(2),UUM(2),DXX(2),MU_DUIDXJ(-2:2),DUIDXJ(-2:2),PROFILE_FACTOR,VEL_GAS,VEL_GHOST, &
-            MU_DUIDXJ_USE(2),DUIDXJ_USE(2),VEL_EDDY,U_TAU,Y_PLUS,U_NORM,U_WIND_LOC,V_WIND_LOC,W_WIND_LOC,&
+            MU_DUIDXJ_USE(2),DUIDXJ_USE(2),VEL_EDDY,U_TAU,Y_PLUS,U_NORM, &
             DRAG_FACTOR,HT_SCALE_FACTOR,VEG_HT,VEL_MF
 INTEGER :: NOM(2),IIO(2),JJO(2),KKO(2),IE,II,JJ,KK,IEC,IOR,IWM,IWP,ICMM,ICMP,ICPM,ICPP,ICD,ICDO,IVL,I_SGN, &
            VELOCITY_BC_INDEX,IIGM,JJGM,KKGM,IIGP,JJGP,KKGP,SURF_INDEXM,SURF_INDEXP,ITMP,ICD_SGN,ICDO_SGN, &
@@ -2035,68 +2035,41 @@ SUBROUTINE VELOCITY_BC(T,NM,APPLY_TO_ESTIMATED_VARIABLES)
 
          VEL_EDDY = 0._EB
          SYNTHETIC_EDDY_IF_1: IF (SYNTHETIC_EDDY_METHOD) THEN
-            U_WIND_LOC = 0._EB
-            V_WIND_LOC = 0._EB
-            W_WIND_LOC = 0._EB
             IS_SELECT_1: SELECT CASE(IS) ! unsigned vent orientation
                CASE(1) ! yz plane
                   SELECT CASE(IEC) ! edge orientation
                      CASE(2)
-                        IF (OPEN_WIND_BOUNDARY) THEN
-                           U_WIND_LOC = 0.5_EB*(U_WIND(KK)+U_WIND(KK+1))
-                           W_WIND_LOC = 0.5_EB*(W_WIND(KK)+W_WIND(KK+1))
-                        ENDIF
-                        IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%U_EDDY(JJ,KK)+VT%U_EDDY(JJ,KK+1)) + U_WIND_LOC
-                        IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%W_EDDY(JJ,KK)+VT%W_EDDY(JJ,KK+1)) + W_WIND_LOC
+                        IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%U_EDDY(JJ,KK)+VT%U_EDDY(JJ,KK+1))
+                        IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%W_EDDY(JJ,KK)+VT%W_EDDY(JJ,KK+1))
                      CASE(3)
-                        IF (OPEN_WIND_BOUNDARY) THEN
-                           V_WIND_LOC = V_WIND(KK)
-                           U_WIND_LOC = U_WIND(KK)
-                        ENDIF
-                        IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%V_EDDY(JJ,KK)+VT%V_EDDY(JJ+1,KK)) + V_WIND_LOC
-                        IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%U_EDDY(JJ,KK)+VT%U_EDDY(JJ+1,KK)) + U_WIND_LOC
+                        IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%V_EDDY(JJ,KK)+VT%V_EDDY(JJ+1,KK))
+                        IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%U_EDDY(JJ,KK)+VT%U_EDDY(JJ+1,KK))
                   END SELECT
                CASE(2) ! zx plane
                   SELECT CASE(IEC)
                      CASE(3)
-                        IF (OPEN_WIND_BOUNDARY) THEN
-                           V_WIND_LOC = V_WIND(KK)
-                           U_WIND_LOC = U_WIND(KK)
-                        ENDIF
-                        IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%V_EDDY(II,KK)+VT%V_EDDY(II+1,KK)) + V_WIND_LOC
-                        IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%U_EDDY(II,KK)+VT%U_EDDY(II+1,KK)) + U_WIND_LOC
+                        IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%V_EDDY(II,KK)+VT%V_EDDY(II+1,KK))
+                        IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%U_EDDY(II,KK)+VT%U_EDDY(II+1,KK))
                      CASE(1)
-                        IF (OPEN_WIND_BOUNDARY) THEN
-                           W_WIND_LOC = 0.5_EB*(W_WIND(KK)+W_WIND(KK+1))
-                           V_WIND_LOC = 0.5_EB*(V_WIND(KK)+V_WIND(KK+1))
-                        ENDIF
-                        IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%W_EDDY(II,KK)+VT%W_EDDY(II,KK+1)) + W_WIND_LOC
-                        IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%V_EDDY(II,KK)+VT%V_EDDY(II,KK+1)) + V_WIND_LOC
+                        IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%W_EDDY(II,KK)+VT%W_EDDY(II,KK+1))
+                        IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%V_EDDY(II,KK)+VT%V_EDDY(II,KK+1))
                   END SELECT
                CASE(3) ! xy plane
                   SELECT CASE(IEC)
                      CASE(1)
-                        IF (OPEN_WIND_BOUNDARY) THEN
-                           W_WIND_LOC = W_WIND(KK)
-                           V_WIND_LOC = V_WIND(KK)
-                        ENDIF
-                        IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%W_EDDY(II,JJ)+VT%W_EDDY(II,JJ+1)) + W_WIND_LOC
-                        IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%V_EDDY(II,JJ)+VT%V_EDDY(II,JJ+1)) + V_WIND_LOC
+                        IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%W_EDDY(II,JJ)+VT%W_EDDY(II,JJ+1))
+                        IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%V_EDDY(II,JJ)+VT%V_EDDY(II,JJ+1))
                      CASE(2)
-                        IF (OPEN_WIND_BOUNDARY) THEN
-                           U_WIND_LOC = U_WIND(KK)
-                           W_WIND_LOC = W_WIND(KK)
-                        ENDIF
-                        IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%U_EDDY(II,JJ)+VT%U_EDDY(II+1,JJ)) + U_WIND_LOC
-                        IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%W_EDDY(II,JJ)+VT%W_EDDY(II+1,JJ)) + W_WIND_LOC
+                        IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%U_EDDY(II,JJ)+VT%U_EDDY(II+1,JJ))
+                        IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%W_EDDY(II,JJ)+VT%W_EDDY(II+1,JJ))
                   END SELECT
             END SELECT IS_SELECT_1
          ENDIF SYNTHETIC_EDDY_IF_1
 
          ! OPEN boundary conditions, both varieties, with and without a wind
 
          OPEN_AND_WIND_BC: IF ((IWM==0 .OR. WALL(IWM)%BOUNDARY_TYPE==OPEN_BOUNDARY) .AND. &
-                               (IWP==0 .OR. WALL(IWP)%BOUNDARY_TYPE==OPEN_BOUNDARY) .AND. .NOT.SYNTHETIC_EDDY_METHOD) THEN
+                               (IWP==0 .OR. WALL(IWP)%BOUNDARY_TYPE==OPEN_BOUNDARY)       ) THEN
 
             VENT_INDEX = MAX(WCM%VENT_INDEX,WCP%VENT_INDEX)
             VT => VENTS(VENT_INDEX)
@@ -2154,20 +2127,20 @@ SUBROUTINE VELOCITY_BC(T,NM,APPLY_TO_ESTIMATED_VARIABLES)
 
                SELECT CASE(IEC)
                   CASE(1)
-                     IF (JJ==0    .AND. IOR== 2) WW(II,0,KK)    = W_WIND(KK)
-                     IF (JJ==JBAR .AND. IOR==-2) WW(II,JBP1,KK) = W_WIND(KK)
-                     IF (KK==0    .AND. IOR== 3) VV(II,JJ,0)    = V_WIND(KK)
-                     IF (KK==KBAR .AND. IOR==-3) VV(II,JJ,KBP1) = V_WIND(KK)
+                     IF (JJ==0    .AND. IOR== 2) WW(II,0,KK)    = W_WIND(KK) + VEL_EDDY
+                     IF (JJ==JBAR .AND. IOR==-2) WW(II,JBP1,KK) = W_WIND(KK) + VEL_EDDY
+                     IF (KK==0    .AND. IOR== 3) VV(II,JJ,0)    = V_WIND(KK) + VEL_EDDY
+                     IF (KK==KBAR .AND. IOR==-3) VV(II,JJ,KBP1) = V_WIND(KK) + VEL_EDDY
                   CASE(2)
-                     IF (II==0    .AND. IOR== 1) WW(0,JJ,KK)    = W_WIND(KK)
-                     IF (II==IBAR .AND. IOR==-1) WW(IBP1,JJ,KK) = W_WIND(KK)
-                     IF (KK==0    .AND. IOR== 3) UU(II,JJ,0)    = U_WIND(KK)
-                     IF (KK==KBAR .AND. IOR==-3) UU(II,JJ,KBP1) = U_WIND(KK)
+                     IF (II==0    .AND. IOR== 1) WW(0,JJ,KK)    = W_WIND(KK) + VEL_EDDY
+                     IF (II==IBAR .AND. IOR==-1) WW(IBP1,JJ,KK) = W_WIND(KK) + VEL_EDDY
+                     IF (KK==0    .AND. IOR== 3) UU(II,JJ,0)    = U_WIND(KK) + VEL_EDDY
+                     IF (KK==KBAR .AND. IOR==-3) UU(II,JJ,KBP1) = U_WIND(KK) + VEL_EDDY
                   CASE(3)
-                     IF (II==0    .AND. IOR== 1) VV(0,JJ,KK)    = V_WIND(KK)
-                     IF (II==IBAR .AND. IOR==-1) VV(IBP1,JJ,KK) = V_WIND(KK)
-                     IF (JJ==0    .AND. IOR== 2) UU(II,0,KK)    = U_WIND(KK)
-                     IF (JJ==JBAR .AND. IOR==-2) UU(II,JBP1,KK) = U_WIND(KK)
+                     IF (II==0    .AND. IOR== 1) VV(0,JJ,KK)    = V_WIND(KK) + VEL_EDDY
+                     IF (II==IBAR .AND. IOR==-1) VV(IBP1,JJ,KK) = V_WIND(KK) + VEL_EDDY
+                     IF (JJ==0    .AND. IOR== 2) UU(II,0,KK)    = U_WIND(KK) + VEL_EDDY
+                     IF (JJ==JBAR .AND. IOR==-2) UU(II,JBP1,KK) = U_WIND(KK) + VEL_EDDY
                END SELECT
 
             ENDIF WIND_NO_WIND_IF
@@ -2293,8 +2266,9 @@ SUBROUTINE VELOCITY_BC(T,NM,APPLY_TO_ESTIMATED_VARIABLES)
                END SELECT
 
             ELSE
+
                PROFILE_FACTOR = 1._EB
-               IF (ABS(SF%VEL) > 0._EB) THEN
+               IF (ABS(SF%VEL)>0._EB) THEN
                   IF (ABS(SF%T_IGN-T_BEGIN)<=SPACING(SF%T_IGN) .AND. SF%RAMP(TIME_VELO)%INDEX>=1) THEN
                      TSI = T
                   ELSE
@@ -2318,6 +2292,7 @@ SUBROUTINE VELOCITY_BC(T,NM,APPLY_TO_ESTIMATED_VARIABLES)
                      IF (IEC==3 .OR. (IEC==2 .AND. ICD==1)) VEL_T = -SF%VEL_T(1)*VEL_MF
                   ENDIF
                ENDIF
+
             ENDIF
 
             ! Choose the appropriate boundary condition to apply

Source/wall.f90

@@ -570,9 +570,13 @@ SUBROUTINE SURFACE_HEAT_TRANSFER(NM,T,SF,BC,B1,WALL_INDEX,CFACE_INDEX,PARTICLE_I
 
       ! Avoid large fluxes at open downwind boundaries
 
-      IF (OPEN_WIND_BOUNDARY .AND. DOT_PRODUCT(BC%NVEC,(/U_WIND(BC%KK),V_WIND(BC%KK),W_WIND(BC%KK)/))<-TWO_EPSILON_EB) THEN
-         B1%TMP_F = B1%TMP_G
-         B1%ZZ_F(1:N_TRACKED_SPECIES) = B1%ZZ_G(1:N_TRACKED_SPECIES)
+      WC => WALL(WALL_INDEX)
+      ! INTERPOLATED_BOUNDARY and PERIODIC_BOUNDARY possible with PERIODIC FLOW ONLY vent
+      IF (WC%BOUNDARY_TYPE/=INTERPOLATED_BOUNDARY .AND. WC%BOUNDARY_TYPE/=PERIODIC_BOUNDARY) THEN
+         IF (OPEN_WIND_BOUNDARY .AND. DOT_PRODUCT(BC%NVEC,(/U_WIND(BC%KK),V_WIND(BC%KK),W_WIND(BC%KK)/))<-TWO_EPSILON_EB) THEN
+            B1%TMP_F = B1%TMP_G
+            B1%ZZ_F(1:N_TRACKED_SPECIES) = B1%ZZ_G(1:N_TRACKED_SPECIES)
+         ENDIF
       ENDIF
 
       ! Ghost cell values

Utilities/Python/fdsplotlib.py

@@ -1448,14 +1448,14 @@ def get(col, default=None):
         d.Font_Interpreter = get('Font_Interpreter')
 
         # --- sanitization for human-facing strings ---
-        d.Plot_Title      = sanitize(safe_strip(d.Plot_Title))
-        d.Ind_Title       = sanitize(safe_strip(d.Ind_Title))
-        d.Dep_Title       = sanitize(safe_strip(d.Dep_Title))
-        d.Quantity        = sanitize(safe_strip(d.Quantity))
-        d.Metric          = sanitize(safe_strip(d.Metric))
-        d.Group_Key_Label = sanitize(safe_strip(d.Group_Key_Label))
-        d.d1_Key          = sanitize(safe_strip(d.d1_Key))
-        d.d2_Key          = sanitize(safe_strip(d.d2_Key))
+        d.Plot_Title      = safe_strip(d.Plot_Title)
+        d.Ind_Title       = safe_strip(d.Ind_Title)
+        d.Dep_Title       = safe_strip(d.Dep_Title)
+        d.Quantity        = safe_strip(d.Quantity)
+        d.Metric          = safe_strip(d.Metric)
+        d.Group_Key_Label = safe_strip(d.Group_Key_Label)
+        d.d1_Key          = safe_strip(d.d1_Key)
+        d.d2_Key          = safe_strip(d.d2_Key)
 
         return d
 
@@ -1522,14 +1522,14 @@ def __init__(self):
     d = plot_parameters_full()
 
     # --- sanitization block (unchanged) ---
-    d.Plot_Title      = sanitize(safe_strip(d.Plot_Title))
-    d.Ind_Title       = sanitize(safe_strip(d.Ind_Title))
-    d.Dep_Title       = sanitize(safe_strip(d.Dep_Title))
-    d.Quantity        = sanitize(safe_strip(d.Quantity))
-    d.Metric          = sanitize(safe_strip(d.Metric))
-    d.Group_Key_Label = sanitize(safe_strip(d.Group_Key_Label))
-    d.d1_Key          = sanitize(safe_strip(d.d1_Key))
-    d.d2_Key          = sanitize(safe_strip(d.d2_Key))
+    d.Plot_Title      = safe_strip(d.Plot_Title)
+    d.Ind_Title       = safe_strip(d.Ind_Title)
+    d.Dep_Title       = safe_strip(d.Dep_Title)
+    d.Quantity        = safe_strip(d.Quantity)
+    d.Metric          = safe_strip(d.Metric)
+    d.Group_Key_Label = safe_strip(d.Group_Key_Label)
+    d.d1_Key          = safe_strip(d.d1_Key)
+    d.d2_Key          = safe_strip(d.d2Key)
 
     return d
 

Utilities/Python/scripts/LNG_wind_profiles.py

@@ -9,7 +9,7 @@
 
 import pandas as pd
 import numpy as np
-from fdsplotlib import plot_to_fig
+from fdsplotlib import plot_to_fig, get_version_string
 from matplotlib import pyplot as plt
 import os
 
@@ -47,6 +47,7 @@
     # Read CSVs and force numeric conversion
     M_path = f"{expdir}{test[i]}_profile.csv"
     S_path = f"{outdir}{test[i]}_line.csv"
+    version_string = get_version_string(f"{outdir}{test[i]}_git.txt")
 
     M = pd.read_csv(M_path, skiprows=2)
     S = pd.read_csv(S_path, skiprows=2)
@@ -74,7 +75,8 @@
     # Plot velocity
     fig_u = plot_to_fig(x_data=M.iloc[:,1].values, y_data=M.iloc[:,0].values, figure_handle=None, marker_style='ko',
                         x_label='Velocity (m/s)', y_label='Height (m)', plot_title=f'{test[i]} Velocity',
-                        x_min=0,x_max=15,y_min=0,y_max=30, data_label='Measured', legend_location='lower right')
+                        x_min=0,x_max=15,y_min=0,y_max=30, data_label='Measured', legend_location='lower right',
+                        revision_label=version_string)
     plot_to_fig(x_data=u, y_data=z, figure_handle=fig_u, marker_style='k-', data_label='M-O Theory')
     plot_to_fig(x_data=S.iloc[:,1].values, y_data=S.iloc[:,0].values, figure_handle=fig_u, marker_style='k--', data_label='Simulated')
 
@@ -87,7 +89,8 @@
     x_max = col2_first_valid + 5
     fig_T = plot_to_fig(x_data=M.iloc[:,2].values, y_data=M.iloc[:,0].values, figure_handle=None, marker_style='ko',
                         x_label='Temperature (°C)', y_label='Height (m)', plot_title=f'{test[i]} Temperature',
-                        x_min=x_min, x_max=x_max, y_min=0, y_max=30, data_label='Measured', legend_location='lower right')
+                        x_min=x_min, x_max=x_max, y_min=0, y_max=30, data_label='Measured', legend_location='lower right',
+                        revision_label=version_string)
     plot_to_fig(x_data=T-273.15, y_data=z, figure_handle=fig_T, marker_style='k-', data_label='M-O Theory')
     plot_to_fig(x_data=S.iloc[:,2].values, y_data=S.iloc[:,0].values, figure_handle=fig_T, marker_style='k--', data_label='Simulated')
 

Utilities/Python/scripts/make_smv_images.py

@@ -60,11 +60,11 @@ def compare_images(image1_path, image2_path):
 if smokeview_path != "null":
     print("Using "+smokeview_path)
 elif os_name == "Linux":
-    smokeview_path = smvdir + 'intel_linux_64/smokeview_linux_64'
+    smokeview_path = smvdir + 'intel_linux/smokeview_linux'
 elif os_name == "Darwin":
-    smokeview_path = smvdir + 'gnu_osx_64/smokeview_osx_64'
+    smokeview_path = smvdir + 'gnu_osx/smokeview_osx'
 elif os_name == "Windows":
-    smokeview_path = smvdir + 'intel_win_64/smokeview_win_64'
+    smokeview_path = smvdir + 'intel_win/smokeview_win'
 
 for i in range(len(folder)):
     print('generating smokeview image ' + case[i])

Verification/Radiation/geom_rad.fds

@@ -10,6 +10,8 @@
 
 &TIME T_END=2 /
 
+&MISC TMPA=-263.15/
+
 &SPEC ID='NITROGEN', BACKGROUND=.TRUE./
 
 &RADI NUMBER_RADIATION_ANGLES=400 /

Verification/Radiation/geom_rad_2.fds

@@ -15,6 +15,8 @@
 
 &TIME T_END=2 /
 
+&MISC TMPA=-263.15/
+
 &SPEC ID='NITROGEN', BACKGROUND=.TRUE./
 
 &RADI NUMBER_RADIATION_ANGLES=400 /

Verification/Radiation/plate_view_factor_2D_100.fds

@@ -4,9 +4,9 @@ The RADIATIVE HEAT FLUX should be 105.34 kW/m2
 
 &MESH IJK=20,1,10, XB=0,2,-.5,.5,0,1 /
 
-&TIME T_END=.1 DT = 0.001 / 
+&TIME T_END=.1 DT = 0.001 /
 
-&MISC GVEC=0,0,0,Y_CO2_INFTY=0.,HUMIDITY=0./ 
+&MISC GVEC=0,0,0,Y_CO2_INFTY=0.,HUMIDITY=0.,TMPA=-263.14/
 
 &RADI NUMBER_RADIATION_ANGLES = 100 /
 

Verification/Radiation/plate_view_factor_2D_30.fds

@@ -4,9 +4,9 @@ The RADIATIVE HEAT FLUX should be 105.34 kW/m2
 
 &MESH IJK=20,1,10, XB=0,2,-.5,.5,0,1 /
 
-&TIME T_END=.1 DT = 0.001 / 
+&TIME T_END=.1 DT = 0.001 /
 
-&MISC GVEC=0,0,0,Y_CO2_INFTY=0.,HUMIDITY=0./ 
+&MISC GVEC=0,0,0,Y_CO2_INFTY=0.,HUMIDITY=0.,TMPA=-263.14/
 
 &RADI NUMBER_RADIATION_ANGLES = 30 /
 

Verification/Radiation/plate_view_factor_2D_60.fds

@@ -4,9 +4,9 @@ The RADIATIVE HEAT FLUX should be 105.34 kW/m2
 
 &MESH IJK=20,1,10, XB=0,2,-.5,.5,0,1 /
 
-&TIME T_END=.1 DT = 0.001 / 
+&TIME T_END=.1 DT = 0.001 /
 
-&MISC GVEC=0,0,0,Y_CO2_INFTY=0.,HUMIDITY=0./ 
+&MISC GVEC=0,0,0,Y_CO2_INFTY=0.,HUMIDITY=0.,TMPA=-263.14/
 
 &RADI NUMBER_RADIATION_ANGLES = 60 /