Skip to content

FDS Source: Add back Flux MW #15581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
drjfloyd merged 8 commits into from
Nov 14, 2025
Merged

FDS Source: Add back Flux MW #15581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a9e0f5e
FDS Source: Re-add MW flux limter
drjfloyd Nov 13, 2025
6d48ba9
FDS Source: fix missing var initializations
drjfloyd Nov 13, 2025
7809a9a
FDS Source: add RHO_Z_P pointer
drjfloyd Nov 13, 2025
e49ab4c
FDS Source: swork4 allocation fix
drjfloyd Nov 13, 2025
aeb4846
Merge remote-tracking branch 'github/master' into flux_mw
drjfloyd Nov 14, 2025
15cca3a
FDS Source: add back vel bc
drjfloyd Nov 14, 2025
b9c7910
Merge remote-tracking branch 'github/master'
drjfloyd Nov 14, 2025
184305a
FDS Source: Make MW flux correction default for all
drjfloyd Nov 14, 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
1 change: 1 addition & 0 deletions Source/cons.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ MODULE GLOBAL_CONSTANTS
LOGICAL :: STORE_FIRE_RESIDENCE=.FALSE. !< Flag for tracking residence time of spreading fire front over a surface
LOGICAL :: STORE_LS_SPREAD_RATE=.FALSE. !< Flag for outputting local level set spread rate magnitude
LOGICAL :: TEST_NEW_CHAR_MODEL=.FALSE. !< Flag to envoke new char model
LOGICAL :: FLUX_LIMITER_MW_CORRECTION=.TRUE. !< Flag for MW correction ensure consistent equation of state at face

INTEGER, ALLOCATABLE, DIMENSION(:) :: CHANGE_TIME_STEP_INDEX !< Flag to indicate if a mesh needs to change time step
INTEGER, ALLOCATABLE, DIMENSION(:) :: SETUP_PRESSURE_ZONES_INDEX !< Flag to indicate if a mesh needs to keep searching for ZONEs
Expand Down
36 changes: 0 additions & 36 deletions Source/data.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1360,42 +1360,6 @@ SUBROUTINE DEFINE_OUTPUT_QUANTITIES
OUTPUT_QUANTITY(553)%UNITS = 'm/s'
OUTPUT_QUANTITY(553)%SHORT_NAME = 'V_LS'

OUTPUT_QUANTITY(560)%NAME = 'BFX'
OUTPUT_QUANTITY(560)%UNITS = ''
OUTPUT_QUANTITY(560)%SHORT_NAME = 'bfx'
OUTPUT_QUANTITY(560)%CELL_POSITION = CELL_FACE
OUTPUT_QUANTITY(560)%IOR = 1

OUTPUT_QUANTITY(561)%NAME = 'BFY'
OUTPUT_QUANTITY(561)%UNITS = ''
OUTPUT_QUANTITY(561)%SHORT_NAME = 'bfy'
OUTPUT_QUANTITY(561)%CELL_POSITION = CELL_FACE
OUTPUT_QUANTITY(561)%IOR = 2

OUTPUT_QUANTITY(562)%NAME = 'BFZ'
OUTPUT_QUANTITY(562)%UNITS = ''
OUTPUT_QUANTITY(562)%SHORT_NAME = 'bfz'
OUTPUT_QUANTITY(562)%CELL_POSITION = CELL_FACE
OUTPUT_QUANTITY(562)%IOR = 3

OUTPUT_QUANTITY(563)%NAME = 'BFX MINUS'
OUTPUT_QUANTITY(563)%UNITS = ''
OUTPUT_QUANTITY(563)%SHORT_NAME = 'bfx-'
OUTPUT_QUANTITY(563)%CELL_POSITION = CELL_FACE
OUTPUT_QUANTITY(563)%IOR = 1

OUTPUT_QUANTITY(564)%NAME = 'BFY MINUS'
OUTPUT_QUANTITY(564)%UNITS = ''
OUTPUT_QUANTITY(564)%SHORT_NAME = 'bfy-'
OUTPUT_QUANTITY(564)%CELL_POSITION = CELL_FACE
OUTPUT_QUANTITY(564)%IOR = 2

