diff --git a/Manuals/FDS_User_Guide/FDS_User_Guide.tex b/Manuals/FDS_User_Guide/FDS_User_Guide.tex index ca82af7da8..51abec5c4f 100644 --- a/Manuals/FDS_User_Guide/FDS_User_Guide.tex +++ b/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} \\ diff --git a/Manuals/FDS_Verification_Guide/FDS_Verification_Guide.tex b/Manuals/FDS_Verification_Guide/FDS_Verification_Guide.tex index dd8ba326bc..3d99d87103 100644 --- a/Manuals/FDS_Verification_Guide/FDS_Verification_Guide.tex +++ b/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} diff --git a/Source/read.f90 b/Source/read.f90 index b8aeef26db..74096f2dc3 100644 --- a/Source/read.f90 +++ b/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 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 diff --git a/Source/wall.f90 b/Source/wall.f90 index cf9dfc9c80..5941501d51 100644 --- a/Source/wall.f90 +++ b/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 diff --git a/Utilities/Python/fdsplotlib.py b/Utilities/Python/fdsplotlib.py index 2a595fea4f..50ccd3e319 100644 --- a/Utilities/Python/fdsplotlib.py +++ b/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 diff --git a/Utilities/Python/scripts/LNG_wind_profiles.py b/Utilities/Python/scripts/LNG_wind_profiles.py index 43fafe8234..0da837812c 100644 --- a/Utilities/Python/scripts/LNG_wind_profiles.py +++ b/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') diff --git a/Utilities/Python/scripts/make_smv_images.py b/Utilities/Python/scripts/make_smv_images.py index 2008c090e6..34aa04e32d 100644 --- a/Utilities/Python/scripts/make_smv_images.py +++ b/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]) diff --git a/Verification/Radiation/geom_rad.fds b/Verification/Radiation/geom_rad.fds index 8841dd5505..c1f21acaab 100644 --- a/Verification/Radiation/geom_rad.fds +++ b/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 / diff --git a/Verification/Radiation/geom_rad_2.fds b/Verification/Radiation/geom_rad_2.fds index 2ae05bc6b8..2d7f79c1f9 100644 --- a/Verification/Radiation/geom_rad_2.fds +++ b/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 / diff --git a/Verification/Radiation/plate_view_factor_2D_100.fds b/Verification/Radiation/plate_view_factor_2D_100.fds index a25e1a4e07..65ef0f7355 100644 --- a/Verification/Radiation/plate_view_factor_2D_100.fds +++ b/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 / diff --git a/Verification/Radiation/plate_view_factor_2D_30.fds b/Verification/Radiation/plate_view_factor_2D_30.fds index d5cdd29c57..0223cd4d75 100644 --- a/Verification/Radiation/plate_view_factor_2D_30.fds +++ b/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 / diff --git a/Verification/Radiation/plate_view_factor_2D_60.fds b/Verification/Radiation/plate_view_factor_2D_60.fds index 43678a4a22..782672d20d 100644 --- a/Verification/Radiation/plate_view_factor_2D_60.fds +++ b/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 / diff --git a/Verification/Radiation/plate_view_factor_cart_100.fds b/Verification/Radiation/plate_view_factor_cart_100.fds index cb4759829d..082b293ad3 100644 --- a/Verification/Radiation/plate_view_factor_cart_100.fds +++ b/Verification/Radiation/plate_view_factor_cart_100.fds @@ -4,9 +4,9 @@ The RADIATIVE HEAT FLUX should be 81.8 kW/m2. &MESH IJK=20,20,10, XB=0,2,0,2,0,1 / -&TIME T_END=.01 DT = 0.001 / +&TIME T_END=.01 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/ diff --git a/Verification/Radiation/plate_view_factor_cart_30.fds b/Verification/Radiation/plate_view_factor_cart_30.fds index 18ab59ef03..36819e5567 100644 --- a/Verification/Radiation/plate_view_factor_cart_30.fds +++ b/Verification/Radiation/plate_view_factor_cart_30.fds @@ -4,9 +4,9 @@ The RADIATIVE HEAT FLUX should be 81.8 kW/m2. &MESH IJK=20,20,10, XB=0,2,0,2,0,1 / -&TIME T_END=.01 DT = 0.001 / +&TIME T_END=.01 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 / diff --git a/Verification/Radiation/plate_view_factor_cart_60.fds b/Verification/Radiation/plate_view_factor_cart_60.fds index 77778f53f5..875ce18f22 100644 --- a/Verification/Radiation/plate_view_factor_cart_60.fds +++ b/Verification/Radiation/plate_view_factor_cart_60.fds @@ -4,9 +4,9 @@ The RADIATIVE HEAT FLUX should be 81.8 kW/m2. &MESH IJK=20,20,10, XB=0,2,0,2,0,1 / -&TIME T_END=.01 DT = 0.001 / +&TIME T_END=.01 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 / diff --git a/Verification/Radiation/plate_view_factor_cyl_100.fds b/Verification/Radiation/plate_view_factor_cyl_100.fds index 43593c77c8..d93c68f9a9 100644 --- a/Verification/Radiation/plate_view_factor_cyl_100.fds +++ b/Verification/Radiation/plate_view_factor_cyl_100.fds @@ -4,9 +4,9 @@ The RADIATIVE HEAT FLUX should be 74.1 kW/m2 &MESH IJK=10,1,10, XB=0.0,3.0,-.5,.5,0.0,3.0 CYLINDRICAL = .TRUE. / -&TIME T_END=.1 DT = 0.0001 / +&TIME T_END=.1 DT = 0.0001 / -&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/ diff --git a/Verification/Radiation/plate_view_factor_cyl_30.fds b/Verification/Radiation/plate_view_factor_cyl_30.fds index f02ef7b2d0..60e46457f9 100644 --- a/Verification/Radiation/plate_view_factor_cyl_30.fds +++ b/Verification/Radiation/plate_view_factor_cyl_30.fds @@ -4,9 +4,9 @@ The RADIATIVE HEAT FLUX should be 74.1 kW/m2 &MESH IJK=10,1,10, XB=0.0,3.0,-.5,.5,0.0,3.0 CYLINDRICAL = .TRUE. / -&TIME T_END=.1 DT = 0.0001 / +&TIME T_END=.1 DT = 0.0001 / -&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/ diff --git a/Verification/Radiation/plate_view_factor_cyl_60.fds b/Verification/Radiation/plate_view_factor_cyl_60.fds index 8cf2266bbe..93af050567 100644 --- a/Verification/Radiation/plate_view_factor_cyl_60.fds +++ b/Verification/Radiation/plate_view_factor_cyl_60.fds @@ -4,9 +4,9 @@ The RADIATIVE HEAT FLUX should be 74.1 kW/m2 &MESH IJK=10,1,10, XB=0.0,3.0,-.5,.5,0.0,3.0 CYLINDRICAL = .TRUE. / -&TIME T_END=.1 DT = 0.0001 / +&TIME T_END=.1 DT = 0.0001 / -&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/ diff --git a/Verification/Radiation/plate_view_factor_ibm_100.fds b/Verification/Radiation/plate_view_factor_ibm_100.fds index 7fe028e97b..ea504a5569 100644 --- a/Verification/Radiation/plate_view_factor_ibm_100.fds +++ b/Verification/Radiation/plate_view_factor_ibm_100.fds @@ -4,9 +4,9 @@ The RADIATIVE HEAT FLUX should be 81.8 kW/m2 &MESH IJK=100,100,100, XB=-1.0,2.0,-0.5,2.5,-0.5,2.5 / -&TIME T_END=.01 DT=0.001 / +&TIME T_END=.01 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.15 / &RADI NUMBER_RADIATION_ANGLES=100 / @@ -27,7 +27,7 @@ The RADIATIVE HEAT FLUX should be 81.8 kW/m2 VERTS= 0.0 , 0.0, 0.0 1.414214, 0.0, 1.414214 1.414214, 2.0, 1.414214 - 0.0 , 2.0, 0.0 + 0.0 , 2.0, 0.0 -0.07071 , 0.0, 0.07071 1.343503, 0.0, 1.484924 1.343503, 2.0, 1.484924 @@ -50,10 +50,10 @@ The RADIATIVE HEAT FLUX should be 81.8 kW/m2 0.636396, 0.0, 2.192031 0.636396, 2.0, 2.192031 -0.77782 , 2.0, 0.777817 - -0.84853 , 0.0, 0.84853 + -0.84853 , 0.0, 0.84853 0.565685, 0.0, 2.262742 0.565685, 2.0, 2.262742 - -0.84853 , 2.0, 0.84853 + -0.84853 , 2.0, 0.84853 FACES=1,2,6, 1 1,6,5, 1 2,3,7, 1 diff --git a/Verification/Radiation/plate_view_factor_ibm_30.fds b/Verification/Radiation/plate_view_factor_ibm_30.fds index 08e22a641b..f2816200c0 100644 --- a/Verification/Radiation/plate_view_factor_ibm_30.fds +++ b/Verification/Radiation/plate_view_factor_ibm_30.fds @@ -4,9 +4,9 @@ The RADIATIVE HEAT FLUX should be 81.8 kW/m2 &MESH IJK=100,100,100, XB=-1.0,2.0,-0.5,2.5,-0.5,2.5 / -&TIME T_END=.01 DT=0.001 / +&TIME T_END=.01 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 / @@ -27,7 +27,7 @@ The RADIATIVE HEAT FLUX should be 81.8 kW/m2 VERTS= 0.0 , 0.0, 0.0 1.414214, 0.0, 1.414214 1.414214, 2.0, 1.414214 - 0.0 , 2.0, 0.0 + 0.0 , 2.0, 0.0 -0.07071 , 0.0, 0.07071 1.343503, 0.0, 1.484924 1.343503, 2.0, 1.484924 @@ -50,10 +50,10 @@ The RADIATIVE HEAT FLUX should be 81.8 kW/m2 0.636396, 0.0, 2.192031 0.636396, 2.0, 2.192031 -0.77782 , 2.0, 0.777817 - -0.84853 , 0.0, 0.84853 + -0.84853 , 0.0, 0.84853 0.565685, 0.0, 2.262742 0.565685, 2.0, 2.262742 - -0.84853 , 2.0, 0.84853 + -0.84853 , 2.0, 0.84853 FACES=1,2,6, 1 1,6,5, 1 2,3,7, 1 diff --git a/Verification/Radiation/plate_view_factor_ibm_60.fds b/Verification/Radiation/plate_view_factor_ibm_60.fds index 7180ab1ecc..0d56f8c681 100644 --- a/Verification/Radiation/plate_view_factor_ibm_60.fds +++ b/Verification/Radiation/plate_view_factor_ibm_60.fds @@ -4,9 +4,9 @@ The RADIATIVE HEAT FLUX should be 81.8 kW/m2 &MESH IJK=100,100,100, XB=-1.0,2.0,-0.5,2.5,-0.5,2.5 / -&TIME T_END=.01 DT=0.001 / +&TIME T_END=.01 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.15 / &RADI NUMBER_RADIATION_ANGLES=60 / @@ -27,7 +27,7 @@ The RADIATIVE HEAT FLUX should be 81.8 kW/m2 VERTS= 0.0 , 0.0, 0.0 1.414214, 0.0, 1.414214 1.414214, 2.0, 1.414214 - 0.0 , 2.0, 0.0 + 0.0 , 2.0, 0.0 -0.07071 , 0.0, 0.07071 1.343503, 0.0, 1.484924 1.343503, 2.0, 1.484924 @@ -50,10 +50,10 @@ The RADIATIVE HEAT FLUX should be 81.8 kW/m2 0.636396, 0.0, 2.192031 0.636396, 2.0, 2.192031 -0.77782 , 2.0, 0.777817 - -0.84853 , 0.0, 0.84853 + -0.84853 , 0.0, 0.84853 0.565685, 0.0, 2.262742 0.565685, 2.0, 2.262742 - -0.84853 , 2.0, 0.84853 + -0.84853 , 2.0, 0.84853 FACES=1,2,6, 1 1,6,5, 1 2,3,7, 1 diff --git a/Verification/Radiation/radiation_gas_panel.fds b/Verification/Radiation/radiation_gas_panel.fds index 5183f0b7ba..2f405cbd26 100644 --- a/Verification/Radiation/radiation_gas_panel.fds +++ b/Verification/Radiation/radiation_gas_panel.fds @@ -2,7 +2,7 @@ &TIME T_END=1.5 / -&MISC TMPA=0 / +&MISC TMPA=-263.15 / &MESH IJK=90,30,30, XB=0.0,0.3,-0.1524, 0.1524,-0.1524, 0.1524, MULT_ID='mesh' / &MULT ID='mesh', DX=0.3, I_UPPER=2 / diff --git a/Verification/scripts/checkfds.bat b/Verification/scripts/checkfds.bat index 931639082c..5539ffdb82 100644 --- a/Verification/scripts/checkfds.bat +++ b/Verification/scripts/checkfds.bat @@ -1,6 +1,6 @@ @echo off -call %SVNROOT%\fds\Utilities\Scripts\getopts.bat %* +call %SVNROOT%\bot\Bundlebot\nightly\getopts.bat %* set fulldir=%BASEDIR%/%dir% diff --git a/Verification/scripts/erase_stop.bat b/Verification/scripts/erase_stop.bat index 9e310941d8..e1e921bdca 100644 --- a/Verification/scripts/erase_stop.bat +++ b/Verification/scripts/erase_stop.bat @@ -1,5 +1,5 @@ @echo off -call %SVNROOT%\fds\Utilities\Scripts\getopts.bat %* +call %SVNROOT%\bot\Bundlebot\nightly\getopts.bat %* -if exist %dir%\%infile%.stop erase %dir%\%infile%.stop \ No newline at end of file +if exist %dir%\%infile%.stop erase %dir%\%infile%.stop diff --git a/Verification/scripts/make_stop.bat b/Verification/scripts/make_stop.bat index 840d59667d..2bf326cf20 100644 --- a/Verification/scripts/make_stop.bat +++ b/Verification/scripts/make_stop.bat @@ -1,5 +1,5 @@ @echo off -call %SVNROOT%\fds\Utilities\Scripts\getopts.bat %* +call %SVNROOT%\bot\Bundlebot\nightly\getopts.bat %* echo 3 > %dir%\%infile%.stop