Skip to content

Commit 5599183

Browse files
cxp484cxp484
committed
Merge remote-tracking branch 'firemodels/master' into FireX
2 parents f926215 + 141732b commit 5599183

27 files changed

+108
-122
lines changed

‎Manuals/FDS_User_Guide/FDS_User_Guide.tex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14261,9 +14261,9 @@ \chapter{Error Codes}
1426114261
357 \> \ct{SURF ... has a specified HRRPUA/MLRPUA and a pyrolysis model.} \> Section~\ref{info:gas_burner} \\
1426214262
359 \> \ct{SURF ... cannot have a specified velocity or volume flux.} \> Section~\ref{info:gas_burner} \\
1426314263
360 \> \ct{SURF ... uses HRRPUA and species ... is the FUEL for ...} \> Section~\ref{info:gas_burner} \\
14264-
361 \> \ct{SURF ... uses HRRPUA and MASS_FRACTION but no REAC ...} \> Section~\ref{info:simple_chemistry} \\
14264+
361 \> \ct{SURF ... uses HRRPUA and MASS_FRACTION but no REAC ...} \> Section~\ref{info:gas_burner} \\
1426514265
362 \> \ct{SURF ... uses MLRPUA and species ... is the FUEL for ...} \> Section~\ref{info:gas_burner} \\
14266-
363 \> \ct{SURF ... uses MLRPUA and MASS_FRACTION but no REAC ...} \> Section~\ref{info:simple_chemistry} \\
14266+
363 \> \ct{SURF ... uses MLRPUA and MASS_FRACTION but no REAC ...} \> Section~\ref{info:gas_burner} \\
1426714267
364 \> \ct{SURF ... cannot specify mass fraction with mass flux ...} \> Section~\ref{info:MASS_FLUX} \\
1426814268
365 \> \ct{SURF ... cannot specify mass fraction and outflow velocity.} \> Section~\ref{info:MASS_FLUX} \\
1426914269
366 \> \ct{SURF ... cannot leak and specify flow or pyrolysis ...} \> Section~\ref{info:Leaks} \\

