Changeset c28deba

Timestamp:

12/08/10 18:33:53 (2 years ago)

Author:

Oleg Batrashev <ogbash@…>

Branches:

master, external, fix-prolong, refactor, refactor-ext, refactor-subsolvers

Children:

4bce076, 6c6ce1a

Parents:

dd63f9f

git-author:

Oleg Batrashev <ogbash@…> (12/08/10 18:33:53)

git-committer:

Oleg Batrashev <ogbash@…> (12/08/10 18:33:53)

Message:

Compact mesh plotting code.

Location:

src

Files:

• datatypes/Mesh.F90 (modified) (4 diffs)
• main/main_drivers.F90 (modified) (1 diff)

src/datatypes/Mesh.F90

@@ -1505 +1505 @@
     ! Send/recv 'eptnmap'
     if (present(eptnmap)) then
+       call MPI_BCAST(M%nparts, 1, MPI_INTEGER, &
+            D_MASTER, MPI_COMM_WORLD, ierr)
+
        if (ismaster()) then
           do p = 1,numprocs-1
@@ -1514 +1517 @@
           call MPI_RECV(M%eptnmap, M%nell, MPI_INTEGER, &
                D_MASTER, D_TAG_MESH_EPTNMAP, MPI_COMM_WORLD, status, ierr)
+          M%parted = .true.
        end if
     end if
@@ -1643 +1647 @@
   !! Plotting routines
   !
+
+  !> Show a sequence of plots of the mesh.
+  subroutine Mesh_pl2D_mesh(Msh)
+    type(Mesh), intent(inout) :: Msh
+
+    call Mesh_pl2D_pointCloud(Msh,D_PLPLOT_INIT)
+    ! Plots mesh's dual graph
+    call Mesh_pl2D_plotGraphDual(Msh,D_PLPLOT_END)
+    ! Mesh & its Dual Graph
+    call Mesh_pl2D_plotMesh(Msh, D_PLPLOT_INIT)
+    call Mesh_pl2D_plotGraphDual(Msh, D_PLPLOT_END)
+  end subroutine Mesh_pl2D_mesh
+
+  !> Show plots of the mesh partitions.
+  subroutine Mesh_pl2D_partitions(Msh)
+    type(Mesh), intent(inout) :: Msh
+
+    ! Draw colored partitoined graph
+    call Mesh_pl2D_plotGraphParted(Msh)
+
+    ! Plot partitions of the mesh
+    ! NB: Check for multivariable case! TODO
+    call Mesh_pl2D_Partition(Msh)
+    ! Partition with Dual Graph upon it
+    call Mesh_pl2D_Partition(Msh, D_PLPLOT_INIT)
+    call Mesh_pl2D_plotGraphDual(Msh, D_PLPLOT_CONT)
+    call Mesh_pl2D_pointCloud(Msh,D_PLPLOT_END)
+  end subroutine Mesh_pl2D_partitions
+
   !------------------------------------------------
   !! Plot cloud field
@@ -2482 +2515 @@
        end do
 
-       if (M%nfrelt(e) == 1) then ! 1-node boundary element
+       if (M%nfrelt(e) == 0) then
+          cycle
+
+       else if (M%nfrelt(e) == 1) then ! 1-node boundary element
 
           ! Fake centre of 1-node element by simply assigning to

src/main/main_drivers.F90

@@ -149 +149 @@
     ! Partition mesh's dual graph
     if (ismaster()) then
-
-       !! Build dual graph (Graph object is a data field in Mesh class)
-       !call Mesh_buildGraphDual(Msh)
-
        if (sctls%plotting == D_PLOT_YES) then
-
-          call Mesh_pl2D_pointCloud(Msh,D_PLPLOT_INIT)
-          ! Plots mesh's dual graph
-          call Mesh_pl2D_plotGraphDual(Msh,D_PLPLOT_END)
-          ! Mesh & its Dual Graph
-          call Mesh_pl2D_plotMesh(Msh, D_PLPLOT_INIT)
-          call Mesh_pl2D_plotGraphDual(Msh, D_PLPLOT_END)
+          call Mesh_pl2D_mesh(Msh)
        end if
 
        ! Partition graph: D_PART_PMETIS, D_PART_KMETIS, D_PART_VKMETIS
        call Mesh_partitionDual(Msh, nparts, D_PART_VKMETIS, part_opts)
-
        if (sctls%plotting == D_PLOT_YES) then
-          ! Draw colored partitoined graph
-          call Mesh_pl2D_plotGraphParted(Msh)
-
-          ! Plot partitions of the mesh
-          ! NB: Check for multivariable case! TODO
-          call Mesh_pl2D_Partition(Msh)
-          ! Partition with Dual Graph upon it
-          call Mesh_pl2D_Partition(Msh, D_PLPLOT_INIT)
-          call Mesh_pl2D_plotGraphDual(Msh, D_PLPLOT_CONT)
-          call Mesh_pl2D_pointCloud(Msh,D_PLPLOT_END)
-       end if
-
-       ! Destroy previously created graph (purely to save memory)
-       ! (If it is not killed here or somewere else Mesh_Destroy()
-       !  will kill it any way)
-       !call Mesh_destroyGraph(Msh)
-    else ! SLAVES
-       ! Number of partions the mesh was partitioned into
-       Msh%nparts = nparts
-       Msh%parted = .true.
-    end if
+          call Mesh_pl2D_partitions(Msh)
+       end if
+    endif
 
     ! Distribute elements to partitons map among slaves