Skip to content

Commit 3db5268

Browse files
authored
Merge pull request #13881 from mcgratta/master
FDS Source: Simplify MPI exchange of global variables
2 parents c248ad2 + 2fca94b commit 3db5268

File tree

8 files changed

+71
-151
lines changed

8 files changed

+71
-151
lines changed

Manuals/FDS_User_Guide/FDS_User_Guide.tex

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14404,9 +14404,8 @@ \section{Diagnostic Output ({\tt .out})}
1440414404
Min divergence: -0.20E+00 at ( 66, 13, 1)
1440514405
Max VN number: 0.51E+00 at ( 1, 25, 18)
1440614406
No. of Lagrangian Particles: 27
14407-
Radiation Loss to Boundaries: 13.830 kW
1440814407
\end{lstlisting}
14409-
The \ct{Time Step} indicates the total number of iterations. The date and time indicate the current wall clock time. The \ct{STEP SIZE} indicates the size of the numerical time step. The \ct{Total Time} indicates the total simulation time calculated up to that point. The \ct{Pressure Iterations} are the number of iterations of the pressure solver for the corrector (second) half of the time step. The pressure solver iterations are designed to minimize the error in the normal component of velocity at solid walls or the interface of two meshes. The \ct{Maximum Velocity Error} indicates this error and in which grid cell it occurs. \ct{Max/Min divergence} is the max/min value of the function $\nabla \cdot \bu$ and is used as a diagnostic when the flow is incompressible (i.e., no heating); \ct{Max CFL number} is the maximum value of the CFL number, the primary time step constraint; \ct{Max VN number} is the maximum value of the Von Neumann number, the secondary time step constraint. The \ct{No. of Lagrangian Particles} refers to the number of particles in the current mesh. The \ct{Radiation Loss to Boundaries} is the amount of energy that is being radiated to the boundaries. As compartments heat up, the energy lost to the boundaries can grow to be an appreciable fraction of the \ct{Total Heat Release Rate}.
14408+
The \ct{Time Step} indicates the total number of iterations. The date and time indicate the current wall clock time. The \ct{STEP SIZE} indicates the size of the numerical time step. The \ct{Total Time} indicates the total simulation time calculated up to that point. The \ct{Pressure Iterations} are the number of iterations of the pressure solver for the corrector (second) half of the time step. The pressure solver iterations are designed to minimize the error in the normal component of velocity at solid walls or the interface of two meshes. The \ct{Maximum Velocity Error} indicates this error and in which grid cell it occurs. \ct{Max/Min divergence} is the max/min value of the function $\nabla \cdot \bu$ and is used as a diagnostic when the flow is incompressible (i.e., no heating); \ct{Max CFL number} is the maximum value of the CFL number, the primary time step constraint; \ct{Max VN number} is the maximum value of the Von Neumann number, the secondary time step constraint. The \ct{No. of Lagrangian Particles} refers to the number of particles in the current mesh.
1441014409

1441114410
Following the completion of a successful run, a summary of the CPU usage per subroutine is listed in the file called \ct{CHID_cpu.csv} (Section~\ref{out:CPU}). This is useful in determining where most of the computational effort is being placed.
1441214411

Source/data.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ MODULE OUTPUT_DATA
1616
INTEGER :: HVAC_SMV_EQUIVALENCE(300:350)
1717
REAL(EB) :: T_LAST_DUMP_HRR,T_LAST_DUMP_MASS,T_LAST_DUMP_MOM
1818
REAL(EB),ALLOCATABLE, DIMENSION(:) :: ENTHALPY_SUM
19-
REAL(EB),ALLOCATABLE, DIMENSION(:,:) :: MASS_DT,Q_DOT,Q_DOT_SUM,M_DOT,M_DOT_SUM
19+
REAL(EB),ALLOCATABLE, DIMENSION(:) :: MASS_DT,Q_DOT,Q_DOT_SUM,M_DOT,M_DOT_SUM
2020

2121
TYPE SMOKE3D_TYPE
2222
INTEGER :: QUANTITY_INDEX,Y_INDEX=0,Z_INDEX=0

