Skip to content

FDS Source: Issue #14362. Fix summing issue #14396

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
mcgratta merged 1 commit into from
Mar 19, 2025
Merged

FDS Source: Issue #14362. Fix summing issue #14396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions Source/dump.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10253,8 +10253,14 @@ SUBROUTINE UPDATE_HRR(DT,NM)
ENDDO
ENDDO CFACE_LOOP_2

Q_DOT_SUM = Q_DOT_SUM + DT*Q_DOT
M_DOT_SUM = M_DOT_SUM + DT*M_DOT
! Muliply the energy and mass rates (Q_DOT, M_DOT (W)) for this time step by the time step size, DT.
! For all the meshes belonging to the current MPI process, keep a running tally of the rates (Q_DOT_SUM, M_DOT_SUM (J)).
! When it is time for a dump to the CHID_hrr.csv file, sum up (i.e. MPI_ALLREDUCE) Q_DOT_SUM and M_DOT_SUM in main.f90.

IF (NM==UPPER_MESH_INDEX) THEN
Q_DOT_SUM = Q_DOT_SUM + DT*Q_DOT
M_DOT_SUM = M_DOT_SUM + DT*M_DOT
ENDIF

END SUBROUTINE UPDATE_HRR

Expand Down
11 changes: 8 additions & 3 deletions Source/main.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4079,9 +4079,14 @@ SUBROUTINE DUMP_GLOBAL_OUTPUTS
! Dump out HRR info into CHID_hrr.csv

IF (T>=HRR_CLOCK(HRR_COUNTER(1))) THEN
CALL MPI_ALLREDUCE(MPI_IN_PLACE,Q_DOT_SUM,N_Q_DOT,MPI_DOUBLE_PRECISION,MPI_SUM,MPI_COMM_WORLD,IERR)
CALL MPI_ALLREDUCE(MPI_IN_PLACE,M_DOT_SUM,N_TRACKED_SPECIES,MPI_DOUBLE_PRECISION,MPI_SUM,MPI_COMM_WORLD,IERR)
IF (MY_RANK==0) CALL DUMP_HRR(T,DT)
IF (MY_RANK==0) THEN
CALL MPI_REDUCE(MPI_IN_PLACE,Q_DOT_SUM,N_Q_DOT,MPI_DOUBLE_PRECISION,MPI_SUM,0,MPI_COMM_WORLD,IERR)
CALL MPI_REDUCE(MPI_IN_PLACE,M_DOT_SUM,N_TRACKED_SPECIES,MPI_DOUBLE_PRECISION,MPI_SUM,0,MPI_COMM_WORLD,IERR)
CALL DUMP_HRR(T,DT)
ELSE
CALL MPI_REDUCE(Q_DOT_SUM,Q_DOT_SUM,N_Q_DOT,MPI_DOUBLE_PRECISION,MPI_SUM,0,MPI_COMM_WORLD,IERR)
CALL MPI_REDUCE(M_DOT_SUM,M_DOT_SUM,N_TRACKED_SPECIES,MPI_DOUBLE_PRECISION,MPI_SUM,0,MPI_COMM_WORLD,IERR)
ENDIF
HRR_COUNTER(1) = HRR_COUNTER(1) + 1
Q_DOT_SUM = 0._EB
M_DOT_SUM = 0._EB
Expand Down