Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
fa7d0fa
Merge pull request #1 from firemodels/master
bphusted May 25, 2022
2f4dd2a
Merge branch 'firemodels:master' into master
bphusted Jun 14, 2022
2d69e20
Merge remote-tracking branch 'firemodels/master'
bphusted Jun 15, 2022
25645be
bphusted Sep 12, 2022
78d026a
Update to latest version 9. december 2022
bphusted Dec 9, 2022
1b2b9fd
Merge remote-tracking branch 'firemodels/master'
bphusted Sep 1, 2023
ee83b2a
Merge branch 'firemodels:master' into master
bphusted Dec 19, 2023
0ca5c99
Merge branch 'firemodels:master' into master
bphusted Mar 26, 2024
2dda58c
Merge remote-tracking branch 'firemodels/master'
bphusted Apr 15, 2024
96715a7
Merge OBremote-tracking branch 'firemodels/master'
bphusted May 28, 2024
89e426d
Importing the latest changes
bphusted Nov 4, 2024
5a3e39a
Merge remote-tracking branch 'firemodels/master'
bphusted Dec 4, 2024
0a5c7b1
Merge branch 'master' of github.com:bphusted/fds
bphusted Dec 4, 2024
182f5ad
Merge remote-tracking branch 'firemodels/master'
bphusted Dec 6, 2024
be081ef
Merge remote-tracking branch 'firemodels/master'
bphusted Dec 9, 2024
ef73033
Merge remote-tracking branch 'firemodels/master'
bphusted Mar 24, 2025
609b34d
Merge remote-tracking branch 'firemodels/master'
bphusted Mar 25, 2025
5f2ff12
Merge branch 'master' of github.com:bphusted/fds
bphusted Mar 26, 2025
2529114
Merge remote-tracking branch 'firemodels/master'
bphusted Apr 6, 2025
0796dab
Merge remote-tracking branch 'firemodels/master'
bphusted Apr 6, 2025
e7363df
Merge branch 'master' of github.com:bphusted/fds
bphusted Apr 6, 2025
3e09b07
Merge remote-tracking branch 'firemodels/master'
bphusted Oct 8, 2025
70a88d3
Merge branch 'master' of github.com:bphusted/fds
bphusted Oct 8, 2025
3f3381b
Update FDS_User_Guide.tex
bphusted Oct 8, 2025
f7c071f
FDS Verification: changes to mass_balance.py.
marcosvanella Oct 17, 2025
36c92a3
FDS Source: Modify write string in pres.f90.
marcosvanella Oct 17, 2025
9f5233b
Merge pull request #15411 from marcosvanella/master
marcosvanella Oct 17, 2025
719a914
FDS User Guide: Convert Monin figure plotter
mcgratta Oct 17, 2025
83d0427
Merge pull request #15412 from mcgratta/master
mcgratta Oct 17, 2025
48f109b
script: add option to Copy_Firebot_FiguresGH.sh script to download la…
gforney Oct 17, 2025
d401aed
Merge pull request #15413 from gforney/copyfigs
gforney Oct 17, 2025
41f9851
FDS Verification: Fix rms_cov_corr in dataplot.
drjfloyd Oct 18, 2025
fbcc39d
Merge remote-tracking branch 'github/master'
drjfloyd Oct 18, 2025
32b685b
Merge pull request #15416 from drjfloyd/master
drjfloyd Oct 18, 2025
8a785b9
FDS User Guide: Fix path
mcgratta Oct 18, 2025
bbec734
Merge pull request #15417 from mcgratta/master
mcgratta Oct 18, 2025
14bd7ae
FDS Validation: update catchpole_spread_rates.py
ericvmueller Oct 19, 2025
a8a2ab2
Utilities: fix bug in fdsplotlib.py
ericvmueller Oct 19, 2025
591db5a
Merge pull request #15418 from ericvmueller/master
ericvmueller Oct 19, 2025
a187d71
FDS User Guide: Move FIGURES scripts to same folder
mcgratta Oct 19, 2025
64b5da2
Merge pull request #15419 from mcgratta/master
mcgratta Oct 19, 2025
2a3fc20
FDS User Guide: edit text on high MW species to reflect change to EXT…
drjfloyd Oct 19, 2025
190b74e
Merge remote-tracking branch 'github/master'
drjfloyd Oct 19, 2025
ff0a1cf
Merge pull request #15421 from drjfloyd/master
drjfloyd Oct 19, 2025
c2c5b20
Merge branch 'firemodels:master' into bphusted-patch-1
bphusted Oct 19, 2025
89d7e35
Merge pull request #15422 from bphusted/bphusted-patch-1
drjfloyd Oct 19, 2025
89d59db
FDS Verification: Convert flat_fire_comparison.m and move to Verifica…
mcgratta Oct 20, 2025
b14e5d3
Merge pull request #15424 from mcgratta/master
mcgratta Oct 20, 2025
1d6e3ef
FDS Verification : Translate mass_balance_gas_volume, mass_balance_reac.
marcosvanella Oct 20, 2025
e1bfeb2
Merge pull request #15425 from marcosvanella/master
marcosvanella Oct 20, 2025
5d082ba
Python: fix compression_wave solution
rmcdermo Oct 20, 2025
5c3f625
Merge pull request #15426 from rmcdermo/master
rmcdermo Oct 20, 2025
2071107
FDS Verification: Convedrt rotcube_cc_mms_error.m to py
drjfloyd Oct 20, 2025
e8db687
Merge pull request #15427 from drjfloyd/master
drjfloyd Oct 20, 2025
9cb5c31
FDS Verification: convert geom_positive_errors.m to python.
marcosvanella Oct 20, 2025
e1edb32
Merge pull request #15428 from marcosvanella/master
marcosvanella Oct 20, 2025
31051c5
FDS Verification: Convert geom_channel_test.m to python.
marcosvanella Oct 20, 2025
1e385e6
Merge pull request #15429 from marcosvanella/master
marcosvanella Oct 20, 2025
096e70e
FDS Verification: Convert EDC exact solution scripts and move to Veri…
mcgratta Oct 20, 2025
f23e6f3
Merge pull request #15430 from mcgratta/master
mcgratta Oct 20, 2025
3de9cac
Add error_linewidth to fdsplotlib kwargs
drjfloyd Oct 20, 2025
0e274e0
Merge pull request #15431 from drjfloyd/master
drjfloyd Oct 20, 2025
db6ab47
Matlab convert: misc clean up
mcgratta Oct 20, 2025
7fbcbc0
Merge pull request #15432 from mcgratta/master
mcgratta Oct 20, 2025
e339a39
Python: add Group_Style and Group_Key_Labels to scatter plots
rmcdermo Oct 20, 2025
f87950d
Merge pull request #15433 from rmcdermo/master
rmcdermo Oct 20, 2025
73aa58d
FDS Validation: push python version of backwards_facing_step
drjfloyd Oct 20, 2025
ec41e9e
Merge pull request #15434 from drjfloyd/master
drjfloyd Oct 20, 2025
962cd26
FDS Verification: Add header to file
mcgratta Oct 20, 2025
966b9cf
Merge pull request #15436 from mcgratta/master
mcgratta Oct 20, 2025
3f9d61c
FDS Source: Fix logic for particle position
mcgratta Oct 20, 2025
959a42b
Merge pull request #15437 from mcgratta/master
mcgratta Oct 20, 2025
771b1ec
Python: improve histogram plots
rmcdermo Oct 20, 2025
51d4d85
Merge pull request #15438 from rmcdermo/master
rmcdermo Oct 20, 2025
8f1c537
FDS Verification: Fix filename
drjfloyd Oct 21, 2025
4b80ab5
Matlab: change legend position label
mcgratta Oct 21, 2025
0a8f2a3
Merge pull request #15441 from mcgratta/master
mcgratta Oct 21, 2025
09ee985
Python: update backwards_facing_step.py legends
rmcdermo Oct 21, 2025
a5b4c67
Python: rename backwards_facing_step.py to Backwards_Facing_Step.py
rmcdermo Oct 21, 2025
20db280
Python: move Backwards_Facing_Step to python
rmcdermo Oct 21, 2025
fe868d6
Merge pull request #15442 from rmcdermo/master
rmcdermo Oct 21, 2025
d4dd871
Python: rename to Backward_Facing_Step.py
rmcdermo Oct 21, 2025
4f7c9a1
Merge pull request #15443 from rmcdermo/master
rmcdermo Oct 21, 2025
f685991
Merge remote-tracking branch 'firemodels/master' into FireX
cxp484 Oct 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions Manuals/Copy_Firebot_FiguresGH.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
#!/bin/bash
LATEST=$1
if [ "$LATEST" != "" ]; then
LATEST=_latest
fi