Source/dump.f90

Lines changed: 39 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -3446,7 +3446,7 @@ SUBROUTINE DUMP_RESTART(T,DT,NM)
34463446
RTE_SOURCE_CORRECTION_FACTOR,RAD_Q_SUM,KFST4_SUM,ENTHALPY_SUM(NM)
34473447
WRITE(LU_CORE(NM)) DT_BNDF,DT_CPU,DT_CTRL,DT_DEVC,DT_FLUSH,DT_GEOM,DT_HRR,DT_ISOF,DT_MASS,DT_PART,DT_PL3D,DT_PROF,DT_RADF,&
34483448
DT_SLCF,DT_SL3D,DT_SMOKE3D,DT_UVW
3449-
WRITE(LU_CORE(NM)) Q_DOT_SUM(1:N_Q_DOT,NM),M_DOT_SUM(1:N_TRACKED_SPECIES,NM),MASS_DT(0:N_SPECIES+N_TRACKED_SPECIES,NM)
3449+
WRITE(LU_CORE(NM)) Q_DOT_SUM(1:N_Q_DOT),M_DOT_SUM(1:N_TRACKED_SPECIES),MASS_DT(0:N_SPECIES+N_TRACKED_SPECIES)
34503450
DO N=1,N_DEVC
34513451
DV => DEVICE(N)
34523452
WRITE(LU_CORE(NM)) DV%T,DV%T_CHANGE,DV%TMP_L,DV%Y_C,DV%CURRENT_STATE,DV%PRIOR_STATE,&
@@ -3627,7 +3627,7 @@ SUBROUTINE READ_RESTART(T,DT,NM)
36273627

36283628
READ(LU_RESTART(NM)) DT_BNDF,DT_CPU,DT_CTRL,DT_DEVC,DT_FLUSH,DT_GEOM,DT_HRR,DT_ISOF,DT_MASS,DT_PART,DT_PL3D,DT_PROF,DT_RADF,&
36293629
DT_SLCF,DT_SL3D,DT_SMOKE3D,DT_UVW
3630-
READ(LU_RESTART(NM)) Q_DOT_SUM(1:N_Q_DOT,NM),M_DOT_SUM(1:N_TRACKED_SPECIES,NM),MASS_DT(0:N_SPECIES+N_TRACKED_SPECIES,NM)
3630+
READ(LU_RESTART(NM)) Q_DOT_SUM(1:N_Q_DOT),M_DOT_SUM(1:N_TRACKED_SPECIES),MASS_DT(0:N_SPECIES+N_TRACKED_SPECIES)
36313631
DO N=1,N_DEVC
36323632
DV => DEVICE(N)
36333633
READ(LU_RESTART(NM)) DV%T,DV%T_CHANGE,DV%TMP_L,DV%Y_C,DV%CURRENT_STATE,DV%PRIOR_STATE,&
@@ -3922,8 +3922,6 @@ SUBROUTINE WRITE_DIAGNOSTICS(T,DT)
39223922
IF (CHECK_POISSON) WRITE(LU_OUTPUT,'(A,E9.2)') ' Poisson Error : ',M%POIS_ERR
39233923
IF (SIM_MODE==DNS_MODE .OR. CHECK_VN) WRITE(LU_OUTPUT,230) M%VN,M%I_VN,M%J_VN,M%K_VN
39243924
IF (M%NLP>0) WRITE(LU_OUTPUT,141) M%NLP
3925-
IF (ABS(Q_DOT(1,NM))>1._EB) WRITE(LU_OUTPUT,119) Q_DOT(1,NM)/1000._EB
3926-
IF (ABS(Q_DOT(3,NM))>1._EB) WRITE(LU_OUTPUT,120) Q_DOT(3,NM)/1000._EB
39273925
IF (M%DT_RESTRICT_STORE>0 ) THEN
39283926
WRITE(LU_OUTPUT,121) M%DT_RESTRICT_STORE
39293927
M%DT_RESTRICT_STORE=0
@@ -3939,8 +3937,6 @@ SUBROUTINE WRITE_DIAGNOSTICS(T,DT)
39393937
6X,' Min divergence: ',E9.2,' at (',I0,',',I0,',',I0,')')
39403938
133 FORMAT(6X,' Max div. error: ',E9.2,' at (',I0,',',I0,',',I0,')')
39413939
230 FORMAT(6X,' Max VN number : ',E9.2,' at (',I0,',',I0,',',I0,')')
3942-
119 FORMAT(6X,' Total Heat Release Rate: ',F13.3,' kW')
3943-
120 FORMAT(6X,' Radiation Loss to Boundaries: ',F13.3,' kW')
39443940
141 FORMAT(6X,' No. of Lagrangian Particles: ',I0)
39453941
121 FORMAT(6X,' No. of CLIP DT restrictions: ',I0)
39463942