OUTPUT_QUANTITY(565)%NAME = 'BFZ MINUS'
OUTPUT_QUANTITY(565)%UNITS = ''
OUTPUT_QUANTITY(565)%SHORT_NAME = 'bfz-'
OUTPUT_QUANTITY(565)%CELL_POSITION = CELL_FACE
OUTPUT_QUANTITY(565)%IOR = 3

! Boundary Quantities (Negative indices)

OUTPUT_QUANTITY(-1)%NAME = 'RADIATIVE HEAT FLUX'
Expand Down
214 changes: 145 additions & 69 deletions Source/divg.f90
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 1 addition & 14 deletions Source/dump.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8583,20 +8583,7 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
CASE(553) ! V_LS
GAS_PHASE_OUTPUT_RES = V_LS(II,JJ)

CASE(560) ! BFX
GAS_PHASE_OUTPUT_RES = BFX(II,JJ,KK)
CASE(561) ! BFY
GAS_PHASE_OUTPUT_RES = BFY(II,JJ,KK)
CASE(562) ! BFZ
GAS_PHASE_OUTPUT_RES = BFZ(II,JJ,KK)
CASE(563) ! BFX MINUS
GAS_PHASE_OUTPUT_RES = BFX(MAX(0,II-1),JJ,KK)
CASE(564) ! BFY MINUS
GAS_PHASE_OUTPUT_RES = BFY(II,MAX(0,JJ-1),KK)
CASE(565) ! BFZ MINUS
GAS_PHASE_OUTPUT_RES = BFZ(II,JJ,MAX(0,KK-1))

END SELECT IND_SELECT
END SELECT IND_SELECT

! Fill GAS_PHASE_OUTPUT for CUT_CELLs.
! Some variables have already been filled in fire.f90
Expand Down
39 changes: 18 additions & 21 deletions Source/init.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ SUBROUTINE INITIALIZE_MESH_VARIABLES_1(DT,NM)
USE RADCONS, ONLY: UIIDIM
USE CONTROL_VARIABLES
USE MATH_FUNCTIONS, ONLY: EVALUATE_RAMP
INTEGER :: N,I,J,K,IZERO,NS,IW
INTEGER :: N,I,J,K,IZERO,N_LOWER_SCALARS,NS,IW
REAL(EB), INTENT(IN) :: DT
INTEGER, INTENT(IN) :: NM
REAL(EB) :: MU_N,CS,DELTA
Expand Down Expand Up @@ -595,6 +595,20 @@ SUBROUTINE INITIALIZE_MESH_VARIABLES_1(DT,NM)

ALLOCATE(M%RSUM(0:IBP1,0:JBP1,0:KBP1),STAT=IZERO) ; CALL ChkMemErr('INIT','RSUM',IZERO) ; M%RSUM=RSUM0

! Allocate scalar face values

! Required for cell face density correction for multicomponent mixtures

IF (FLUX_LIMITER_MW_CORRECTION) THEN
N_LOWER_SCALARS=0
ELSE
N_LOWER_SCALARS=1
ENDIF

ALLOCATE( M%FX(0:IBP1,0:JBP1,0:KBP1,N_LOWER_SCALARS:N_TOTAL_SCALARS),STAT=IZERO); CALL ChkMemErr('INIT','FX',IZERO) ; M%FX=0._EB
ALLOCATE( M%FY(0:IBP1,0:JBP1,0:KBP1,N_LOWER_SCALARS:N_TOTAL_SCALARS),STAT=IZERO); CALL ChkMemErr('INIT','FY',IZERO) ; M%FY=0._EB
ALLOCATE( M%FZ(0:IBP1,0:JBP1,0:KBP1,N_LOWER_SCALARS:N_TOTAL_SCALARS),STAT=IZERO); CALL ChkMemErr('INIT','FZ',IZERO) ; M%FZ=0._EB

! Allocate storage for scalar total fluxes

IF (STORE_SPECIES_FLUX) THEN
Expand Down Expand Up @@ -682,9 +696,9 @@ SUBROUTINE INITIALIZE_MESH_VARIABLES_1(DT,NM)
ALLOCATE(M%WORK9(0:IBP1,0:JBP1,0:KBP1),STAT=IZERO) ; CALL ChkMemErr('INIT','WORK9',IZERO)