DOWNLOADFIGURES ()
{
FILE=$1_figures
FILE=$1_figures$LATEST
echo ***Downloading $FILE.tar.gz
gh release download FDS_TEST -p $FILE.tar.gz -R github.com/firemodels/test_bundles --clobber
if [ ! -e $FILE.tar.gz ]; then
Expand Down Expand Up @@ -31,25 +36,25 @@ FBVG=$BASEDIR/FIGS/FDS_VERG
FBVAL=$BASEDIR/FIGS/FDS_VALG

# Copy Tech Guide Figures
if [ -e $BASEDIR/FDS_TG_figures.tar.gz ]; then
if [ -e $BASEDIR/FDS_TG_figures$LATEST.tar.gz ]; then
cd $FBTG
tar xf $BASEDIR/FDS_TG_figures.tar.gz
tar xf $BASEDIR/FDS_TG_figures$LATEST.tar.gz
cp * $BASEDIR/FDS_Technical_Reference_Guide/SCRIPT_FIGURES/
echo FDS Technical Guide figures copied to FDS_Technical_Reference_Guide/SCRIPT_FIGURES
fi

# Copy User's Guide Figures
if [ -e $BASEDIR/FDS_UG_figures.tar.gz ]; then
if [ -e $BASEDIR/FDS_UG_figures$LATEST.tar.gz ]; then
cd $FBUG
tar xf $BASEDIR/FDS_UG_figures.tar.gz
tar xf $BASEDIR/FDS_UG_figures$LATEST.tar.gz
cp * $BASEDIR/FDS_User_Guide/SCRIPT_FIGURES/
echo FDS Users Guide figures copied to FDS_User_Reference_Guide/SCRIPT_FIGURES
fi

# Copy Verification Guide Figures
if [ -e $BASEDIR/FDS_VERG_figures.tar.gz ]; then
if [ -e $BASEDIR/FDS_VERG_figures$LATEST.tar.gz ]; then
cd $FBVG
tar xf $BASEDIR/FDS_VERG_figures.tar.gz
tar xf $BASEDIR/FDS_VERG_figures$LATEST.tar.gz
cp *.pdf $BASEDIR/FDS_Verification_Guide/SCRIPT_FIGURES/.
cp *.png $BASEDIR/FDS_Verification_Guide/SCRIPT_FIGURES/.
cp *.tex $BASEDIR/FDS_Verification_Guide/SCRIPT_FIGURES/.
Expand All @@ -58,9 +63,9 @@ if [ -e $BASEDIR/FDS_VERG_figures.tar.gz ]; then
fi

# Copy Validation Guide Figures
if [ -e $BASEDIR/FDS_VALG_figures.tar.gz ]; then
if [ -e $BASEDIR/FDS_VALG_figures$LATEST.tar.gz ]; then
cd $FBVAL
tar xf $BASEDIR/FDS_VALG_figures.tar.gz
tar xf $BASEDIR/FDS_VALG_figures$LATEST.tar.gz
cp -R * $BASEDIR/FDS_Validation_Guide/SCRIPT_FIGURES
echo FDS Validation Guide Figures copied to FDS_Validation_Guide_Reference_Guide/SCRIPT_FIGURES
fi
Expand Down
16 changes: 8 additions & 8 deletions Manuals/FDS_User_Guide/FDS_User_Guide.tex
Original file line number Diff line number Diff line change
Expand Up @@ -4621,7 +4621,7 @@ \subsubsection{Enthalpy}
\be
c_{p,\alpha} = \frac{\gamma}{\gamma-1} \frac{\R}{W_\alpha}
\ee
The ratio of specific heats, \ct{GAMMA}, is 1.4 by default and can be changed on the \ct{MISC} line. If you want all the gas specific heats to follow this relation, set \ct{CONSTANT_SPECIFIC_HEAT_RATIO=T} on the \ct{MISC} line. For high molecular weight species, use of the default gamma will result in very low values of the specific heat which can cause issues with the default extinction model. In this case it is recommended that the specific heat be defined. If the FDS is determining the specific heat using this relation, then it is recommended that you check the \ct{CHID.out} and verify that reasonable specific heat values have been created.
The ratio of specific heats, \ct{GAMMA}, is 1.4 by default and can be changed on the \ct{MISC} line. If you want all the gas specific heats to follow this relation, set \ct{CONSTANT_SPECIFIC_HEAT_RATIO=T} on the \ct{MISC} line. For high molecular weight species, use of the default gamma will result in very low values of the specific heat. This can cause issues with temperature in regions with high fuel mass fractions and can cause issues with the \ct{EXTINCTION 2} extinction model. For high molecular weight species it is recommended that the specific heat be defined. If the FDS is determining the specific heat using \ct{GAMMA}, then it is recommended that you check the \ct{CHID.out} file and verify that reasonable specific heat values have been created.

Note that species used in chemical reactions must either be predefined or have an explicitly defined $h(T_{\rm ref})$. The exception is the species defined as \ct{FUEL} on the \ct{REAC} input as long as a \ct{HEAT_OF_COMBUSTION} is defined or the reaction is a simple chemistry reaction where \ct{EPUMO2} applies. Specifying either \ct{SPECIFIC_HEAT} or \ct{RAMP_CP} is considered to have explicitly defined $h(T_{\rm ref})$. If you still wish to use the default \ct{EPUMO2} or 13,100~kJ/kg, then you will need to explicitly define it on the \ct{REAC} input.

Expand Down Expand Up @@ -6888,12 +6888,12 @@ \subsection{Basic Equations}

\begin{figure}[p]
\begin{tabular*}{\textwidth}{l@{\extracolsep{\fill}}r}
\includegraphics[width=3.2in]{FIGURES/vel_L=-100} &
\includegraphics[width=3.2in]{FIGURES/tmp_L=-100} \\
\includegraphics[width=3.2in]{FIGURES/vel_L=100} &
\includegraphics[width=3.2in]{FIGURES/tmp_L=100} \\
\includegraphics[width=3.2in]{FIGURES/vel_L=-350} &
\includegraphics[width=3.2in]{FIGURES/tmp_L=-350}
\includegraphics[width=3.2in]{FIGURES/Monin_Obukhov_vel_L_-100} &
\includegraphics[width=3.2in]{FIGURES/Monin_Obukhov_tmp_L_-100} \\
\includegraphics[width=3.2in]{FIGURES/Monin_Obukhov_vel_L_100} &
\includegraphics[width=3.2in]{FIGURES/Monin_Obukhov_tmp_L_100} \\
\includegraphics[width=3.2in]{FIGURES/Monin_Obukhov_vel_L_-350} &
\includegraphics[width=3.2in]{FIGURES/Monin_Obukhov_tmp_L_-350}
\end{tabular*}
\caption[Sample vertical wind and temperature profiles]{Sample vertical wind and temperature profiles.}
\label{wind_profiles}
Expand Down Expand Up @@ -12267,7 +12267,7 @@ \section{\texorpdfstring{{\tt DEVC}}{DEVC} (Device Parameters)}
\ct{SMOOTHING_TIME} & Real & Section~\ref{info:basic_control} & s & \\ \hline
\ct{SPATIAL_STATISTIC} & Character & Section~\ref{info:statistics} & & \\ \hline
\ct{SPEC_ID} & Character & Section~\ref{info:gasoutputquantities} & & \\ \hline
\ct{STATISTICS_END} & Real & Section~\ref{info:rmscovcorr} & s & \ct{T_BEGIN}\\ \hline
\ct{STATISTICS_END} & Real & Section~\ref{info:rmscovcorr} & s & \ct{T_END}\\ \hline
\ct{STATISTICS_START} & Real & Section~\ref{info:rmscovcorr} & s & \ct{T_BEGIN}\\ \hline
\ct{SURF_ID} & Character & Section~\ref{info:statistics} & & \\ \hline
\ct{TEMPORAL_STATISTIC} & Character & Section~\ref{info:statistics} & & \\ \hline
Expand Down
83 changes: 83 additions & 0 deletions Manuals/FDS_User_Guide/FIGURES/Monin_Obukhov_Profiles.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@

# Atmospheric Boundary Layer profiles, based on M-O theory as described in
# "Falcon Series Data Report", GRI-89/0138, June 1990.
# These plots are used as illustrations in the FDS User's Guide.

import numpy as np
import matplotlib.pyplot as plt
import fdsplotlib

plot_style = fdsplotlib.get_plot_style('fds')

rho_0 = 1.2
g = 9.81
cp = 1005
kappa = 0.41
p_0 = 100000

L = np.array([-100,100,-350])
Ls = np.array(['-100','100','-350'])
z_0 = np.array([0.01,0.005,0.005])
z_r = 2.0
u_r = 5.0

for i in range(3):

p_r = p_0 - rho_0 * g * (z_r - z_0[i])
T_r = 20 + 273.15
theta_r = T_r * (p_0 / p_r) ** 0.285

if L[i] < 0:
x_r = (1 - 16 * z_r / L[i]) ** 0.25
psi_m_r = 2 * np.log((1 + x_r) / 2) + np.log((1 + x_r**2) / 2) - 2 * np.arctan(x_r) + np.pi / 2
psi_h_r = 2 * np.log((1 + x_r**2) / 2)
else:
psi_m_r = -5 * z_r / L[i]
psi_h_r = psi_m_r

u_star = kappa * u_r / (np.log(z_r / z_0[i]) - psi_m_r)
theta_0 = theta_r / (1 + u_star**2 * (np.log(z_r / z_0[i]) - psi_h_r) / (g * kappa**2 * L[i]))
theta_star = u_star**2 * theta_0 / (g * kappa * L[i])

z = np.array([z_0[i], 10*z_0[i], 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 50, 100])

# Figure 1 - Velocity profile

if L[i] < 0:
x = (1 - 16 * z / L[i]) ** 0.25
psi_m = 2 * np.log((1 + x) / 2) + np.log((1 + x**2) / 2) - 2 * np.arctan(x) + np.pi / 2
psi_h = 2 * np.log((1 + x**2) / 2)
else:
psi_m = -5 * z / L[i]
psi_h = psi_m

u = (u_star / kappa) * (np.log(z / z_0[i]) - psi_m)
theta = theta_0 + (theta_star / kappa) * (np.log(z / z_0[i]) - psi_h)
T = theta * (p_0 / (p_0 - rho_0 * g * (z - z_0[i]))) ** -0.285

fig = fdsplotlib.plot_to_fig(x_data=u, y_data=z, marker_style='ko-',
x_label='Velocity (m/s)', y_label='Height (m)',
x_min=0, x_max=10, y_min=0, y_max=30)

ax1 = fig.axes[0]
ax1.text(0.05, 0.90, r'$u(2 \; \mathrm{m})=5$ m/s', transform=ax1.transAxes, verticalalignment='top')
ax1.text(0.05, 0.80, f'$L={L[i]:4.0f}$ m', transform=ax1.transAxes, verticalalignment='top')
ax1.text(0.05, 0.70, f'$z_0={z_0[i]:5.3f}$ m', transform=ax1.transAxes, verticalalignment='top')

plt.savefig(f'Monin_Obukhov_vel_L_{Ls[i]}.pdf', format='pdf')
plt.close()

# Figure 2 - Temperature profile

fig = fdsplotlib.plot_to_fig(x_data=T-273.15, y_data=z, marker_style='ko-',
x_label='Temperature (°C)', y_label='Height (m)',
x_min=15, x_max=25, y_min=0, y_max=30)

ax2 = fig.axes[0]
ax2.text(0.05, 0.90, r'$T(2 \; \mathrm{m})=20\;^\circ$C', transform=ax2.transAxes, verticalalignment='top')
ax2.text(0.05, 0.80, f'$L={L[i]:4.0f}$ m', transform=ax2.transAxes, verticalalignment='top')
ax2.text(0.05, 0.70, f'$z_0={z_0[i]:5.3f}$ m', transform=ax2.transAxes, verticalalignment='top')

plt.savefig(f'Monin_Obukhov_tmp_L_{Ls[i]}.pdf', format='pdf')
plt.close()

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

plot_style = fdsplotlib.get_plot_style('fds')

pltdir = '../../Manuals/FDS_User_Guide/FIGURES/'

b = [0, 5, 10, 100, 1000]
mu = np.array([0, 10, 20]) * np.pi / 180
mu_str = ['0', '10', '20']
Expand All @@ -34,6 +32,6 @@
ax.invert_yaxis()
ax.text(45, 0.1, r'$\mu=$' + str(mu[j]*180/np.pi) + r', $\phi_{\rm max}=$' + str(phi_max[k]*180/np.pi) + ' degrees', fontsize=plot_style['Key_Font_Size'])

plt.savefig(pltdir + 'spray_pattern_mu_' + mu_str[j] + '_phimax_' + phi_str[k] + '.pdf', format='pdf')
plt.savefig('spray_pattern_mu_' + mu_str[j] + '_phimax_' + phi_str[k] + '.pdf', format='pdf')
plt.close()

Binary file removed Manuals/FDS_User_Guide/FIGURES/tmp_L=-100.pdf
Binary file not shown.
Binary file removed Manuals/FDS_User_Guide/FIGURES/tmp_L=-350.pdf
Binary file not shown.
Binary file removed Manuals/FDS_User_Guide/FIGURES/tmp_L=100.pdf
Binary file not shown.
Binary file removed Manuals/FDS_User_Guide/FIGURES/vel_L=-100.pdf
Binary file not shown.
Binary file removed Manuals/FDS_User_Guide/FIGURES/vel_L=-350.pdf
Binary file not shown.
Binary file removed Manuals/FDS_User_Guide/FIGURES/vel_L=100.pdf
Binary file not shown.
6 changes: 3 additions & 3 deletions Source/part.f90
Original file line number Diff line number Diff line change
Expand Up @@ -1013,9 +1013,9 @@ SUBROUTINE INSERT_VOLUMETRIC_PARTICLES
! If the INIT volume is outside the current mesh, return

IF (IN%SHAPE/='RING' .AND. IN%SHAPE/='LINE') THEN
IF ((IN_X1-XF)>50._EB*TWO_EPSILON_EB .OR. (IN_X2-XS)<-50._EB*TWO_EPSILON_EB .OR. &
(IN_Y1-YF)>50._EB*TWO_EPSILON_EB .OR. (IN_Y2-YS)<-50._EB*TWO_EPSILON_EB .OR. &
(IN_Z1-ZF)>50._EB*TWO_EPSILON_EB .OR. (IN_Z2-ZS)<-50._EB*TWO_EPSILON_EB) RETURN
IF ((IN_X1-XF)>-50._EB*TWO_EPSILON_EB .OR. (IN_X2-XS)<50._EB*TWO_EPSILON_EB .OR. &
(IN_Y1-YF)>-50._EB*TWO_EPSILON_EB .OR. (IN_Y2-YS)<50._EB*TWO_EPSILON_EB .OR. &
(IN_Z1-ZF)>-50._EB*TWO_EPSILON_EB .OR. (IN_Z2-ZS)<50._EB*TWO_EPSILON_EB) RETURN
ELSEIF (IN%SHAPE=='RING') THEN
IF (RING_MESH_INTERSECTION_ARC(NM,IN%X0,IN%Y0,IN%RADIUS)<TWO_EPSILON_EB) RETURN
ELSE
Expand Down
2 changes: 1 addition & 1 deletion Source/pres.f90
Original file line number Diff line number Diff line change
Expand Up @@ -3769,7 +3769,7 @@ SUBROUTINE CHECK_UNSUPPORTED_MESH(SUPPORTED_MESH)
TRN_ME(2)=TRN_ME(1)
IF (N_MPI_PROCESSES > 1) CALL MPI_ALLREDUCE(TRN_ME(1),TRN_ME(2),1,MPI_INTEGER,MPI_SUM,MPI_COMM_WORLD,IERR)
IF (TRN_ME(2) > 0) THEN ! Meshes at different refinement levels. Not Unsupported.
IF (MY_RANK == 0) WRITE(LU_ERR,*) 'GLMAT Setup Error : Meshes at different refinement levels unsupported.'
IF (MY_RANK == 0) WRITE(LU_ERR,*) 'GLMAT Setup Error: Meshes at different refinement levels currently unsupported for &GEOM.'
SUPPORTED_MESH = .FALSE.
STOP_STATUS = SETUP_STOP
RETURN
Expand Down
12 changes: 6 additions & 6 deletions Source/read.f90
Original file line number Diff line number Diff line change
Expand Up @@ -12999,12 +12999,12 @@ SUBROUTINE READ_INIT
MESH_LOOP: DO NM=1,NMESHES
M=>MESHES(NM)
IF (XYZ(1)>=M%XS .AND. XYZ(1)<=M%XF .AND. XYZ(2)>=M%YS .AND. XYZ(2)<=M%YF .AND. XYZ(3)>=M%ZS .AND. XYZ(3)<=M%ZF) THEN
IF (ABS(XYZ(1)-M%XS)<TWO_EPSILON_EB) XYZ(1) = XYZ(1) + 0.01_EB*M%DXI
IF (ABS(XYZ(1)-M%XF)<TWO_EPSILON_EB) XYZ(1) = XYZ(1) - 0.01_EB*M%DXI
IF (ABS(XYZ(2)-M%YS)<TWO_EPSILON_EB) XYZ(2) = XYZ(2) + 0.01_EB*M%DETA
IF (ABS(XYZ(2)-M%YF)<TWO_EPSILON_EB) XYZ(2) = XYZ(2) - 0.01_EB*M%DETA
IF (ABS(XYZ(3)-M%ZS)<TWO_EPSILON_EB) XYZ(3) = XYZ(3) + 0.01_EB*M%DZETA
IF (ABS(XYZ(3)-M%ZF)<TWO_EPSILON_EB) XYZ(3) = XYZ(3) - 0.01_EB*M%DZETA
IF (ABS(XYZ(1)-M%XS)<50._EB*TWO_EPSILON_EB) XYZ(1) = XYZ(1) + 0.01_EB*M%DXI
IF (ABS(XYZ(1)-M%XF)<50._EB*TWO_EPSILON_EB) XYZ(1) = XYZ(1) - 0.01_EB*M%DXI
IF (ABS(XYZ(2)-M%YS)<50._EB*TWO_EPSILON_EB) XYZ(2) = XYZ(2) + 0.01_EB*M%DETA
IF (ABS(XYZ(2)-M%YF)<50._EB*TWO_EPSILON_EB) XYZ(2) = XYZ(2) - 0.01_EB*M%DETA
IF (ABS(XYZ(3)-M%ZS)<50._EB*TWO_EPSILON_EB) XYZ(3) = XYZ(3) + 0.01_EB*M%DZETA
IF (ABS(XYZ(3)-M%ZF)<50._EB*TWO_EPSILON_EB) XYZ(3) = XYZ(3) - 0.01_EB*M%DZETA
EXIT MESH_LOOP
ENDIF
ENDDO MESH_LOOP
Expand Down
2 changes: 0 additions & 2 deletions Utilities/Matlab/FDS_validation_script.m
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,4 @@

% Miscellaneous other scripts for special cases

backward_facing_step

display('validation scripts completed successfully!')
Loading
Loading