Merge pull request #14730 from johodges/FireX_rebase

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

Author: marcosvanella

Source/dump.f90

@@ -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
 

Source/main.f90

@@ -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.
@@ -1096,7 +1098,6 @@ PROGRAM FDS
       ENDDO
    ENDIF
 #endif
-
    ! Dump outputs such as HRR, DEVC, etc.
 
    CALL DUMP_GLOBAL_OUTPUTS

Source/read.f90

@@ -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)

Source/vtkf.f90

@@ -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)
@@ -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
@@ -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