@@ -9950,15 +9946,15 @@ END SUBROUTINE DUMP_HVAC
99509946
!> \param DT Current time step size (s)
99519947
!> \param NM Mesh number
99529948
!> \details
9953-
!> Q_DOT(1,NM) = \f$ \int \dot{q}''' \, dV \f$
9954-
!> Q_DOT(2,NM) = \f$ \int \dot{q}_{\rm ox}'' \, dS \f$
9955-
!> Q_DOT(3,NM) = \f$ \int \nabla \cdot \mathbf{q}_{\rm r}'' \, dV \f$
9956-
!> Q_DOT(4,NM) = \f$ \int \mathbf{u} \rho h_{\rm s} \cdot \, d\mathbf{S} \f$
9957-
!> Q_DOT(5,NM) = \f$ \int k \nabla T \cdot d\mathbf{S} \f$
9958-
!> Q_DOT(6,NM) = \f$ \int \sum_\alpha h_{{\rm s},\alpha} \rho D_\alpha \nabla Z_\alpha \cdot d\mathbf{S} \f$
9959-
!> Q_DOT(7,NM) = \f$ \int dp/dt \, dV \f$
9960-
!> Q_DOT(8,NM) = \f$ \sum \dot{q}_{\rm p} \f$
9961-
!> Q_DOT(9,NM) = \f$ \int d(\rho h_{\rm s})/dt \, dV \f$
9949+
!> Q_DOT(1) = \f$ \int \dot{q}''' \, dV \f$
9950+
!> Q_DOT(2) = \f$ \int \dot{q}_{\rm ox}'' \, dS \f$
9951+
!> Q_DOT(3) = \f$ \int \nabla \cdot \mathbf{q}_{\rm r}'' \, dV \f$
9952+
!> Q_DOT(4) = \f$ \int \mathbf{u} \rho h_{\rm s} \cdot \, d\mathbf{S} \f$
9953+
!> Q_DOT(5) = \f$ \int k \nabla T \cdot d\mathbf{S} \f$
9954+
!> Q_DOT(6) = \f$ \int \sum_\alpha h_{{\rm s},\alpha} \rho D_\alpha \nabla Z_\alpha \cdot d\mathbf{S} \f$
9955+
!> Q_DOT(7) = \f$ \int dp/dt \, dV \f$
9956+
!> Q_DOT(8) = \f$ \sum \dot{q}_{\rm p} \f$
9957+
!> Q_DOT(9) = \f$ \int d(\rho h_{\rm s})/dt \, dV \f$
99629958

99639959
SUBROUTINE UPDATE_HRR(DT,NM)
99649960

@@ -9989,22 +9985,22 @@ SUBROUTINE UPDATE_HRR(DT,NM)
99899985
IF (TWO_D) VC = VC/DY(J)
99909986
IF (CYLINDRICAL) VC = VC*2._EB*PI
99919987

