Skip to content

FDS Source: Fix for vtkhdf offsets with multi mesh on single mpi process #14730

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
marcosvanella merged 6 commits into from
Jun 4, 2025
Merged

FDS Source: Fix for vtkhdf offsets with multi mesh on single mpi process #14730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a9b36c8
FDS Source: fix for closing files during vtk part write
johodges Jun 4, 2025
4c09d8b
FDS Source: move workingdir call to rank 0 to prevent race condition
johodges Jun 4, 2025
388ff9c
FDS Source: Add verbose printout for vtk
johodges Jun 4, 2025
6c486fa
Merge branch 'master' into FireX_rebase
johodges Jun 4, 2025
0d4f001
Merge remote-tracking branch 'upstream/FireX' into FireX_rebase
johodges Jun 4, 2025
08e3817
FDS Source: fix for vtk offsets with multi mesh on one mpi process
johodges Jun 4, 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
3 changes: 0 additions & 3 deletions Source/dump.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4739,9 +4739,6 @@ SUBROUTINE DUMP_PART_VTKHDF(T,NM,IFRMT,FAKEWRITE)
CALL CLOSE_PART_VTKHDF(FILE_ID, GROUP_ID1,GROUP_ID2,GROUP_ID3,GROUP_ID4)
ENDDO LAGRANGIAN_PARTICLE_CLASS_LOOP

CLOSE(LU_PART(NM))
CLOSE(LU_PART(NM+NMESHES))

END SUBROUTINE DUMP_PART_VTKHDF
#endif

Expand Down
3 changes: 2 additions & 1 deletion Source/main.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,12 +576,14 @@ PROGRAM FDS
#ifdef WITH_HDF5
CALL WRITE_VTKHDF_GEOM_FILE
#endif
IF (MY_RANK==0 .AND. VERBOSE) CALL VERBOSE_PRINTOUT('Completed VTK Geometry initialization')
ENDIF

! Make an initial dump of ambient values
IF (.NOT.RESTART) THEN
#ifdef WITH_HDF5
IF ((VTK_HDF).AND.(WRITE_VTK)) CALL INITIALIZE_VTKHDF_FILES(T,LOWER_MESH_INDEX)
IF (MY_RANK==0 .AND. VERBOSE) CALL VERBOSE_PRINTOUT('Completed VTK File initialization')
CALL MPI_BARRIER(MPI_COMM_WORLD,IERR) ! Force all processes to sync up before dumping buffers
#endif
WROTE_SL3D = .FALSE.
Expand Down Expand Up @@ -1096,7 +1098,6 @@ PROGRAM FDS
ENDDO
ENDIF
#endif

! Dump outputs such as HRR, DEVC, etc.

CALL DUMP_GLOBAL_OUTPUTS
Expand Down
6 changes: 3 additions & 3 deletions Source/read.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2622,12 +2622,12 @@ SUBROUTINE READ_DUMP
ENDIF


IF (MY_RANK==0) THEN
#ifdef _WIN32
CALL EXECUTE_COMMAND_LINE('cd > workingdir.txt')
CALL EXECUTE_COMMAND_LINE('cd > workingdir.txt')
#else
CALL EXECUTE_COMMAND_LINE('pwd > workingdir.txt')
CALL EXECUTE_COMMAND_LINE('pwd > workingdir.txt')
#endif
IF (MY_RANK==0) THEN
OPEN(LU_WDIR, FILE="workingdir.txt", STATUS="OLD", ACTION="READ")
READ(LU_WDIR, '(A)') WORKING_DIR
CLOSE(LU_WDIR)
Expand Down
5 changes: 5 additions & 0 deletions Source/vtkf.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1959,6 +1959,7 @@ SUBROUTINE WRITE_VTKHDF_GEOM_FILE()
DEALLOCATE(VERTICES)
DEALLOCATE(COLORS)
ENDDO PATCH_LOOP2
NOFFSETS_ACCUM = NOFFSETS_ACCUM + 1

! Write connectivity data to file
START1 = INT(NCONN_START,HSIZE_T)
Expand Down Expand Up @@ -1991,6 +1992,8 @@ SUBROUTINE WRITE_VTKHDF_GEOM_FILE()
DEALLOCATE(ALL_VTKC_TYPE)
DEALLOCATE(ALL_COLORS)
N_WRITTEN = N_WRITTEN + 1
ELSE
NOFFSETS_ACCUM = NOFFSETS_ACCUM + 1
ENDIF
! Build GEOM patch geometry
IF ((MESHES(NM)%N_INTERNAL_CFACE_CELLS>0).AND.(.TRUE.)) THEN
Expand Down Expand Up @@ -2062,6 +2065,8 @@ SUBROUTINE WRITE_VTKHDF_GEOM_FILE()
CALL DEALLOCATE_VTK_GAS_PHASE_GEOMETRY(X_PTS,Y_PTS,Z_PTS,OFFSETS,VTKC_TYPE,CONNECT)
N_WRITTEN = N_WRITTEN + 1
ENDIF
ELSE
NOFFSETS_ACCUM = NOFFSETS_ACCUM + 1
ENDIF
ENDDO MESH_LOOP_HDF

Expand Down
Loading