‎Manuals/FDS_Verification_Guide/FDS_Verification_Guide.tex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3307,7 +3307,7 @@ \section{Radiation Shield (\texorpdfstring{\ct{radiation_shield}}{radiation_shie
33073307
\section{Radiation from a gas-fired panel (\texorpdfstring{\ct{radiation_gas_panel}}{radiation_gas_panel}) }
33083308
\label{radiation_gas_panel}
33093309

3310-
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.
3310+
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.
33113311

33123312
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:
33133313
\begin{align}

‎Source/read.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6328,7 +6328,7 @@ SUBROUTINE READ_PART
63286328
LPC%PERMEABILITY(1:3) = 3.44E-9_EB*LPC%FREE_AREA_FRACTION**1.6_EB
63296329
LPC%DRAG_COEFFICIENT(1:3) = 4.30E-2_EB*LPC%FREE_AREA_FRACTION**2.13_EB
63306330
CASE('POROUS MEDIA')
6331-
IF (ANY(DRAG_COEFFICIENT<TWO_EPSILON_EB) .OR. ANY(PERMEABILITY<TWO_EPSILON_EB)) THEN
6331+
IF (ANY(DRAG_COEFFICIENT < 0._EB) .OR. ANY(PERMEABILITY < TWO_EPSILON_EB)) THEN
63326332
WRITE(MESSAGE,'(A,I0,A)') 'ERROR(222): PART ',N,'. Specify all compoents for DRAG_COEFFICIENT and PERMEABILTIY.'
63336333
CALL SHUTDOWN(MESSAGE) ; RETURN
63346334
ENDIF

‎Source/type.f90‎

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

‎Source/velo.f90‎

Lines changed: 29 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1815,7 +1815,7 @@ SUBROUTINE VELOCITY_BC(T,NM,APPLY_TO_ESTIMATED_VARIABLES)
18151815
LOGICAL, INTENT(IN) :: APPLY_TO_ESTIMATED_VARIABLES
18161816
REAL(EB) :: MUA,TSI,WGT,T_NOW,RAMP_T,OMW,MU_WALL,RHO_WALL,SLIP_COEF,VEL_T, &
18171817
UUP(2),UUM(2),DXX(2),MU_DUIDXJ(-2:2),DUIDXJ(-2:2),PROFILE_FACTOR,VEL_GAS,VEL_GHOST, &
1818-
MU_DUIDXJ_USE(2),DUIDXJ_USE(2),VEL_EDDY,U_TAU,Y_PLUS,U_NORM,U_WIND_LOC,V_WIND_LOC,W_WIND_LOC,&
1818+
MU_DUIDXJ_USE(2),DUIDXJ_USE(2),VEL_EDDY,U_TAU,Y_PLUS,U_NORM, &
18191819
DRAG_FACTOR,HT_SCALE_FACTOR,VEG_HT,VEL_MF
18201820
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, &
18211821
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)
20352035

20362036
VEL_EDDY = 0._EB
20372037
SYNTHETIC_EDDY_IF_1: IF (SYNTHETIC_EDDY_METHOD) THEN
2038-
U_WIND_LOC = 0._EB
2039-
V_WIND_LOC = 0._EB
2040-
W_WIND_LOC = 0._EB
20412038
IS_SELECT_1: SELECT CASE(IS) ! unsigned vent orientation
20422039
CASE(1) ! yz plane
20432040
SELECT CASE(IEC) ! edge orientation
20442041
CASE(2)
2045-
IF (OPEN_WIND_BOUNDARY) THEN
2046-
U_WIND_LOC = 0.5_EB*(U_WIND(KK)+U_WIND(KK+1))
2047-
W_WIND_LOC = 0.5_EB*(W_WIND(KK)+W_WIND(KK+1))
2048-
ENDIF
2049-
IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%U_EDDY(JJ,KK)+VT%U_EDDY(JJ,KK+1)) + U_WIND_LOC
2050-
IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%W_EDDY(JJ,KK)+VT%W_EDDY(JJ,KK+1)) + W_WIND_LOC
2042+
IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%U_EDDY(JJ,KK)+VT%U_EDDY(JJ,KK+1))
2043+
IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%W_EDDY(JJ,KK)+VT%W_EDDY(JJ,KK+1))
20512044
CASE(3)
2052-
IF (OPEN_WIND_BOUNDARY) THEN
2053-
V_WIND_LOC = V_WIND(KK)
2054-
U_WIND_LOC = U_WIND(KK)
2055-
ENDIF
2056-
IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%V_EDDY(JJ,KK)+VT%V_EDDY(JJ+1,KK)) + V_WIND_LOC
2057-
IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%U_EDDY(JJ,KK)+VT%U_EDDY(JJ+1,KK)) + U_WIND_LOC
2045+
IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%V_EDDY(JJ,KK)+VT%V_EDDY(JJ+1,KK))
2046+
IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%U_EDDY(JJ,KK)+VT%U_EDDY(JJ+1,KK))
20582047
END SELECT
20592048
CASE(2) ! zx plane
20602049
SELECT CASE(IEC)
20612050
CASE(3)
2062-
IF (OPEN_WIND_BOUNDARY) THEN
2063-
V_WIND_LOC = V_WIND(KK)
2064-
U_WIND_LOC = U_WIND(KK)
2065-
ENDIF
2066-
IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%V_EDDY(II,KK)+VT%V_EDDY(II+1,KK)) + V_WIND_LOC
2067-
IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%U_EDDY(II,KK)+VT%U_EDDY(II+1,KK)) + U_WIND_LOC
2051+
IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%V_EDDY(II,KK)+VT%V_EDDY(II+1,KK))
2052+
IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%U_EDDY(II,KK)+VT%U_EDDY(II+1,KK))
20682053
CASE(1)
2069-
IF (OPEN_WIND_BOUNDARY) THEN
2070-
W_WIND_LOC = 0.5_EB*(W_WIND(KK)+W_WIND(KK+1))
2071-
V_WIND_LOC = 0.5_EB*(V_WIND(KK)+V_WIND(KK+1))
2072-
ENDIF
2073-
IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%W_EDDY(II,KK)+VT%W_EDDY(II,KK+1)) + W_WIND_LOC
2074-
IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%V_EDDY(II,KK)+VT%V_EDDY(II,KK+1)) + V_WIND_LOC
2054+
IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%W_EDDY(II,KK)+VT%W_EDDY(II,KK+1))
2055+
IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%V_EDDY(II,KK)+VT%V_EDDY(II,KK+1))
20752056
END SELECT
20762057
CASE(3) ! xy plane
20772058
SELECT CASE(IEC)
20782059
CASE(1)
2079-
IF (OPEN_WIND_BOUNDARY) THEN
2080-
W_WIND_LOC = W_WIND(KK)
2081-
V_WIND_LOC = V_WIND(KK)
2082-
ENDIF
2083-
IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%W_EDDY(II,JJ)+VT%W_EDDY(II,JJ+1)) + W_WIND_LOC
2084-
IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%V_EDDY(II,JJ)+VT%V_EDDY(II,JJ+1)) + V_WIND_LOC
2060+
IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%W_EDDY(II,JJ)+VT%W_EDDY(II,JJ+1))
2061+
IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%V_EDDY(II,JJ)+VT%V_EDDY(II,JJ+1))
20852062
CASE(2)
2086-
IF (OPEN_WIND_BOUNDARY) THEN
2087-
U_WIND_LOC = U_WIND(KK)
2088-
W_WIND_LOC = W_WIND(KK)
2089-
ENDIF
2090-
IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%U_EDDY(II,JJ)+VT%U_EDDY(II+1,JJ)) + U_WIND_LOC
2091-
IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%W_EDDY(II,JJ)+VT%W_EDDY(II+1,JJ)) + W_WIND_LOC
2063+
IF (ICD==1) VEL_EDDY = 0.5_EB*(VT%U_EDDY(II,JJ)+VT%U_EDDY(II+1,JJ))
2064+
IF (ICD==2) VEL_EDDY = 0.5_EB*(VT%W_EDDY(II,JJ)+VT%W_EDDY(II+1,JJ))
20922065
END SELECT
20932066
END SELECT IS_SELECT_1
20942067
ENDIF SYNTHETIC_EDDY_IF_1
20952068