9992-
Q_DOT(1,NM) = Q_DOT(1,NM) + Q(I,J,K)*VC
9993-
Q_DOT(3,NM) = Q_DOT(3,NM) + QR(I,J,K)*VC
9994-
Q_DOT(7,NM) = Q_DOT(7,NM) + 0.5_EB*(D_PBAR_DT_S(PRESSURE_ZONE(I,J,K))+D_PBAR_DT(PRESSURE_ZONE(I,J,K)))*VC
9988+
Q_DOT(1) = Q_DOT(1) + Q(I,J,K)*VC
9989+
Q_DOT(3) = Q_DOT(3) + QR(I,J,K)*VC
9990+
Q_DOT(7) = Q_DOT(7) + 0.5_EB*(D_PBAR_DT_S(PRESSURE_ZONE(I,J,K))+D_PBAR_DT(PRESSURE_ZONE(I,J,K)))*VC
99959991
ZZ_GET(1:N_TRACKED_SPECIES) = ZZ(I,J,K,1:N_TRACKED_SPECIES)
99969992
CALL GET_SENSIBLE_ENTHALPY(ZZ_GET,H_S,TMP(I,J,K))
99979993
ENTHALPY_SUM(NM) = ENTHALPY_SUM(NM) + RHO(I,J,K)*H_S*VC
99989994
ENDDO
99999995
ENDDO
100009996
ENDDO
100019997

10002-
IF (CC_IBM) CALL ADD_Q_DOT_CUTCELLS(NM,Q_DOT(1,NM),Q_DOT(3,NM),Q_DOT(7,NM),ENTHALPY_SUM(NM))
9998+
IF (CC_IBM) CALL ADD_Q_DOT_CUTCELLS(NM,Q_DOT(1),Q_DOT(3),Q_DOT(7),ENTHALPY_SUM(NM))
100039999

1000410000
IF (ICYC>0) THEN
10005-
Q_DOT(9,NM) = (ENTHALPY_SUM(NM)-ENTHALPY_SUM_OLD)/DT
10001+
Q_DOT(9) = Q_DOT(9) + (ENTHALPY_SUM(NM)-ENTHALPY_SUM_OLD)/DT
1000610002
ELSE
10007-
Q_DOT(9,NM) = 0._EB
10003+
Q_DOT(9) = 0._EB
1000810004
ENDIF
1000910005

1001010006
! Compute the surface integral of all Del Dot terms
@@ -10053,10 +10049,10 @@ SUBROUTINE UPDATE_HRR(DT,NM)
1005310049
AREA_F = B1%AREA
1005410050
IF (TWO_D) AREA_F = AREA_F/DY(BC%JJG)
1005510051
IF (CYLINDRICAL) AREA_F = AREA_F*2._EB*PI
10056-
Q_DOT(2,NM) = Q_DOT(2,NM) + B1%Q_DOT_O2_PP*AREA_F
10057-
Q_DOT(4,NM) = Q_DOT(4,NM) - U_N*B1%RHO_F*H_S*AREA_F
10058-
Q_DOT(5,NM) = Q_DOT(5,NM) - B1%Q_CON_F*AREA_F
10059-
Q_DOT(6,NM) = Q_DOT(6,NM) - H_S_J_ALPHA*AREA_F
10052+
Q_DOT(2) = Q_DOT(2) + B1%Q_DOT_O2_PP*AREA_F
10053+
Q_DOT(4) = Q_DOT(4) - U_N*B1%RHO_F*H_S*AREA_F
10054+
Q_DOT(5) = Q_DOT(5) - B1%Q_CON_F*AREA_F
10055+
Q_DOT(6) = Q_DOT(6) - H_S_J_ALPHA*AREA_F
1006010056
ENDDO WALL_LOOP
1006110057

1006210058
CFACE_LOOP : DO ICF=INTERNAL_CFACE_CELLS_LB+1,INTERNAL_CFACE_CELLS_LB+N_INTERNAL_CFACE_CELLS
@@ -10085,9 +10081,9 @@ SUBROUTINE UPDATE_HRR(DT,NM)
1008510081
AREA_F = B1%AREA
1008610082
IF (TWO_D) AREA_F = AREA_F/DY(BC%JJG)
1008710083
IF (CYLINDRICAL) AREA_F = AREA_F*2._EB*PI
10088-
Q_DOT(4,NM) = Q_DOT(4,NM) - U_N*B1%RHO_F*H_S*AREA_F
10089-
Q_DOT(5,NM) = Q_DOT(5,NM) - B1%Q_CON_F*AREA_F
10090-
Q_DOT(6,NM) = Q_DOT(6,NM) - H_S_J_ALPHA*AREA_F
10084+
Q_DOT(4) = Q_DOT(4) - U_N*B1%RHO_F*H_S*AREA_F
10085+
Q_DOT(5) = Q_DOT(5) - B1%Q_CON_F*AREA_F
10086+
Q_DOT(6) = Q_DOT(6) - H_S_J_ALPHA*AREA_F
1009110087

