Changeset bd99c62

Timestamp:

12/08/10 12:36:24 (2 years ago)

Author:

Oleg Batrashev <ogbash@…>

Branches:

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

Children:

dd63f9f

Parents:

f2101f9

git-author:

Oleg Batrashev <ogbash@…> (12/08/10 12:36:24)

git-committer:

Oleg Batrashev <ogbash@…> (12/08/10 12:36:24)

Message:

Special Mesh allocate subroutine is excessive.

Location:

src

Files:

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

src/datatypes/Mesh.F90

@@ -243 +243 @@
   end function Mesh_newInit
 
-
-  !----------------------------------------------------------
-  !! Allocates Mesh's main data
-  !----------------------------------------------------------
-  subroutine Mesh_allocate(M, &
-       nfrelt,  &
-       mhead,   &
-       freemap, &
-       coords,  &
-       eptnmap, &
-       freemask)
-    implicit none
-
-    type(Mesh), intent(in out)         :: M
-    logical,    intent(in),   optional :: nfrelt, mhead, freemap
-    logical,    intent(in),   optional :: coords, eptnmap, freemask
-    logical                            :: all=.false.
-    if (.not.present(nfrelt)    .and.&
-         (.not.present(mhead))  .and.&
-         (.not.present(freemap)).and.&
-         (.not.present(coords)) .and.&
-         (.not.present(eptnmap)) .and.&
-         (.not.present(freemask))) then
-       if (.not.associated(M%nfrelt))   allocate(M%nfrelt(M%nell))
-       if (.not.associated(M%mhead))    allocate(M%mhead(M%mfrelt,M%nell))
-       if (.not.associated(M%freemap))  allocate(M%freemap(M%ngf))
-       if (.not.associated(M%coords))   allocate(M%coords(M%nsd,M%nnode))
-       if (.not.associated(M%eptnmap))  allocate(M%eptnmap(M%nell))
-       if (.not.associated(M%freemask)) allocate(M%freemask(M%ngf))
-       all = .true.
-    end if
-
-    if (present(nfrelt)  .and.(.not.all).and.&
-         (.not.associated(M%nfrelt)))   allocate(M%nfrelt(M%nell))
-    if (present(mhead)   .and.(.not.all).and.&
-         (.not.associated(M%mhead)))    allocate(M%mhead(M%mfrelt,M%nell))
-    if (present(freemap) .and.(.not.all).and.&
-         (.not.associated(M%freemap)))  allocate(M%freemap(M%ngf))
-    if (present(coords)  .and.(.not.all).and.&
-         (.not.associated(M%coords)))   allocate(M%coords(M%nsd,M%nnode))
-    if (present(eptnmap)  .and.(.not.all).and.&
-         (.not.associated(M%eptnmap)))  allocate(M%eptnmap(M%nell))
-    if (present(freemask).and.(.not.all).and.&
-         (.not.associated(M%freemask))) allocate(M%freemask(M%ngf))
-
-  end subroutine Mesh_allocate
-
-
   !-------------------------
   !! Destructor
@@ -387 +339 @@
     nnode=ngf
     call Mesh_Init(M, nell, ngf, nsd, mfrelt, nnode)
-    call Mesh_allocate(M,coords=.true.,freemap=.true.) ! needing the coords...
+    allocate(M%coords(M%nsd,M%nnode),M%freemap(M%ngf)) ! needing the coords...
     M%freemap= (/ (i,i=1,ngf) /)
     do j=1,n
@@ -1503 +1455 @@
           end do
        else
+          if (.NOT.associated(M%nfrelt)) allocate(M%nfrelt(M%nell))
           call MPI_RECV(M%nfrelt, M%nell, MPI_INTEGER, &
                D_MASTER, D_TAG_MESH_NFRELT, MPI_COMM_WORLD, status, ierr)
@@ -1516 +1469 @@
           end do
        else
+          if (.NOT.associated(M%mhead)) allocate(M%mhead(M%mfrelt,M%nell))
           call MPI_RECV(M%mhead, M%mfrelt*M%nell, MPI_INTEGER, &
                D_MASTER, D_TAG_MESH_MHEAD, MPI_COMM_WORLD, status, ierr)
@@ -1529 +1483 @@
           end do
        else
+          if (.not.associated(M%freemap)) allocate(M%freemap(M%ngf))
           call MPI_RECV(M%freemap, M%ngf, MPI_INTEGER, &
                D_MASTER, D_TAG_MESH_FREEMASK, MPI_COMM_WORLD, status, ierr)
@@ -1542 +1497 @@
           end do
        else
+          if (.not.associated(M%coords))   allocate(M%coords(M%nsd,M%nnode))
           call MPI_RECV(M%coords, M%nnode*M%nsd, MPI_xyzkind, &
                D_MASTER, D_TAG_MESH_FREEMASK, MPI_COMM_WORLD, status, ierr)
@@ -1555 +1511 @@
           end do
        else
+          if (.not.associated(M%eptnmap))  allocate(M%eptnmap(M%nell))
           call MPI_RECV(M%eptnmap, M%nell, MPI_INTEGER, &
                D_MASTER, D_TAG_MESH_EPTNMAP, MPI_COMM_WORLD, status, ierr)
@@ -1592 +1549 @@
           end do
        else
+          if (.not.associated(M%freemask)) allocate(M%freemask(M%ngf))
           call MPI_RECV(M%freemask, M%ngf, MPI_BYTE, &
                D_MASTER, D_TAG_MESH_FREEMASK, MPI_COMM_WORLD, status, ierr)

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, &