20962069
! OPEN boundary conditions, both varieties, with and without a wind
20972070

20982071
OPEN_AND_WIND_BC: IF ((IWM==0 .OR. WALL(IWM)%BOUNDARY_TYPE==OPEN_BOUNDARY) .AND. &
2099-
(IWP==0 .OR. WALL(IWP)%BOUNDARY_TYPE==OPEN_BOUNDARY) .AND. .NOT.SYNTHETIC_EDDY_METHOD) THEN
2072+
(IWP==0 .OR. WALL(IWP)%BOUNDARY_TYPE==OPEN_BOUNDARY) ) THEN
21002073

21012074
VENT_INDEX = MAX(WCM%VENT_INDEX,WCP%VENT_INDEX)
21022075
VT => VENTS(VENT_INDEX)
@@ -2154,20 +2127,20 @@ SUBROUTINE VELOCITY_BC(T,NM,APPLY_TO_ESTIMATED_VARIABLES)
21542127

21552128
SELECT CASE(IEC)
21562129
CASE(1)
2157-
IF (JJ==0 .AND. IOR== 2) WW(II,0,KK) = W_WIND(KK)
2158-
IF (JJ==JBAR .AND. IOR==-2) WW(II,JBP1,KK) = W_WIND(KK)
2159-
IF (KK==0 .AND. IOR== 3) VV(II,JJ,0) = V_WIND(KK)
2160-
IF (KK==KBAR .AND. IOR==-3) VV(II,JJ,KBP1) = V_WIND(KK)
2130+
IF (JJ==0 .AND. IOR== 2) WW(II,0,KK) = W_WIND(KK) + VEL_EDDY
2131+
IF (JJ==JBAR .AND. IOR==-2) WW(II,JBP1,KK) = W_WIND(KK) + VEL_EDDY
2132+
IF (KK==0 .AND. IOR== 3) VV(II,JJ,0) = V_WIND(KK) + VEL_EDDY
2133+
IF (KK==KBAR .AND. IOR==-3) VV(II,JJ,KBP1) = V_WIND(KK) + VEL_EDDY
21612134
CASE(2)
2162-
IF (II==0 .AND. IOR== 1) WW(0,JJ,KK) = W_WIND(KK)
2163-
IF (II==IBAR .AND. IOR==-1) WW(IBP1,JJ,KK) = W_WIND(KK)
2164-
IF (KK==0 .AND. IOR== 3) UU(II,JJ,0) = U_WIND(KK)
2165-
IF (KK==KBAR .AND. IOR==-3) UU(II,JJ,KBP1) = U_WIND(KK)
2135+
IF (II==0 .AND. IOR== 1) WW(0,JJ,KK) = W_WIND(KK) + VEL_EDDY
2136+
IF (II==IBAR .AND. IOR==-1) WW(IBP1,JJ,KK) = W_WIND(KK) + VEL_EDDY
2137+
IF (KK==0 .AND. IOR== 3) UU(II,JJ,0) = U_WIND(KK) + VEL_EDDY
2138+
IF (KK==KBAR .AND. IOR==-3) UU(II,JJ,KBP1) = U_WIND(KK) + VEL_EDDY
21662139
CASE(3)
2167-
IF (II==0 .AND. IOR== 1) VV(0,JJ,KK) = V_WIND(KK)
2168-
IF (II==IBAR .AND. IOR==-1) VV(IBP1,JJ,KK) = V_WIND(KK)
2169-
IF (JJ==0 .AND. IOR== 2) UU(II,0,KK) = U_WIND(KK)
2170-
IF (JJ==JBAR .AND. IOR==-2) UU(II,JBP1,KK) = U_WIND(KK)
2140+
IF (II==0 .AND. IOR== 1) VV(0,JJ,KK) = V_WIND(KK) + VEL_EDDY
2141+
IF (II==IBAR .AND. IOR==-1) VV(IBP1,JJ,KK) = V_WIND(KK) + VEL_EDDY
2142+
IF (JJ==0 .AND. IOR== 2) UU(II,0,KK) = U_WIND(KK) + VEL_EDDY
2143+
IF (JJ==JBAR .AND. IOR==-2) UU(II,JBP1,KK) = U_WIND(KK) + VEL_EDDY
21712144
END SELECT
21722145