1009210088
ENDDO CFACE_LOOP
1009310089

@@ -10101,7 +10097,7 @@ SUBROUTINE UPDATE_HRR(DT,NM)
1010110097
AREA_F = B1%AREA
1010210098
IF (TWO_D) AREA_F = AREA_F/DY(BC%JJG)
1010310099
IF (CYLINDRICAL) AREA_F = AREA_F*2._EB*PI
10104-
Q_DOT(2,NM) = Q_DOT(2,NM) + LP%PWT*B1%Q_DOT_O2_PP*AREA_F
10100+
Q_DOT(2) = Q_DOT(2) + LP%PWT*B1%Q_DOT_O2_PP*AREA_F
1010510101
ENDDO PARTICLE_LOOP
1010610102
ENDIF
1010710103

@@ -10116,7 +10112,7 @@ SUBROUTINE UPDATE_HRR(DT,NM)
1011610112
IF (TWO_D) AREA_F = AREA_F/DY(BC%JJG)
1011710113
IF (CYLINDRICAL) AREA_F = AREA_F*2._EB*PI
1011810114
DO N=1,N_TRACKED_SPECIES
10119-
M_DOT(N,NM) = M_DOT(N,NM) + B1%M_DOT_G_PP_ADJUST(N)*AREA_F
10115+
M_DOT(N) = M_DOT(N) + B1%M_DOT_G_PP_ADJUST(N)*AREA_F
1012010116
ENDDO
1012110117
ENDDO WALL_LOOP2
1012210118

@@ -10129,12 +10125,12 @@ SUBROUTINE UPDATE_HRR(DT,NM)
1012910125
IF (TWO_D) AREA_F = AREA_F/DY(BC%JJG)
1013010126
IF (CYLINDRICAL) AREA_F = AREA_F*2._EB*PI
1013110127
DO N=1,N_TRACKED_SPECIES
10132-
M_DOT(N,NM) = M_DOT(N,NM) + B1%M_DOT_G_PP_ADJUST(N)*AREA_F*B1%AREA_ADJUST
10128+
M_DOT(N) = M_DOT(N) + B1%M_DOT_G_PP_ADJUST(N)*AREA_F*B1%AREA_ADJUST
1013310129
ENDDO
1013410130
ENDDO CFACE_LOOP_2
1013510131

10136-
Q_DOT_SUM(:,NM) = Q_DOT_SUM(:,NM) + DT*Q_DOT(:,NM)
10137-
M_DOT_SUM(:,NM) = M_DOT_SUM(:,NM) + DT*M_DOT(:,NM)
10132+
Q_DOT_SUM = Q_DOT_SUM + DT*Q_DOT
10133+
M_DOT_SUM = M_DOT_SUM + DT*M_DOT
1013810134

1013910135
END SUBROUTINE UPDATE_HRR
1014010136

@@ -10147,18 +10143,13 @@ SUBROUTINE DUMP_HRR(T,DT)
1014710143

1014810144
REAL(EB), INTENT(IN) :: T,DT
1014910145
REAL(FB) :: STIME
10150-
INTEGER :: NM,I,N_ZONE_TMP
10151-
REAL(EB) :: Q_DOT_TOTAL(N_Q_DOT),M_DOT_TOTAL(N_TRACKED_SPECIES)
10146+
INTEGER :: I,N_ZONE_TMP
1015210147
REAL(EB), DIMENSION(:), ALLOCATABLE :: P_ZONE_P
1015310148

1015410149
STIME = REAL(T_BEGIN + (T-T_BEGIN)*TIME_SHRINK_FACTOR,FB)
10155-
Q_DOT_TOTAL = 0._EB
10156-
M_DOT_TOTAL = 0._EB
1015710150

