Skip to content

FDS Source: Fix precision spec of numerical values #15304

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
cxp484 merged 2 commits into from
Oct 10, 2025
Merged

FDS Source: Fix precision spec of numerical values #15304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b7ebf1
FDS Source: Fix precision spec of numerical values
cxp484 Oct 10, 2025
27a8571
Merge remote-tracking branch 'firemodels/master'
cxp484 Oct 10, 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
4 changes: 2 additions & 2 deletions Source/chem.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ REAL(EB) FUNCTION DDC_TROE(P_RATIO, F, DPRDC, TMP, RNI)
C = -0.4_EB - 0.67_EB*LOGFCENT
N = 0.75_EB - 1.27_EB*LOGFCENT

DPARENTDC = 2.0*(LOGPR + C)/((N - D*(LOGPR + C))**2)*((DLOGPRDC)-(LOGPR + C)*(-D*(DLOGPRDC))/(N - D*(LOGPR + C)))
DPARENTDC = 2.0_EB*(LOGPR + C)/((N - D*(LOGPR + C))**2)*((DLOGPRDC)-(LOGPR + C)*(-D*(DLOGPRDC))/(N - D*(LOGPR + C)))

DDC_TROE = F*LOGTEN * (- LOGFCENT*DPARENTDC/(1.0 + ((LOGPR + C)/(N - D*(LOGPR + C)))**2)**2)

Expand Down Expand Up @@ -774,7 +774,7 @@ REAL(EB) FUNCTION DDTMP_TROE(P_RATIO, F, DPRDT, TMP, RNI)
DNDT = -1.27*DLOGFCENTDT
DLOGPRDT = DPRDT/P_RATIO/LOGTEN

DPARENTDT = 2.0*(LOGPR + C)/((N - D*(LOGPR + C))**2)* &
DPARENTDT = 2.0_EB*(LOGPR + C)/((N - D*(LOGPR + C))**2)* &
((DLOGPRDT + DCDT) - (LOGPR + C)*(DNDT - D*(DLOGPRDT + DCDT))/(N - D*(LOGPR + C)))

