Merge branch 'paraview' into FireX

marcosvanella · Jan 17, 2024 · 844261c · 844261c
2 parents 7ce4be8 + 30e4ee9
commit 844261c
Show file tree

Hide file tree

Showing 6 changed files with 464 additions and 323 deletions.
diff --git a/Build/makefile b/Build/makefile
@@ -169,7 +169,7 @@ setup_win:
 	$(FCOMPL) -c $(FFLAGS) $<
 .f90.obj:
 	$(FCOMPL) -c $(FFLAGS) $<
-	   
+
 # Files which have OpenMP compiler directives are compiled using the FOPENMPFLAG and can be enabled/disabled on a per-file basis.
 
 divg.o: FFLAGS += $(FOPENMPFLAGS)
@@ -263,7 +263,7 @@ impi_intel_win_openmp_db : setup_win $(objwin_mpi)
 
 # Linux Intel Fortran Compiler and Intel MPI
 
-impi_intel_linux : FFLAGS = -m64 -fc=$(I_IFORT) -O2 -ipo -no-wrap-margin $(GITINFO) $(INTELMPI_COMPINFO) $(FFLAGSMKL_INTEL) -DUSE_IFPORT
+impi_intel_linux : FFLAGS = -m64 -fc=$(I_IFORT) -O2 -no-wrap-margin $(GITINFO) $(INTELMPI_COMPINFO) $(FFLAGSMKL_INTEL) -DUSE_IFPORT
 impi_intel_linux : LFLAGSMKL = $(LFLAGSMKL_INTEL)
 impi_intel_linux : FCOMPL = mpiifort
 impi_intel_linux : obj = fds_impi_intel_linux
@@ -368,14 +368,17 @@ ompi_gnu_linux : LFLAGSMKL = $(LFLAGSMKL_GNU_OPENMPI) $(LFLAGS_PETSC)
 ompi_gnu_linux : FCOMPL = mpifort
 ompi_gnu_linux : FOPENMPFLAGS = -fopenmp
 ompi_gnu_linux : obj = fds_ompi_gnu_linux
