Changeset 6c6ce1a

Timestamp:

12/09/10 14:41:58 (2 years ago)

Author:

Oleg Batrashev <ogbash@…>

Branches:

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

Children:

2eac950, 609702e

Parents:

c28deba (diff), 6ca9419 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Oleg Batrashev <ogbash@…> (12/09/10 14:41:58)

git-committer:

Oleg Batrashev <ogbash@…> (12/09/10 14:41:58)

Message:

Merge branch 'master' into refactor-ext

Files:

• src/datatypes/Mesh.F90 (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/ext/C/Makefile.am (moved) (moved from src/ext/Makefile.am) (1 diff)
• src/ext/C/doug_ext.f90 (moved) (moved from src/ext/doug_ext.f90)
• src/ext/C/doug_ext.h (moved) (moved from src/ext/doug_ext.h)
• src/ext/C/main_aggr.c (moved) (moved from src/ext/main_aggr.c)
• src/ext/C/main_cg.c (moved) (moved from src/ext/main_cg.c)
• src/ext/C/main_pcg1.c (moved) (moved from src/ext/main_pcg1.c)
• src/ext/C/ops.c (moved) (moved from src/ext/ops.c)
• src/ext/C/ops.h (moved) (moved from src/ext/ops.h)
• src/main/main_drivers.F90 (modified) (5 diffs)

src/datatypes/Mesh.F90

@@ -265 +265 @@
     if (associated(M%partnelems)) deallocate(M%partnelems)
     if (associated(M%nghbrs))    deallocate(M%nghbrs)
-    if (associated(M%lcoords)) deallocate(M%lcoords)
+    if (.NOT.ismaster().AND.associated(M%lcoords)) deallocate(M%lcoords) ! for master it = coords
     if (associated(M%lfreemap)) deallocate(M%lfreemap)
     !if (associated(M%)) deallocate(M%)

configure.ac

@@ -166 +166 @@
         src/Makefile
         src/main/Makefile
-        src/ext/Makefile
+        src/ext/C/Makefile
         doc/Doxyfile
         doc/Makefile

src/ext/C/Makefile.am

@@ -7 +7 @@
 # this file is compiled with 'mpicc' and in static linking does not find MPI library for Fortran,
 #  thus we hack it by providing required libraries, however it only works for OpenMPI
-c_doug_aggr_LDADD=libdoug-ext.la ../libdoug.la ../main/doug_aggr-main_drivers.o -lmpi_f90 -lmpi_f77
+c_doug_aggr_LDADD=libdoug-ext.la @top_builddir@/src/libdoug.la @top_builddir@/src/main/doug_aggr-main_drivers.o -lmpi_f90 -lmpi_f77
 
 c_doug_cg_SOURCES=main_cg.c
-c_doug_cg_LDADD=libdoug-ext.la ../libdoug.la ../main/doug_aggr-main_drivers.o -lmpi_f90 -lmpi_f77
+c_doug_cg_LDADD=libdoug-ext.la @top_builddir@/src/libdoug.la @top_builddir@/src/main/doug_aggr-main_drivers.o -lmpi_f90 -lmpi_f77
 
 c_doug_pcg1_SOURCES=main_pcg1.c
-c_doug_pcg1_LDADD=libdoug-ext.la ../libdoug.la ../main/doug_aggr-main_drivers.o -lmpi_f90 -lmpi_f77
+c_doug_pcg1_LDADD=libdoug-ext.la @top_builddir@/src/libdoug.la @top_builddir@/src/main/doug_aggr-main_drivers.o -lmpi_f90 -lmpi_f77

src/main/main_drivers.F90

@@ -88 +88 @@
     type(SpMtx),intent(in out),optional :: A_interf !< matrix at interface
 
+    if (ismaster()) then ! MASTER
+       write(stream,*)
+       write(stream,*) 'master thread'
+       if (D_MSGLVL > 1) &
+            call MasterCtrlData_print()
+
+    else ! SLAVES
+       write(stream,'(a,i4,a)') 'slave [',myrank,'] thread'
+       if (D_MSGLVL > 1) &
+            call SharedCtrlData_print()
+    end if
+
     ! =======================
     ! Mesh and its Dual Graph
@@ -93 +105 @@
     !
     ! Create Mesh object
+
     Msh = Mesh_New()
 
-    if (ismaster()) then ! MASTER
-       write(stream,*)
-       write(stream,*) 'master thread'
-
-       if (D_MSGLVL > 1) &
-            call MasterCtrlData_print()
-
+    if (ismaster()) then
        ! Initialise Mesh object
        call Mesh_initFromFile(Msh, trim(mctls%info_file))
-
-    else ! SLAVES
-       write(stream,'(a,i4,a)') 'slave [',myrank,'] thread'
-
-       if (D_MSGLVL > 1) &
-            call SharedCtrlData_print()
-    end if
+    endif
 
     ! Get from master Mesh's parameters: nell, ngf, mfrelt, nsd, nnode
@@ -116 +117 @@
     if (D_MSGLVL > 1) &
          call Mesh_printInfo(Msh)
-
-    ! Allocate data arrays (nfrelt, mhead, freemap, eptnmap) for mesh
-    call Mesh_allocate(Msh, &
-         nfrelt  =.true.,   &
-         mhead   =.true.,   &
-         freemap =.true.,   &
-         eptnmap  =.true.)
 
     ! Master reads in from files: feedom lists, coordinates, freedom map
@@ -141 +135 @@
     ! For multi-variable problems which have more than one block
     if (sctls%number_of_blocks > 1) then
-       call Mesh_allocate(Msh, freemask=.true.)
        if (ismaster()) then
           call Mesh_readFromFile(Msh, &
@@ -156 +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