Skip to content

Commit 3a1f30f

Browse files
authored
Merge pull request #13988 from mcgratta/master
FDS Source: ERROR for misuse of TUNNEL_PRECONDITIONER
2 parents 1d89541 + 0d5bdf6 commit 3a1f30f

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

Manuals/FDS_User_Guide/FDS_User_Guide.tex

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13976,6 +13976,7 @@ \chapter{Error Codes}
1397613976
373 \> \ct{Cannot have FISHPAK_BC>0. } \> Section~\ref{sec:periodic} \\
1397713977
374 \> \ct{Numerical Instability - FDS stopped. } \> Section~\ref{info:Errors} \\
1397813978
375 \> \ct{OBST ... is VARIABLE_THICKNESS or HT3D and needs a MATL_ID. } \> Section~\ref{info:HT3D_Limitations} \\
13979+
376 \> \ct{Meshes must have the same y/z bounds for TUNNEL_PRECONDITIONER. } \> Section~\ref{tunnel_solver} \\
1397913980
\> \> \\
1398013981
381 \> \ct{Need more spectral band limits. } \> Section~\ref{info:RADI_Wide_Band} \\
1398113982
382 \> \ct{Spectral band limits should be given in ascending order. } \> Section~\ref{info:RADI_Wide_Band} \\

Source/read.f90

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9807,6 +9807,12 @@ SUBROUTINE READ_PRES
98079807
IF (MAX_PRESSURE_ITERATIONS<20) MAX_PRESSURE_ITERATIONS = 20
98089808
TUNNEL_NXP = 0
98099809
DO NM=1,NMESHES
9810+
IF (NM>1) THEN
9811+
IF (MESHES(NM)%YS/=MESHES(NM-1)%YS .OR. MESHES(NM)%YF/=MESHES(NM-1)%YF .OR. &
9812+
MESHES(NM)%ZS/=MESHES(NM-1)%ZS .OR. MESHES(NM)%ZF/=MESHES(NM-1)%ZF) THEN
9813+
CALL SHUTDOWN('ERROR(376): Meshes must have the same y/z bounds for TUNNEL_PRECONDITIONER.') ; RETURN
9814+
ENDIF
9815+
ENDIF
98109816
TUNNEL_NXP = TUNNEL_NXP + MESHES(NM)%IBAR
98119817
ENDDO
98129818
ALLOCATE(TP_AA(TUNNEL_NXP))

0 commit comments

Comments
 (0)