Partial fix for #4277 - Workaround for profile copy issue.

profiler/AbstractMeterNode.F90

@@ -153,7 +153,7 @@ function i_get_inclusive(this) result(inclusive)
          use, intrinsic :: iso_fortran_env, only: REAL64
          import AbstractMeterNode
          real(kind=REAL64) :: inclusive
-         class(AbstractMeterNode), intent(in) :: this
+         class(AbstractMeterNode), target, intent(in) :: this
       end function i_get_inclusive
 
       subroutine i_reset(this)

profiler/BaseProfiler.F90

@@ -26,7 +26,7 @@ module mapl_BaseProfiler
       private
       type(MeterNode) :: root_node
       type(MeterNodeStack) :: stack
-      integer :: status = 0
+      integer :: status
       integer :: comm_world
    contains
       procedure :: start_name
@@ -53,8 +53,8 @@ module mapl_BaseProfiler
       procedure :: get_root_node
       procedure :: get_status
       procedure :: copy_profiler
-      procedure(copy_profiler), deferred :: copy
-      generic :: assignment(=) => copy
+!#      procedure(copy_profiler), deferred :: copy
+!#      generic :: assignment(=) => copy
 
       procedure :: reset
       procedure :: accumulate
@@ -102,6 +102,7 @@ subroutine start_self(this, unusable, rc)
 
       logical :: empty_stack
 
+      this%status = 0
       empty_stack = .true.
       !$omp master
       if (this%stack%size()/= 0) this%status = INCORRECTLY_NESTED_METERS

profiler/DistributedProfiler.F90

@@ -1,3 +1,4 @@
+#include "MAPL.h"
 module MAPL_DistributedProfiler
    use MAPL_AbstractMeter
    use MAPL_AbstractGauge
@@ -20,7 +21,7 @@ module MAPL_DistributedProfiler
    contains
       procedure :: make_meter
       procedure :: reduce
-      procedure :: copy
+!#      procedure :: copy
    end type DistributedProfiler
 
    interface DistributedProfiler

profiler/MemoryProfiler.F90

@@ -1,4 +1,4 @@
-#include "MAPL_ErrLog.h"
+#include "MAPL.h"
 module MAPL_MemoryProfiler_private
    use MAPL_BaseProfiler, only: BaseProfiler
    use MAPL_BaseProfiler, only: MemoryProfilerIterator => BaseProfilerIterator
@@ -53,7 +53,8 @@ subroutine copy(new, old)
       class(MemoryProfiler), target, intent(inout) :: new
       class(BaseProfiler), target, intent(in) :: old
 
-      call new%copy_profiler(old)
+      _HERE
+!#      call new%copy_profiler(old)
 
    end subroutine copy
 

profiler/MeterNode.F90

@@ -37,8 +37,8 @@ module MAPL_MeterNode
       procedure :: accumulate
       procedure :: reset
 
-      procedure :: begin
-      procedure :: end
+      procedure :: begin => node_begin
+      procedure :: end => node_end
    end type MeterNode
 
 
@@ -56,7 +56,7 @@ module MAPL_MeterNode
       procedure :: get_meter => get_meter_iter
       procedure :: equals
       procedure :: not_equals
-      procedure :: next
+      procedure :: next => node_next
    end type MeterNodeIterator
 
 
@@ -110,14 +110,14 @@ end function get_name
 
    function get_inclusive(this) result(inclusive)
       real(kind=REAL64) :: inclusive
-      class (MeterNode), intent(in) :: this
+      class (MeterNode), target, intent(in) :: this
       inclusive = this%meter%get_total()
    end function get_inclusive
 
 
    function get_exclusive(this) result(exclusive)
       real(kind=REAL64) :: exclusive
-      class (MeterNode), intent(in) :: this
+      class (MeterNode), target, intent(in) :: this
 
       type (MeterNodevectorIterator) :: iter
       class (AbstractMeterNode), pointer :: child
@@ -133,7 +133,7 @@ function get_exclusive(this) result(exclusive)
 
       iter = this%children%begin()
       do while (iter /= this%children%end())
-         child => iter%get()
+         child => iter%of()
          tmp = tmp - child%get_inclusive()
          call iter%next()
       end do
@@ -239,7 +239,7 @@ recursive integer function get_num_nodes(this) result(num_nodes)
       num_nodes = 1
       iter = this%children%begin()
       do while (iter /= this%children%end())