ALLOCATE(M%IWORK1(0:IBP1,0:JBP1,0:KBP1),STAT=IZERO) ; CALL ChkMemErr('INIT','IWORK1',IZERO)
ALLOCATE(M%SWORK1(0:IBP1,0:JBP1,0:KBP1,1:N_TOTAL_SCALARS),STAT=IZERO) ; CALL ChkMemErr('INIT','SWORK1',IZERO)
ALLOCATE(M%SWORK2(0:IBP1,0:JBP1,0:KBP1,1:N_TOTAL_SCALARS),STAT=IZERO) ; CALL ChkMemErr('INIT','SWORK2',IZERO)
ALLOCATE(M%SWORK3(0:IBP1,0:JBP1,0:KBP1,1:N_TOTAL_SCALARS),STAT=IZERO) ; CALL ChkMemErr('INIT','SWORK3',IZERO)
ALLOCATE(M%SWORK1(0:IBP1,0:JBP1,0:KBP1,N_LOWER_SCALARS:N_TOTAL_SCALARS),STAT=IZERO) ; CALL ChkMemErr('INIT','SWORK1',IZERO)
ALLOCATE(M%SWORK2(0:IBP1,0:JBP1,0:KBP1,N_LOWER_SCALARS:N_TOTAL_SCALARS),STAT=IZERO) ; CALL ChkMemErr('INIT','SWORK2',IZERO)
ALLOCATE(M%SWORK3(0:IBP1,0:JBP1,0:KBP1,N_LOWER_SCALARS:N_TOTAL_SCALARS),STAT=IZERO) ; CALL ChkMemErr('INIT','SWORK3',IZERO)
ALLOCATE(M%SWORK4(0:IBP1,0:JBP1,0:KBP1,1:N_TOTAL_SCALARS),STAT=IZERO) ; CALL ChkMemErr('INIT','SWORK4',IZERO)
M%IWORK1=0
M%SWORK1=0._EB
Expand Down Expand Up @@ -819,23 +833,6 @@ SUBROUTINE INITIALIZE_MESH_VARIABLES_1(DT,NM)
M%ZZS(:,:,:,N) = INITIAL_UNMIXED_FRACTION
ENDDO

! Allocate scalar face values

ALLOCATE( M%FX(0:IBP1,0:JBP1,0:KBP1,1:N_TOTAL_SCALARS),STAT=IZERO); CALL ChkMemErr('INIT','FX',IZERO) ; M%FX=0._EB
ALLOCATE( M%FY(0:IBP1,0:JBP1,0:KBP1,1:N_TOTAL_SCALARS),STAT=IZERO); CALL ChkMemErr('INIT','FY',IZERO) ; M%FY=0._EB
ALLOCATE( M%FZ(0:IBP1,0:JBP1,0:KBP1,1:N_TOTAL_SCALARS),STAT=IZERO); CALL ChkMemErr('INIT','FZ',IZERO) ; M%FZ=0._EB
DO N=1,N_TRACKED_SPECIES
M%FX(:,:,:,N)=RHOA*SPECIES_MIXTURE(N)%ZZ0
M%FY(:,:,:,N)=RHOA*SPECIES_MIXTURE(N)%ZZ0
M%FZ(:,:,:,N)=RHOA*SPECIES_MIXTURE(N)%ZZ0
ENDDO

! Allocate flux limiter coefficients

ALLOCATE( M%BFX(0:IBP1,0:JBP1,0:KBP1),STAT=IZERO); CALL ChkMemErr('INIT','BFX',IZERO) ; M%BFX=0._EB
ALLOCATE( M%BFY(0:IBP1,0:JBP1,0:KBP1),STAT=IZERO); CALL ChkMemErr('INIT','BFY',IZERO) ; M%BFY=0._EB
ALLOCATE( M%BFZ(0:IBP1,0:JBP1,0:KBP1),STAT=IZERO); CALL ChkMemErr('INIT','BFZ',IZERO) ; M%BFZ=0._EB

! Allocate and Initialize Mesh-Dependent Radiation Arrays

M%QR = 0._EB
Expand Down
Loading
Loading