Skip to content

Commit b9defe5

Browse files
authored
Merge pull request #15304 from cxp484/master
FDS Source: Fix precision spec of numerical values
2 parents 947cbd5 + 27a8571 commit b9defe5

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

Source/chem.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ REAL(EB) FUNCTION DDC_TROE(P_RATIO, F, DPRDC, TMP, RNI)
730730
C = -0.4_EB - 0.67_EB*LOGFCENT
731731
N = 0.75_EB - 1.27_EB*LOGFCENT
732732

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

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

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

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

780780
DDTMP_TROE = F*LOGTEN*(DLOGFCENTDT/(1.0 + ((LOGPR + C)/(N - D*(LOGPR + C)))**2) &

Source/fire.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,7 @@ SUBROUTINE CALC_AFT_REAC_AND_PROD(ZZ,ZZ_REAC,ZZ_PROD)
12401240
B = X
12411241
C = 0.5_EB*Y
12421242
D = 0._EB ! No fuel
1243-
E = A + 0.5*Z - B - 0.5_EB*C
1243+
E = A + 0.5_EB*Z - B - 0.5_EB*C
12441244
ENDIF
12451245

12461246
! Setup reactants

Source/func.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2442,13 +2442,13 @@ SUBROUTINE SPRAY_ANGLE_DISTRIBUTION(LON,LAT,LON_CDF,LAT_CDF,BETA,MU,SPRAY_ANGLE,
24422442
LAT_CDF=0._EB
24432443
! Latitude distribution conditional on Longtitude
24442444
DO I=1,NPT
2445-
LAT_CDF(I,:)=LAT_CDF(I-1,:)+0.5*(PDF(I,:)+PDF(I-1,:))*DLAT
2445+
LAT_CDF(I,:)=LAT_CDF(I-1,:)+0.5_EB*(PDF(I,:)+PDF(I-1,:))*DLAT
24462446
ENDDO
24472447

24482448
! Marginal longtitude distribution
24492449
LON_CDF=0._EB
24502450
DO I=1,NPT
2451-
LON_CDF(I)=LON_CDF(I-1)+0.5*(LAT_CDF(NPT,I-1)+LAT_CDF(NPT,I))*DLON
2451+
LON_CDF(I)=LON_CDF(I-1)+0.5_EB*(LAT_CDF(NPT,I-1)+LAT_CDF(NPT,I))*DLON
24522452
ENDDO
24532453

24542454
! Normalize marginal longtitude distribution

Source/hvac.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2174,7 +2174,7 @@ SUBROUTINE UPDATE_FAN(T,ND)
21742174
DEL_P = FA%MAX_PRES - FA%MAX_PRES*(VDOT/FA%MAX_FLOW)**2
21752175
DEL_P = DEL_P*EVALUATE_RAMP(TSI,FA%SPIN_INDEX,TAU=FA%TAU)
21762176
CASE(3) !Fan curve
2177-
VDOT = 0.5*(DU%VEL(NEW)+DU%VEL(OLD))*DU%AREA
2177+
VDOT = 0.5_EB*(DU%VEL(NEW)+DU%VEL(OLD))*DU%AREA
21782178
IF (DU%REVERSE) VDOT = -VDOT
21792179
DEL_P = EVALUATE_RAMP(VDOT,FA%RAMP_INDEX)*EVALUATE_RAMP(TSI,FA%SPIN_INDEX,TAU=FA%TAU)
21802180
END SELECT

Source/part.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ SUBROUTINE GENERATE_PARTICLE_DISTRIBUTIONS
5151
DI = RM%T_MIN + I*DD
5252
LPC%R_CNF(I) = DI
5353
LPC%CNF(I) = EVALUATE_RAMP(DI,LPC%CNF_RAMP_INDEX)
54-
LPC%CVF(I) = LPC%CVF(I-1) + (DI-0.5*DD)**3*(LPC%CNF(I)-LPC%CNF(I-1))
54+
LPC%CVF(I) = LPC%CVF(I-1) + (DI-0.5_EB*DD)**3*(LPC%CNF(I)-LPC%CNF(I-1))
5555
ENDDO
5656
LPC%R_CNF = 1.E-6_EB*0.5_EB*LPC%R_CNF ! Convert diameter in microns to radius in meters.
5757
LPC%CNF = LPC%CNF/LPC%CNF(NDC)

Source/read.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4105,7 +4105,7 @@ SUBROUTINE PROC_SPEC_1
41054105
SS_K(N,0) = SS_K(N,1)
41064106
SS_MU(N,0) = SS_MU(N,1)
41074107
ENDIF
4108-
SS%H_G(I) = SS%H_G(I-1) + 0.5*(SS_CP(N,I-1)+SS_CP(N,I))
4108+
SS%H_G(I) = SS%H_G(I-1) + 0.5_EB*(SS_CP(N,I-1)+SS_CP(N,I))
41094109
IF (SS%EXPLICIT_G_F) SS%G_F(I) = SS_G_F(N,I)
41104110
ENDDO
41114111

Source/wall.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2937,8 +2937,8 @@ SUBROUTINE PERFORM_PYROLYSIS
29372937
R_DROP=R_SURF,LPU=U_SURF,LPV=V_SURF,LPW=W_SURF)
29382938
ELSE
29392939
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,&
2940-
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,&
2941-
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,&
2940+
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,&
2941+
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,&
29422942
Q_DOT_PART,M_DOT_PART,T_BOIL_EFF,B1%B_NUMBER,LAYER_INDEX(I),REMOVE_LAYER,ONE_D,B1,SOLID_CELL_INDEX=I)
29432943
ENDIF
29442944

0 commit comments

Comments
 (0)