21732146
ENDIF WIND_NO_WIND_IF
@@ -2293,8 +2266,9 @@ SUBROUTINE VELOCITY_BC(T,NM,APPLY_TO_ESTIMATED_VARIABLES)
22932266
END SELECT
22942267

22952268
ELSE
2269+
22962270
PROFILE_FACTOR = 1._EB
2297-
IF (ABS(SF%VEL) > 0._EB) THEN
2271+
IF (ABS(SF%VEL)>0._EB) THEN
22982272
IF (ABS(SF%T_IGN-T_BEGIN)<=SPACING(SF%T_IGN) .AND. SF%RAMP(TIME_VELO)%INDEX>=1) THEN
22992273
TSI = T
23002274
ELSE
@@ -2318,6 +2292,7 @@ SUBROUTINE VELOCITY_BC(T,NM,APPLY_TO_ESTIMATED_VARIABLES)
23182292
IF (IEC==3 .OR. (IEC==2 .AND. ICD==1)) VEL_T = -SF%VEL_T(1)*VEL_MF
23192293
ENDIF
23202294
ENDIF
2295+
23212296
ENDIF
23222297

23232298
! Choose the appropriate boundary condition to apply

‎Source/wall.f90‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -570,9 +570,13 @@ SUBROUTINE SURFACE_HEAT_TRANSFER(NM,T,SF,BC,B1,WALL_INDEX,CFACE_INDEX,PARTICLE_I
570570

571571
! Avoid large fluxes at open downwind boundaries
572572

573-
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
574-
B1%TMP_F = B1%TMP_G
575-
B1%ZZ_F(1:N_TRACKED_SPECIES) = B1%ZZ_G(1:N_TRACKED_SPECIES)
573+
WC => WALL(WALL_INDEX)
574+
! INTERPOLATED_BOUNDARY and PERIODIC_BOUNDARY possible with PERIODIC FLOW ONLY vent
575+
IF (WC%BOUNDARY_TYPE/=INTERPOLATED_BOUNDARY .AND. WC%BOUNDARY_TYPE/=PERIODIC_BOUNDARY) THEN
576+
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
577+
B1%TMP_F = B1%TMP_G
578+
B1%ZZ_F(1:N_TRACKED_SPECIES) = B1%ZZ_G(1:N_TRACKED_SPECIES)
579+
ENDIF
576580
ENDIF
577581

578582
! Ghost cell values

‎Utilities/Python/fdsplotlib.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1448,14 +1448,14 @@ def get(col, default=None):
14481448
d.Font_Interpreter = get('Font_Interpreter')
14491449

14501450
# --- sanitization for human-facing strings ---
1451-
d.Plot_Title = sanitize(safe_strip(d.Plot_Title))
1452-
d.Ind_Title = sanitize(safe_strip(d.Ind_Title))
1453-
d.Dep_Title = sanitize(safe_strip(d.Dep_Title))
1454-
d.Quantity = sanitize(safe_strip(d.Quantity))
1455-
d.Metric = sanitize(safe_strip(d.Metric))
1456-
d.Group_Key_Label = sanitize(safe_strip(d.Group_Key_Label))
1457-
d.d1_Key = sanitize(safe_strip(d.d1_Key))
1458-
d.d2_Key = sanitize(safe_strip(d.d2_Key))
1451+
d.Plot_Title = safe_strip(d.Plot_Title)
1452+
d.Ind_Title = safe_strip(d.Ind_Title)
1453+
d.Dep_Title = safe_strip(d.Dep_Title)
1454+
d.Quantity = safe_strip(d.Quantity)
1455+
d.Metric = safe_strip(d.Metric)
1456+
d.Group_Key_Label = safe_strip(d.Group_Key_Label)
1457+
d.d1_Key = safe_strip(d.d1_Key)
1458+
d.d2_Key = safe_strip(d.d2_Key)
14591459

14601460
return d
14611461

@@ -1522,14 +1522,14 @@ def __init__(self):
15221522
d = plot_parameters_full()
15231523

15241524
# --- sanitization block (unchanged) ---
1525-
d.Plot_Title = sanitize(safe_strip(d.Plot_Title))
1526-
d.Ind_Title = sanitize(safe_strip(d.Ind_Title))
1527-
d.Dep_Title = sanitize(safe_strip(d.Dep_Title))
1528-
d.Quantity = sanitize(safe_strip(d.Quantity))
1529-
d.Metric = sanitize(safe_strip(d.Metric))
1530-
d.Group_Key_Label = sanitize(safe_strip(d.Group_Key_Label))
1531-
d.d1_Key = sanitize(safe_strip(d.d1_Key))
1532-
d.d2_Key = sanitize(safe_strip(d.d2_Key))
1525+
d.Plot_Title = safe_strip(d.Plot_Title)
1526+
d.Ind_Title = safe_strip(d.Ind_Title)
1527+
d.Dep_Title = safe_strip(d.Dep_Title)
1528+
d.Quantity = safe_strip(d.Quantity)
1529+
d.Metric = safe_strip(d.Metric)
1530+
d.Group_Key_Label = safe_strip(d.Group_Key_Label)
1531+
d.d1_Key = safe_strip(d.d1_Key)
1532+
d.d2_Key = safe_strip(d.d2Key)
15331533

15341534
return d
15351535

‎Utilities/Python/scripts/LNG_wind_profiles.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import pandas as pd
1111
import numpy as np
12-
from fdsplotlib import plot_to_fig
12+
from fdsplotlib import plot_to_fig, get_version_string
1313
from matplotlib import pyplot as plt
1414
import os
1515

@@ -47,6 +47,7 @@
4747
# Read CSVs and force numeric conversion
4848
M_path = f"{expdir}{test[i]}_profile.csv"
4949
S_path = f"{outdir}{test[i]}_line.csv"
50+
version_string = get_version_string(f"{outdir}{test[i]}_git.txt")
5051

5152
M = pd.read_csv(M_path, skiprows=2)
5253
S = pd.read_csv(S_path, skiprows=2)
@@ -74,7 +75,8 @@
7475
# Plot velocity
7576
fig_u = plot_to_fig(x_data=M.iloc[:,1].values, y_data=M.iloc[:,0].values, figure_handle=None, marker_style='ko',
7677
x_label='Velocity (m/s)', y_label='Height (m)', plot_title=f'{test[i]} Velocity',
77-
x_min=0,x_max=15,y_min=0,y_max=30, data_label='Measured', legend_location='lower right')
78+
x_min=0,x_max=15,y_min=0,y_max=30, data_label='Measured', legend_location='lower right',
79+
revision_label=version_string)
7880
plot_to_fig(x_data=u, y_data=z, figure_handle=fig_u, marker_style='k-', data_label='M-O Theory')
7981
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')
8082