10158-
DO NM=1,NMESHES
10159-
Q_DOT_TOTAL(:) = Q_DOT_TOTAL(:) + Q_DOT_SUM(:,NM)/MAX(DT,T-T_LAST_DUMP_HRR)
10160-
M_DOT_TOTAL(:) = M_DOT_TOTAL(:) + M_DOT_SUM(:,NM)/MAX(DT,T-T_LAST_DUMP_HRR)
10161-
ENDDO
10151+
Q_DOT_SUM = Q_DOT_SUM/MAX(DT,T-T_LAST_DUMP_HRR)
10152+
M_DOT_SUM = M_DOT_SUM/MAX(DT,T-T_LAST_DUMP_HRR)
1016210153

1016310154
N_ZONE_TMP = 0
1016410155
IF (N_ZONE>0) THEN
@@ -10171,11 +10162,11 @@ SUBROUTINE DUMP_HRR(T,DT)
1017110162

1017210163
WRITE(TCFORM,'(A,I0,5A)') "(",N_Q_DOT+1+N_TRACKED_SPECIES+N_ZONE_TMP,"(",FMT_R,",','),",FMT_R,")"
1017310164
IF (N_ZONE_TMP>0) THEN
10174-
WRITE(LU_HRR,TCFORM) STIME,0.001_EB*Q_DOT_TOTAL(1:N_Q_DOT),0.001_EB*SUM(Q_DOT_TOTAL(1:N_Q_DOT-1)),&
10175-
M_DOT_TOTAL(1:N_TRACKED_SPECIES),(P_ZONE_P(I),I=1,N_ZONE_TMP)
10165+
WRITE(LU_HRR,TCFORM) STIME,0.001_EB*Q_DOT_SUM(1:N_Q_DOT),0.001_EB*SUM(Q_DOT_SUM(1:N_Q_DOT-1)),&
10166+
M_DOT_SUM(1:N_TRACKED_SPECIES),(P_ZONE_P(I),I=1,N_ZONE_TMP)
1017610167
ELSE
10177-
WRITE(LU_HRR,TCFORM) STIME,0.001_EB*Q_DOT_TOTAL(1:N_Q_DOT),0.001_EB*SUM(Q_DOT_TOTAL(1:N_Q_DOT-1)),&
10178-
M_DOT_TOTAL(1:N_TRACKED_SPECIES)
10168+
WRITE(LU_HRR,TCFORM) STIME,0.001_EB*Q_DOT_SUM(1:N_Q_DOT),0.001_EB*SUM(Q_DOT_SUM(1:N_Q_DOT-1)),&
10169+
M_DOT_SUM(1:N_TRACKED_SPECIES)
1017910170
ENDIF
1018010171

1018110172
IF (N_ZONE>0) DEALLOCATE(P_ZONE_P)
@@ -10234,7 +10225,7 @@ SUBROUTINE UPDATE_MASS(DT,NM)
1023410225
ENDDO
1023510226
ENDDO
1023610227

10237-
MASS_DT(:,NM) = MASS_DT(:,NM) + DT*MASS_INTEGRAL(:)
10228+
MASS_DT = MASS_DT + DT*MASS_INTEGRAL
1023810229

1023910230
END SUBROUTINE UPDATE_MASS
1024010231

@@ -10247,21 +10238,14 @@ SUBROUTINE DUMP_MASS(T,DT)
1024710238

1024810239
REAL(EB), INTENT(IN) :: T,DT
1024910240
REAL(FB) :: STIME
10250-
REAL(EB) :: MASS_TOTAL(0:N_SPECIES+N_TRACKED_SPECIES)
10251-
INTEGER :: NM,N,N_TOTAL_SPECIES
10241+
INTEGER :: N,N_TOTAL_SPECIES
1025210242