DDTMP_TROE = F*LOGTEN*(DLOGFCENTDT/(1.0 + ((LOGPR + C)/(N - D*(LOGPR + C)))**2) &
Expand Down
2 changes: 1 addition & 1 deletion Source/fire.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@ SUBROUTINE CALC_AFT_REAC_AND_PROD(ZZ,ZZ_REAC,ZZ_PROD)
B = X
C = 0.5_EB*Y
D = 0._EB ! No fuel
E = A + 0.5*Z - B - 0.5_EB*C
E = A + 0.5_EB*Z - B - 0.5_EB*C
ENDIF

! Setup reactants
Expand Down
4 changes: 2 additions & 2 deletions Source/func.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2442,13 +2442,13 @@ SUBROUTINE SPRAY_ANGLE_DISTRIBUTION(LON,LAT,LON_CDF,LAT_CDF,BETA,MU,SPRAY_ANGLE,
LAT_CDF=0._EB
! Latitude distribution conditional on Longtitude
DO I=1,NPT
LAT_CDF(I,:)=LAT_CDF(I-1,:)+0.5*(PDF(I,:)+PDF(I-1,:))*DLAT
LAT_CDF(I,:)=LAT_CDF(I-1,:)+0.5_EB*(PDF(I,:)+PDF(I-1,:))*DLAT
ENDDO

! Marginal longtitude distribution
LON_CDF=0._EB
DO I=1,NPT
LON_CDF(I)=LON_CDF(I-1)+0.5*(LAT_CDF(NPT,I-1)+LAT_CDF(NPT,I))*DLON
LON_CDF(I)=LON_CDF(I-1)+0.5_EB*(LAT_CDF(NPT,I-1)+LAT_CDF(NPT,I))*DLON
ENDDO

! Normalize marginal longtitude distribution
Expand Down
2 changes: 1 addition & 1 deletion Source/hvac.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2174,7 +2174,7 @@ SUBROUTINE UPDATE_FAN(T,ND)
DEL_P = FA%MAX_PRES - FA%MAX_PRES*(VDOT/FA%MAX_FLOW)**2
DEL_P = DEL_P*EVALUATE_RAMP(TSI,FA%SPIN_INDEX,TAU=FA%TAU)
CASE(3) !Fan curve
VDOT = 0.5*(DU%VEL(NEW)+DU%VEL(OLD))*DU%AREA
VDOT = 0.5_EB*(DU%VEL(NEW)+DU%VEL(OLD))*DU%AREA
IF (DU%REVERSE) VDOT = -VDOT
DEL_P = EVALUATE_RAMP(VDOT,FA%RAMP_INDEX)*EVALUATE_RAMP(TSI,FA%SPIN_INDEX,TAU=FA%TAU)
END SELECT
Expand Down
2 changes: 1 addition & 1 deletion Source/part.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ SUBROUTINE GENERATE_PARTICLE_DISTRIBUTIONS
DI = RM%T_MIN + I*DD
LPC%R_CNF(I) = DI
LPC%CNF(I) = EVALUATE_RAMP(DI,LPC%CNF_RAMP_INDEX)
LPC%CVF(I) = LPC%CVF(I-1) + (DI-0.5*DD)**3*(LPC%CNF(I)-LPC%CNF(I-1))
LPC%CVF(I) = LPC%CVF(I-1) + (DI-0.5_EB*DD)**3*(LPC%CNF(I)-LPC%CNF(I-1))
ENDDO
LPC%R_CNF = 1.E-6_EB*0.5_EB*LPC%R_CNF ! Convert diameter in microns to radius in meters.
LPC%CNF = LPC%CNF/LPC%CNF(NDC)
Expand Down
2 changes: 1 addition & 1 deletion Source/read.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4105,7 +4105,7 @@ SUBROUTINE PROC_SPEC_1
SS_K(N,0) = SS_K(N,1)
SS_MU(N,0) = SS_MU(N,1)
ENDIF
SS%H_G(I) = SS%H_G(I-1) + 0.5*(SS_CP(N,I-1)+SS_CP(N,I))
SS%H_G(I) = SS%H_G(I-1) + 0.5_EB*(SS_CP(N,I-1)+SS_CP(N,I))
IF (SS%EXPLICIT_G_F) SS%G_F(I) = SS_G_F(N,I)
ENDDO

Expand Down
4 changes: 2 additions & 2 deletions Source/wall.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2937,8 +2937,8 @@ SUBROUTINE PERFORM_PYROLYSIS
R_DROP=R_SURF,LPU=U_SURF,LPV=V_SURF,LPW=W_SURF)
ELSE
CALL PYROLYSIS(ONE_D%N_MATL,ONE_D%MATL_INDEX,SURF_INDEX,BC%IIG,BC%JJG,BC%KKG,ONE_D%TMP(I),B1%TMP_F,Y_O2_F,BC%IOR,&
RHO_DOT(1:ONE_D%N_MATL,I),RHO_TEMP(1:ONE_D%N_MATL),0.5*(ONE_D%X(I-1)+ONE_D%X(I)),ASH_DEPTH,DX_S,DT_BC_SUB,&
M_DOT_G_PPP_ADJUST,M_DOT_G_PPP_ACTUAL,M_DOT_S_PPP,Q_S(I),Q_DOT_G_PPP,Q_DOT_O2_PPP,&
RHO_DOT(1:ONE_D%N_MATL,I),RHO_TEMP(1:ONE_D%N_MATL),0.5_EB*(ONE_D%X(I-1)+ONE_D%X(I)),ASH_DEPTH,DX_S,&
DT_BC_SUB,M_DOT_G_PPP_ADJUST,M_DOT_G_PPP_ACTUAL,M_DOT_S_PPP,Q_S(I),Q_DOT_G_PPP,Q_DOT_O2_PPP,&
Q_DOT_PART,M_DOT_PART,T_BOIL_EFF,B1%B_NUMBER,LAYER_INDEX(I),REMOVE_LAYER,ONE_D,B1,SOLID_CELL_INDEX=I)
ENDIF

Expand Down
Loading