-         child => iter%get()
+         child => iter%of()
          num_nodes = num_nodes + child%get_num_nodes()
          call iter%next()
       end do
@@ -266,18 +266,18 @@ function new_MeterNodeIterator(meter_node) result(iterator)
    end function new_MeterNodeIterator
 
 
-   function begin(this) result(iterator)
+   function node_begin(this) result(iterator)
       class (AbstractMeterNodeIterator), allocatable :: iterator
       class (MeterNode), target, intent(in) :: this
 
 !!$      iterator = MeterNodeIterator(this)
       allocate(iterator, source=MeterNodeIterator(this))
 
-   end function begin
+   end function node_begin
 
 
 
-   function end(this) result(iterator)
+   function node_end(this) result(iterator)
       class (AbstractMeterNodeIterator), allocatable :: iterator
       class (MeterNode), target, intent(in) :: this
 
@@ -294,10 +294,10 @@ function end(this) result(iterator)
          print*,'uh oh'
       end select
 
-   end function end
+   end function node_end
 
 
-   recursive subroutine next(this)
+   recursive subroutine node_next(this)
       class (MeterNodeIterator), intent(inout) :: this
       class (AbstractMeterNode), pointer :: current_child
 
@@ -307,7 +307,7 @@ recursive subroutine next(this)
       if (.not. allocated(this%iterator_over_children)) then
          this%iterator_over_children = this%reference%children%begin()
          if (this%iterator_over_children /= this%reference%children%end()) then
-            current_child => this%iterator_over_children%get()
+            current_child => this%iterator_over_children%of()
             this%iterator_of_current_child = current_child%begin()
             this%current => this%iterator_of_current_child%get()
          else
@@ -323,14 +323,14 @@ recursive subroutine next(this)
             if (this%iterator_over_children == this%reference%children%end()) then ! done
                deallocate(this%iterator_over_children)
             else
-               current_child => this%iterator_over_children%get()
+               current_child => this%iterator_over_children%of()
                this%iterator_of_current_child = current_child%begin() ! always at least one node
                this%current => this%iterator_of_current_child%get()
             end if
          end if
       end if
 
-   end subroutine next
+   end subroutine node_next
 
 
    function get(this) result(tree)
@@ -395,7 +395,7 @@ recursive subroutine reset(this)
 
       iter = this%children%begin()
       do while (iter /= this%children%end())
-         child => iter%get()
+         child => iter%of()
          call child%reset()
          call iter%next()
       end do

profiler/MeterNodeVector.F90

@@ -1,15 +1,16 @@
 module MAPL_MeterNodeVector
    use MAPL_AbstractMeterNode
 
-#define _type  class (AbstractMeterNode)
-#define _allocatable
-#define _vector MeterNodeVector
-#define _iterator MeterNodeVectorIterator
-#include "templates/vector.inc"
+#define T AbstractMeterNode
+#define T_polymorphic
+#define Vector MeterNodeVector
+#define VectorIterator MeterNodeVectorIterator
 
-#undef _iterator
-#undef _vector
-#undef _pointer
-#undef _type
+#include "vector/template.inc"
+
+#undef VectorIterator
+#undef Vector
+#undef T_polymorphic
+#undef T
 
 end module MAPL_MeterNodeVector

profiler/StubProfiler.F90

@@ -1,4 +1,4 @@
-#include "MAPL_ErrLog.h"
+#include "MAPL.h"
 module MAPL_StubProfiler
    use MAPL_BaseProfiler, only: BaseProfiler
    use MAPL_DistributedProfiler
@@ -62,7 +62,8 @@ subroutine copy(new, old)
       class(StubProfiler), target, intent(inout) :: new
       class(BaseProfiler), target, intent(in) :: old
 
-      call new%copy_profiler(old)
+      _HERE
+!#      call new%copy_profiler(old)
 
    end subroutine copy
 

profiler/TimeProfiler.F90

@@ -1,5 +1,4 @@
-#include "unused_dummy.H"
-#include "MAPL_ErrLog.h"
+#include "MAPL.h"
 
 module mapl_TimeProfiler_private
    use mapl_BaseProfiler, only: BaseProfiler
@@ -49,7 +48,8 @@ subroutine copy(new, old)
       class(TimeProfiler), target, intent(inout) :: new
       class(BaseProfiler), target, intent(in) :: old
 
-      call new%copy_profiler(old)
+      _HERE
+!#      call new%copy_profiler(old)
 
    end subroutine copy