1025310243
IF (.NOT.MASS_FILE) RETURN
10254-
1025510244
STIME = REAL(T_BEGIN + (T-T_BEGIN)*TIME_SHRINK_FACTOR,FB)
10256-
MASS_TOTAL(:) = 0._EB
10257-
1025810245
N_TOTAL_SPECIES=N_SPECIES+N_TRACKED_SPECIES
10259-
DO NM=1,NMESHES
10260-
MASS_TOTAL(0:N_TOTAL_SPECIES) = MASS_TOTAL(0:N_TOTAL_SPECIES) + MASS_DT(0:N_TOTAL_SPECIES,NM)/MAX(DT,T-T_LAST_DUMP_MASS)
10261-
ENDDO
1026210246

1026310247
WRITE(TCFORM,'(A,I0,5A)') "(",N_TOTAL_SPECIES+1,"(",FMT_R,",','),",FMT_R,")"
10264-
WRITE(LU_MASS,TCFORM) STIME,(MASS_TOTAL(N),N=0,N_TOTAL_SPECIES)
10248+
WRITE(LU_MASS,TCFORM) STIME,(MASS_DT(N)/MAX(DT,T-T_LAST_DUMP_MASS),N=0,N_TOTAL_SPECIES)
1026510249

1026610250
END SUBROUTINE DUMP_MASS
1026710251

Source/init.f90

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2832,22 +2832,11 @@ SUBROUTINE INITIALIZE_GLOBAL_VARIABLES
28322832
ALLOCATE(ENTHALPY_SUM(NMESHES),STAT=IZERO)
28332833
CALL ChkMemErr('INIT','ENTHALPY_SUM',IZERO)
28342834
ENTHALPY_SUM = 0._EB
2835-
ALLOCATE(Q_DOT(N_Q_DOT,NMESHES),STAT=IZERO)
2836-
CALL ChkMemErr('INIT','Q_DOT',IZERO)
2837-
Q_DOT = 0._EB
2838-
ALLOCATE(Q_DOT_SUM(N_Q_DOT,NMESHES),STAT=IZERO)
2839-
CALL ChkMemErr('INIT','Q_DOT_SUM',IZERO)
2840-
Q_DOT_SUM = 0._EB
2841-
ALLOCATE(M_DOT(N_TRACKED_SPECIES,NMESHES),STAT=IZERO)
2842-
CALL ChkMemErr('INIT','M_DOT',IZERO)
2843-
M_DOT = 0._EB
2844-
ALLOCATE(M_DOT_SUM(N_TRACKED_SPECIES,NMESHES),STAT=IZERO)
2845-
CALL ChkMemErr('INIT','M_DOT_SUM',IZERO)
2846-
M_DOT_SUM=0._EB
2847-
2848-
ALLOCATE(MASS_DT(0:N_SPECIES+N_TRACKED_SPECIES,NMESHES),STAT=IZERO)
2849-
CALL ChkMemErr('INIT','MASS_DT',IZERO)
2850-
MASS_DT=0._EB
2835+
ALLOCATE(Q_DOT(N_Q_DOT),STAT=IZERO) ; CALL ChkMemErr('INIT','Q_DOT',IZERO) ; Q_DOT = 0._EB
2836+
ALLOCATE(Q_DOT_SUM(N_Q_DOT),STAT=IZERO) ; CALL ChkMemErr('INIT','Q_DOT_SUM',IZERO) ; Q_DOT_SUM = 0._EB
2837+
ALLOCATE(M_DOT(N_TRACKED_SPECIES),STAT=IZERO) ; CALL ChkMemErr('INIT','M_DOT',IZERO) ; M_DOT = 0._EB
2838+
ALLOCATE(M_DOT_SUM(N_TRACKED_SPECIES),STAT=IZERO) ; CALL ChkMemErr('INIT','M_DOT_SUM',IZERO) ; M_DOT_SUM=0._EB
2839+
ALLOCATE(MASS_DT(0:N_SPECIES+N_TRACKED_SPECIES),STAT=IZERO) ; CALL ChkMemErr('INIT','MASS_DT',IZERO) ; MASS_DT=0._EB
28512840

28522841
ALLOCATE(PRESSURE_ERROR_MAX(NMESHES),STAT=IZERO)
28532842
CALL ChkMemErr('INIT','PRESSURE_ERROR_MAX',IZERO)

0 commit comments

Comments
 (0)