Feature/wdboggs/mapl3 freq aspect ts reftime 3358

generic3g/specs/FrequencyAspect.F90

@@ -55,9 +55,9 @@ function new_FrequencyAspect(timeStep, refTime, accumulation_type) result(aspect
       call aspect%set_time_dependent(.FALSE.)
       call aspect%set_accumulation_type(INSTANTANEOUS)
       call aspect%zero_timestep()
-      if(present(timestep)) aspect%timestep_ = timestep
-      if(present(refTime)) aspect%refTime_ = refTime
-      if(present(accumulation_type)) aspect%accumulation_type_ = accumulation_type
+      if(present(timestep)) call aspect%set_timestep(timestep)
+      if(present(refTime)) call aspect%set_reference_time(refTime)
+      if(present(accumulation_type)) call aspect%set_accumulation_type(accumulation_type)
 
    end function new_FrequencyAspect
 
@@ -77,19 +77,19 @@ subroutine set_timestep(this, timestep)
 
    end subroutine set_timestep
 
-   function get_reference_time(this) result(rf)
-      type(ESMF_Time) :: rf
+   function get_reference_time(this) result(time)
+      type(ESMF_Time) :: time
       class(FrequencyAspect), intent(in) :: this
 
-      rf = this%reference_time_
+      time = this%refTime_
 
    end function get_reference_time
 
-   subroutine set_reference_time(this, reference_time)
+   subroutine set_reference_time(this, time)
       class(FrequencyAspect), intent(inout) :: this
-      type(ESMF_Time), intent(in) :: reference_time
+      type(ESMF_Time), intent(in) :: time
 
-      this%reference_time_ = reference_time
+      this%refTime_ = time
 
    end subroutine set_reference_time
 
@@ -134,8 +134,7 @@ logical function matches(src, dst) result(does_match)
          dst_timestep = dst%get_timestep()
          if(dst_timestep == zero) return
          if(.not. accumulation_type_is_valid(dst%get_accumulation_type())) return
-         does_match = dst_timestep == src_timestep .and. &
-            & src%get_reference_time() == dst%get_reference_time()
+         does_match = dst_timestep == src_timestep
       end select
 
    end function matches

generic3g/tests/Test_Aspects.pf

@@ -285,21 +285,15 @@ contains
       type(FrequencyAspect) :: import, export
 
       type(ESMF_TimeInterval) :: dt1, dt2
-      type(ESMF_Time) :: ref1, ref2 
+      type(ESMF_Time) :: time1, time2 
 
-      integer :: status
       call ESMF_TimeIntervalSet(dt1, s=4)
       call ESMF_TimeIntervalSet(dt2, s=2) ! commensurate
+      call ESMF_TimeSet(time1, s=0)
+      call ESMF_TimeSet(time2, m=0)
 
-      import = FrequencyAspect(dt1, accumulation_type='mean')
-      call ESMF_TimeSet(ref1, s=0, rc=status)
-      @assertEqual(0, status, 'Nonzero status')
-      call import%set_reference_time(ref1)
-      export = FrequencyAspect(dt2)
-      call ESMF_TimeSet(ref2, m=0, rc=status)
-      @assertEqual(0, status, 'Nonzero status')
-      call export%set_reference_time(ref2)
-
+      import = FrequencyAspect(dt1, time1, accumulation_type='mean')
+      export = FrequencyAspect(dt2, time2)
       @assert_that(export%can_connect_to(import), is(true()))
 
    end subroutine test_can_connect_accum_mean