+ompi_gnu_linux : FFLAGS += -Wno-maybe-uninitialized -Wno-uninitialized -Wno-unused-function
 ompi_gnu_linux : setup $(obj_mpi)
 	$(FCOMPL) $(FFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
+# Add ignores for vtk library
 
 ompi_gnu_linux_db : FFLAGS = -m64 -O0 -std=f2018 -ggdb -Wall -Wunused-parameter -Wcharacter-truncation -Wno-target-lifetime -fcheck=all -fbacktrace -ffpe-trap=invalid,zero,overflow -frecursive -ffpe-summary=none -fall-intrinsics -fbounds-check $(GITINFOGNU) $(GNU_COMPINFO) $(FFLAGSMKL_GNU_OPENMPI) $(GFORTRAN_OPTIONS) $(FFLAGS_PETSC)
 ompi_gnu_linux_db : LFLAGSMKL = $(LFLAGSMKL_GNU_OPENMPI) $(LFLAGS_PETSC)
 ompi_gnu_linux_db : FCOMPL = mpifort
 ompi_gnu_linux_db : FOPENMPFLAGS = -fopenmp
 ompi_gnu_linux_db : obj = fds_ompi_gnu_linux_db
+ompi_gnu_linux_db : FFLAGS += -Wno-maybe-uninitialized -Wno-uninitialized -Wno-unused-function
 ompi_gnu_linux_db : setup $(obj_mpi)
 	$(FCOMPL) $(FFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
 
@@ -384,6 +387,7 @@ ompi_gnu_osx : LFLAGSMKL = $(LFLAGSMKL_GNU_CUSTOM)
 ompi_gnu_osx : FCOMPL = mpifort
 ompi_gnu_osx : FOPENMPFLAGS =
 ompi_gnu_osx : obj = fds_ompi_gnu_osx
+ompi_gnu_osx : FFLAGS += -Wno-maybe-uninitialized -Wno-uninitialized -Wno-unused-function
 ompi_gnu_osx : setup $(obj_mpi)
 	$(FCOMPL) $(FFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
 
@@ -392,6 +396,7 @@ ompi_gnu_osx_db : LFLAGSMKL = $(LFLAGSMKL_GNU_CUSTOM) $(LFLAGS_PETSC)
 ompi_gnu_osx_db : FCOMPL = mpifort
 ompi_gnu_osx_db : FOPENMPFLAGS =
 ompi_gnu_osx_db : obj = fds_ompi_gnu_osx_db
+ompi_gnu_osx_db : FFLAGS += -Wno-maybe-uninitialized -Wno-uninitialized -Wno-unused-function
 ompi_gnu_osx_db : setup $(obj_mpi)
 	$(FCOMPL) $(FFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
 

diff --git a/Source/dump.f90 b/Source/dump.f90
@@ -1468,7 +1468,7 @@ SUBROUTINE WRITE_STL_FILE
    INTEGER(IB8) :: COLOR(3), ONE
    INTEGER(IB32) :: NUM_FACETS
 
-   COLOR = (/0,0,0/)
+   COLOR = INT((/0,0,0/),IB8)
    ONE   = 1
 
    TITLE = FN_STL
@@ -1509,7 +1509,7 @@ SUBROUTINE WRITE_STL_FILE
       M => MESHES(NM)
       DO N=1,M%N_OBST
          OB=>M%OBSTRUCTION(N)
-         XB(:) = (/OB%X1,OB%X2,OB%Y1,OB%Y2,OB%Z1,OB%Z2/)
+         XB(:) = REAL((/OB%X1,OB%X2,OB%Y1,OB%Y2,OB%Z1,OB%Z2/),FB)
          !COLOR(:) = OB%SURF_INDEX(-1),OB%SURF_INDEX(1),OB%SURF_INDEX(-2),&
          !OB%SURF_INDEX(2),OB%SURF_INDEX(-3),OB%SURF_INDEX(3)
          VERTICES = GET_VERTICES(XB)
@@ -1527,9 +1527,9 @@ SUBROUTINE WRITE_STL_FILE
       G=>GEOMETRY(I)
       DO N=1,G%N_FACES
          GEOM_VERTICES_IDS(1,:) = G%FACES((N-1)*3+1:(N-1)*3 + 3)
-         GEOM_VERTICES(1,:) = G%VERTS((GEOM_VERTICES_IDS(1,1)-1)*3+1:(GEOM_VERTICES_IDS(1,1)-1)*3+3)
-         GEOM_VERTICES(2,:) = G%VERTS((GEOM_VERTICES_IDS(1,2)-1)*3+1:(GEOM_VERTICES_IDS(1,2)-1)*3+3)
-         GEOM_VERTICES(3,:) = G%VERTS((GEOM_VERTICES_IDS(1,3)-1)*3+1:(GEOM_VERTICES_IDS(1,3)-1)*3+3)
+         GEOM_VERTICES(1,:) = REAL(G%VERTS((GEOM_VERTICES_IDS(1,1)-1)*3+1:(GEOM_VERTICES_IDS(1,1)-1)*3+3),FB)
+         GEOM_VERTICES(2,:) = REAL(G%VERTS((GEOM_VERTICES_IDS(1,2)-1)*3+1:(GEOM_VERTICES_IDS(1,2)-1)*3+3),FB)
+         GEOM_VERTICES(3,:) = REAL(G%VERTS((GEOM_VERTICES_IDS(1,3)-1)*3+1:(GEOM_VERTICES_IDS(1,3)-1)*3+3),FB)
          CALL WRITE_FACET(LU_STL, GEOM_VERTICES(1,:), GEOM_VERTICES(2,:), GEOM_VERTICES(3,:))
       ENDDO
    ENDDO
@@ -1564,26 +1564,27 @@ END SUBROUTINE CHECK
    SUBROUTINE WRITE_FACET(U, VERTEX1, VERTEX2, VERTEX3)
       IMPLICIT NONE
       INTEGER, INTENT(IN) :: U
-      REAL(FB), DIMENSION(3), INTENT(IN) :: VERTEX1, VERTEX2, VERTEX3
+      REAL(FB), DIMENSION(:), INTENT(IN) :: VERTEX1, VERTEX2, VERTEX3
       REAL(FB), DIMENSION(3) :: NORMAL
       INTEGER(IB16), PARAMETER :: ZERO = 0
+      INTEGER :: I
 
       NORMAL = CALC_NORMAL(VERTEX1, VERTEX2, VERTEX3)
       WRITE(U, IOSTAT=IOS) NORMAL
       CALL CHECK(IOS, 'WRITE NORMAL')
-      WRITE(U, IOSTAT=IOS) VERTEX1
+      WRITE(U, IOSTAT=IOS) (VERTEX1(I),I=1,3)
       CALL CHECK(IOS, 'WRITE VERTEX')
-      WRITE(U, IOSTAT=IOS) VERTEX2
+      WRITE(U, IOSTAT=IOS) (VERTEX2(I),I=1,3)
       CALL CHECK(IOS, 'WRITE VERTEX')
-      WRITE(U, IOSTAT=IOS) VERTEX3
+      WRITE(U, IOSTAT=IOS) (VERTEX3(I),I=1,3)
       CALL CHECK(IOS, 'WRITE VERTEX')
       WRITE(U, IOSTAT=IOS) ZERO
       CALL CHECK(IOS, 'WRITE ZERO')
    END SUBROUTINE WRITE_FACET
 
    FUNCTION CALC_NORMAL(VEC1, VEC2, VEC3)
       IMPLICIT NONE
-      REAL(FB), DIMENSION(3), INTENT(IN) :: VEC1, VEC2, VEC3
+      REAL(FB), DIMENSION(:), INTENT(IN) :: VEC1, VEC2, VEC3
       REAL(FB), DIMENSION(3) :: CALC_NORMAL
       REAL(FB), DIMENSION(3) :: D1, D2
       D1 = VEC2 - VEC1
@@ -4057,7 +4058,7 @@ SUBROUTINE DUMP_PART(T,NM,IFRMT)
 INTEGER, PARAMETER :: PART_BOUNDFILE_VERSION=1
 TYPE (BOUNDARY_COORD_TYPE), POINTER :: BC
 TYPE(VTK_FILE)     :: A_VTK_FILE                    ! A VTK file.
-INTEGER(IB8)  :: VTK_ERROR=0_IB8                    !< IO Error status.
+INTEGER  :: VTK_ERROR                    !< IO Error status.
 
 CALL POINT_TO_MESH(NM)
 
@@ -4353,7 +4354,7 @@ SUBROUTINE DUMP_SMOKE3D(T,DT,NM,IFRMT)
 TYPE(SMOKE3D_TYPE), POINTER :: S3
 LOGICAL :: SMV_OUT,VTK_OUT
 TYPE(VTK_FILE)     :: A_VTK_FILE                    ! A VTK file.
-INTEGER(IB8)  :: VTK_ERROR=0_IB8                    !< IO Error status.
+INTEGER  :: VTK_ERROR                    !< IO Error status.
 REAL(FB) :: FACTOR,VAL_FDS,VAL_SMV,TEMP_MIN
 
 CALL POINT_TO_MESH(NM)
@@ -4471,7 +4472,7 @@ SUBROUTINE DUMP_SMOKE3D(T,DT,NM,IFRMT)
             VAL_FDS = MAX(0.0_FB,QQ_PACK(I))
             VAL_SMV = 254*(1.0_FB-EXP(FACTOR*VAL_FDS))-127
             !QQ_PACK_INT(I) = VAL_SMV !NINT(VAL_SMV)
-            QQ_PACK_INT(I) = NINT(VAL_SMV)
+            QQ_PACK_INT(I) = INT(NINT(VAL_SMV),IB8)
          ENDDO
 
       ELSEIF (S3%DISPLAY_TYPE=='FIRE') THEN
@@ -4480,7 +4481,7 @@ SUBROUTINE DUMP_SMOKE3D(T,DT,NM,IFRMT)
             VAL_FDS = MIN(HRRPUV_MAX_SMV,MAX(0._FB,QQ_PACK(I)))
             VAL_SMV = 254*(VAL_FDS/HRRPUV_MAX_SMV)-127
             !QQ_PACK_INT(I) = VAL_SMV !NINT(VAL_SMV)
-            QQ_PACK_INT(I) = NINT(VAL_SMV)
+            QQ_PACK_INT(I) = INT(NINT(VAL_SMV),IB8)
          ENDDO
 
       ELSEIF (S3%DISPLAY_TYPE=='TEMPERATURE') THEN
@@ -4490,24 +4491,17 @@ SUBROUTINE DUMP_SMOKE3D(T,DT,NM,IFRMT)
             VAL_FDS = MIN(TEMP_MAX_SMV,MAX(TEMP_MIN,QQ_PACK(I)))
             VAL_SMV = 254*((VAL_FDS-TEMP_MIN)/(TEMP_MAX_SMV-TEMP_MIN))-127
             !QQ_PACK_INT(I) = VAL_SMV
-            QQ_PACK_INT(I) = NINT(VAL_SMV)
+            QQ_PACK_INT(I) = INT(NINT(VAL_SMV),IB8)
          ENDDO
 
       ELSE
          DO I=1,NP
             !QQ_PACK_INT(I) = QQ_PACK(I)
-            QQ_PACK_INT(I) = NINT(QQ_PACK(I))
+            QQ_PACK_INT(I) = INT(NINT(QQ_PACK(I)),IB8)
          ENDDO
       ENDIF
 
       VTK_ERROR = A_VTK_FILE%XML_WRITER%W_DATA(DATA_NAME=S3%SMOKEVIEW_LABEL(1:30), X=QQ_PACK_INT)
-      !IF (VTK_BINARY) THEN
-      !   CALL WRITE_VTK_SLICE_DATA(LU_SMOKE3D_VTK(NM), FN_SMOKE3D_VTK(NM),&
-      !                             QQ_PACK, S3%SMOKEVIEW_LABEL(1:30), 'ascii')
-      !ELSE
-      !   CALL WRITE_VTK_SLICE_DATA(LU_SMOKE3D_VTK(NM), FN_SMOKE3D_VTK(NM),&
-      !                             QQ_PACK, S3%SMOKEVIEW_LABEL(1:30), 'ascii')
-      !ENDIF
       DEALLOCATE(QQ_PACK_INT)
    ENDIF
    DEALLOCATE(QQ_PACK)
@@ -6003,7 +5997,7 @@ SUBROUTINE DUMP_SLCF(T,DT,NM,IFRMT)
 REAL(FB) :: UVEL, VVEL, WVEL, VEL, PLOT3D_MIN, PLOT3D_MAX
 INTEGER :: IERROR
 TYPE(VTK_FILE)     :: A_VTK_FILE                    ! A VTK file.
-INTEGER(IB8)  :: VTK_ERROR=0_IB8                    !< IO Error status.
+INTEGER  :: VTK_ERROR                    !< IO Error status.
 LOGICAL :: VTK_INITIALIZED
 
 ! Return if there are no slices to process and this is not a Plot3D dump
@@ -6464,12 +6458,12 @@ SUBROUTINE DUMP_SLCF(T,DT,NM,IFRMT)
       ITM1 = 0
    ENDIF
 
-   UNIQUE_LOOPA: DO II=1,N_UNIQUE_SLCF
-      IF (EMPTY_UNIQUE_SLICE(II)) CYCLE UNIQUE_LOOPA
+   UNIQUE_LOOPA: DO II=1,MESHES(1)%N_UNIQUE_SLCF
+      IF (MESHES(NM)%EMPTY_UNIQUE_SLICE(II)) CYCLE UNIQUE_LOOPA
       VTK_INITIALIZED=.FALSE.
       QUANTITY_LOOPA: DO IQ=1,NQT
          SL => SLICE(IQ)
-         IF (SL%SLCF_NAME.NE.UNIQUE_SLICE_NAMES(II)) CYCLE QUANTITY_LOOPA
+         IF (SL%SLCF_NAME.NE.MESHES(1)%UNIQUE_SLICE_NAMES(II)) CYCLE QUANTITY_LOOPA
          IND  = SL%INDEX
          IND2 = SL%INDEX2
          Y_INDEX = SL%Y_INDEX
@@ -6491,9 +6485,8 @@ SUBROUTINE DUMP_SLCF(T,DT,NM,IFRMT)
          IF(.NOT.CC_CELL_CENTERED .AND. TRIM(SL%SLICETYPE)/='STRUCTURED') CC_INTERP2FACES = .TRUE.
 
          IF (.NOT.VTK_INITIALIZED) THEN
-            WRITE(FN_SL3D_VTK(II,NM),'(A,A,A,A,I0,A,I8.8,I2.2,A)') TRIM(CHID),'_',TRIM(UNIQUE_SLICE_NAMES(II)),&
+            WRITE(FN_SL3D_VTK(II,NM),'(A,A,A,A,I0,A,I8.8,I2.2,A)') TRIM(CHID),'_',TRIM(MESHES(1)%UNIQUE_SLICE_NAMES(II)),&
                                      '_',NM,'_',ITM,ITM1,'.vtu'
-            !WRITE(FN_SL3D_VTK(II,NM),'(A,A,A,I0,A,I0,A,I8.8,I2.2,A)') "",TRIM(CHID),'_SL3D_',II,'_',NM,'_',ITM,ITM1,'.vtu'
             IF (VTK_BINARY) THEN
                VTK_ERROR = A_VTK_FILE%INITIALIZE(FORMAT='raw', FILENAME=FN_SL3D_VTK(II,NM), MESH_TOPOLOGY='UnstructuredGrid')
             ELSE
@@ -10945,7 +10938,7 @@ SUBROUTINE DUMP_BNDF(T,DT,NM,IFRMT)
 INTEGER(IB32), ALLOCATABLE, DIMENSION(:) :: CONNECT, OFFSETS
 INTEGER(IB8), ALLOCATABLE, DIMENSION(:) :: VTKC_TYPE
 TYPE(VTK_FILE)     :: A_VTK_FILE                    ! A VTK file.
-INTEGER(IB8)  :: VTK_ERROR=0_IB8                    !< IO Error status.
+INTEGER  :: VTK_ERROR                    !< IO Error status.
 
 IF (MESHES(NM)%N_PATCH==0 .AND. MESHES(NM)%N_INTERNAL_CFACE_CELLS==0) RETURN
 
@@ -11369,8 +11362,8 @@ SUBROUTINE PACK_VTK_GEOM(NM,CELL_CENTERED,BF,VALS)
       TYPE(BOUNDARY_FILE_TYPE), POINTER, INTENT(IN) :: BF
       REAL(FB), ALLOCATABLE, DIMENSION(:) :: VALS, VERTS, VERT_VALS
       INTEGER, ALLOCATABLE, DIMENSION(:) :: FACES, VERT_UNIQUE
-      INTEGER :: I, IND
-      INTEGER :: NPOINTS, NCELLS, NFACES, NVERTS, NVALS
+      INTEGER :: IND
+      INTEGER :: NFACES, NVERTS, NVALS
 
       IND  = ABS(BF%INDEX)
       CALL POINT_TO_MESH(NM)

diff --git a/Source/func.f90 b/Source/func.f90
@@ -2299,11 +2299,15 @@ SUBROUTINE EXCHANGE_GEOMETRY_INFO
                             COUNTS,DISPLS
 #ifdef WITHOUT_MPIF08
 USE MPI
+INTEGER :: MPISTATUS(MPI_STATUS_SIZE)
 #else
 USE MPI_F08
+TYPE (MPI_STATUS) :: MPISTATUS
 #endif
-INTEGER :: NM,NOM,IERR,SNODE,N
+INTEGER :: NM,NOM,IERR,SNODE,N,IPROC,I
 TYPE(MESH_TYPE), POINTER ::  M,M4
+LOGICAL, ALLOCATABLE, DIMENSION(:) :: EMPTY_UNIQUE_SLICE
+CHARACTER(200), ALLOCATABLE, DIMENSION(:) :: ALL_SLICE_QUANTITIES
 
 IF (N_MPI_PROCESSES==1) RETURN
 
@@ -2351,6 +2355,45 @@ SUBROUTINE EXCHANGE_GEOMETRY_INFO
    CALL PACK_CELL(NM,.TRUE.)
 ENDDO
 
+! Copy SLICE components to mesh 1 for VTK output
+IF (MY_RANK==0) THEN
+   ALLOCATE(EMPTY_UNIQUE_SLICE(MESHES(1)%N_UNIQUE_SLCF))
+   ALLOCATE(ALL_SLICE_QUANTITIES(MESHES(1)%N_SLCF_O*3))
+ENDIF
+! Whether or not a slice is contained within the mesh
+DO NM=1,NMESHES
+   DO IPROC=1,N_MPI_PROCESSES-1
+      IF (MY_RANK==IPROC.AND.IPROC==PROCESS(NM)) THEN
+         IF (MY_RANK/=0) THEN
+            CALL MPI_SEND(MESHES(NM)%EMPTY_UNIQUE_SLICE,MESHES(1)%N_UNIQUE_SLCF,MPI_LOGICAL,0,PROCESS(NM),MPI_COMM_WORLD,IERR)
+         ENDIF
+      ELSEIF (MY_RANK==0) THEN
+         IF (PROCESS(NM)==0) CYCLE
+         IF (PROCESS(NM)/=IPROC) CYCLE
+         CALL MPI_RECV(EMPTY_UNIQUE_SLICE(1),MESHES(1)%N_UNIQUE_SLCF,MPI_LOGICAL,IPROC,IPROC,MPI_COMM_WORLD,MPISTATUS,IERR)
+         MESHES(NM)%EMPTY_UNIQUE_SLICE = EMPTY_UNIQUE_SLICE
+      ENDIF
+   ENDDO
+ENDDO
+! Slice quantities
+DO NM=1,NMESHES
+   DO IPROC=1,N_MPI_PROCESSES-1
+      IF (MY_RANK==IPROC.AND.IPROC==PROCESS(NM)) THEN
+         IF (MY_RANK/=0) THEN
+            CALL MPI_SEND(MESHES(1)%ALL_SLICE_QUANTITIES,MESHES(1)%N_SLCF_O*200*3,MPI_CHARACTER,0,PROCESS(NM),MPI_COMM_WORLD,IERR)
+         ENDIF
+      ELSEIF (MY_RANK==0) THEN
+         IF (PROCESS(NM)==0) CYCLE
+         IF (PROCESS(NM)/=IPROC) CYCLE
+         CALL MPI_RECV(ALL_SLICE_QUANTITIES(1),MESHES(1)%N_SLCF_O*200*3,MPI_CHARACTER,IPROC,IPROC,MPI_COMM_WORLD,MPISTATUS,IERR)
+         QUANTITY_LOOP: DO I=1,MESHES(1)%N_SLCF_O*3
+            IF (ALL_SLICE_QUANTITIES(I)=="") CYCLE QUANTITY_LOOP
+            MESHES(1)%ALL_SLICE_QUANTITIES(I) = ALL_SLICE_QUANTITIES(I)
+         ENDDO QUANTITY_LOOP
+      ENDIF
+   ENDDO
+ENDDO
+
 END SUBROUTINE EXCHANGE_GEOMETRY_INFO
 
 

diff --git a/Source/mesh.f90 b/Source/mesh.f90
@@ -297,9 +297,10 @@ MODULE MESH_VARIABLES
 
    INTEGER :: N_SLCF=0
    TYPE(SLICE_TYPE), ALLOCATABLE, DIMENSION(:) :: SLICE
+   INTEGER :: N_SLCF_O=0
 
    INTEGER :: N_UNIQUE_SLCF=0
-   CHARACTER(200), ALLOCATABLE, DIMENSION(:) :: UNIQUE_SLICE_NAMES
+   CHARACTER(200), ALLOCATABLE, DIMENSION(:) :: UNIQUE_SLICE_NAMES, ALL_SLICE_NAMES, ALL_SLICE_QUANTITIES
    LOGICAL, ALLOCATABLE, DIMENSION(:) :: EMPTY_UNIQUE_SLICE
 
    INTEGER :: N_RADF=0
@@ -441,7 +442,7 @@ MODULE MESH_POINTERS
 INTEGER, POINTER, DIMENSION(:) :: BOUNDARY_COORD_OCCUPANCY,BOUNDARY_ONE_D_OCCUPANCY,BOUNDARY_THR_D_OCCUPANCY, &
                                   BOUNDARY_PROP1_OCCUPANCY,BOUNDARY_PROP2_OCCUPANCY,BOUNDARY_RADIA_OCCUPANCY,PARTICLE_LAST
 INTEGER, POINTER :: NLP,NLPDIM,PARTICLE_TAG
-INTEGER, POINTER :: N_SLCF
+INTEGER, POINTER :: N_SLCF, N_SLCF_O
 TYPE(SLICE_TYPE), POINTER, DIMENSION(:) :: SLICE
 INTEGER, POINTER :: N_RADF
 TYPE(RAD_FILE_TYPE), POINTER, DIMENSION(:) :: RAD_FILE
@@ -459,7 +460,7 @@ MODULE MESH_POINTERS
                                      ROS_HEAD,ROS_FLANK,WIND_EXP, &
                                      SR_X_LS,SR_Y_LS,U_LS,V_LS,Z_LS,DZTDX,DZTDY,MAG_ZT, &
                                      PHI_WS,UMF,THETA_ELPS,PHI_S,PHI_S_X,PHI_S_Y,PHI_W,LS_WORK1,LS_WORK2
-CHARACTER(200), POINTER, DIMENSION(:) :: UNIQUE_SLICE_NAMES
+CHARACTER(200), POINTER, DIMENSION(:) :: UNIQUE_SLICE_NAMES,ALL_SLICE_NAMES,ALL_SLICE_QUANTITIES
 LOGICAL, POINTER, DIMENSION(:) :: EMPTY_UNIQUE_SLICE
 INTEGER, POINTER :: N_UNIQUE_SLCF
 
@@ -810,6 +811,7 @@ SUBROUTINE POINT_TO_MESH(NM)
 PARTICLE_TAG=>M%PARTICLE_TAG
 PARTICLE_LAST=>M%PARTICLE_LAST
 N_SLCF=>M%N_SLCF
+N_SLCF_O=>M%N_SLCF_O
 SLICE=>M%SLICE
 N_RADF=>M%N_RADF
 RAD_FILE=>M%RAD_FILE
@@ -857,6 +859,8 @@ SUBROUTINE POINT_TO_MESH(NM)
 N_UNIQUE_SLCF => M%N_UNIQUE_SLCF
 UNIQUE_SLICE_NAMES => M%UNIQUE_SLICE_NAMES
 EMPTY_UNIQUE_SLICE => M%EMPTY_UNIQUE_SLICE
+ALL_SLICE_NAMES => M%ALL_SLICE_NAMES
+ALL_SLICE_QUANTITIES => M%ALL_SLICE_QUANTITIES
 
 END SUBROUTINE POINT_TO_MESH