@@ -87,7 +89,8 @@
8789
x_max = col2_first_valid + 5
8890
fig_T = plot_to_fig(x_data=M.iloc[:,2].values, y_data=M.iloc[:,0].values, figure_handle=None, marker_style='ko',
8991
x_label='Temperature (°C)', y_label='Height (m)', plot_title=f'{test[i]} Temperature',
90-
x_min=x_min, x_max=x_max, y_min=0, y_max=30, data_label='Measured', legend_location='lower right')
92+
x_min=x_min, x_max=x_max, y_min=0, y_max=30, data_label='Measured', legend_location='lower right',
93+
revision_label=version_string)
9194
plot_to_fig(x_data=T-273.15, y_data=z, figure_handle=fig_T, marker_style='k-', data_label='M-O Theory')
9295
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')
9396

‎Utilities/Python/scripts/make_smv_images.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ def compare_images(image1_path, image2_path):
6060
if smokeview_path != "null":
6161
print("Using "+smokeview_path)
6262
elif os_name == "Linux":
63-
smokeview_path = smvdir + 'intel_linux_64/smokeview_linux_64'
63+
smokeview_path = smvdir + 'intel_linux/smokeview_linux'
6464
elif os_name == "Darwin":
65-
smokeview_path = smvdir + 'gnu_osx_64/smokeview_osx_64'
65+
smokeview_path = smvdir + 'gnu_osx/smokeview_osx'
6666
elif os_name == "Windows":
67-
smokeview_path = smvdir + 'intel_win_64/smokeview_win_64'
67+
smokeview_path = smvdir + 'intel_win/smokeview_win'
6868

6969
for i in range(len(folder)):
7070
print('generating smokeview image ' + case[i])

‎Verification/Radiation/geom_rad.fds‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
&TIME T_END=2 /
1212

13+
&MISC TMPA=-263.15/
14+
1315
&SPEC ID='NITROGEN', BACKGROUND=.TRUE./
1416

1517
&RADI NUMBER_RADIATION_ANGLES=400 /

0 commit comments

Comments
 (0)