Updated tests.

Author: Andy Stokely

src/core_test/mpas_test_core_timekeeping_tests.F

@@ -506,10 +506,12 @@ subroutine test_window_alarm(case_idx, ierr)
          !> being reset at the window start.
          !-----------------------------------------------------------------------
       case(16)
-         call advance_clock_n_times(f%clock, f%steps_to_window_start)
-         call mpas_reset_clock_alarm(f%clock, f%alarm_id)
+         call advance_clock_n_times(f%clock, f%steps_to_window_midpoint)
          call mpas_set_clock_direction(f%clock, MPAS_BACKWARD)
-         call advance_clock_n_times(f%clock, f%steps_to_window_start/2)
+         call mpas_reset_clock_alarm(f%clock, f%alarm_id)
+         call advance_clock_n_times(f%clock, f%num_steps_window / 2)
+         call mpas_reset_clock_alarm(f%clock, f%alarm_id)
+         call advance_clock_n_times(f%clock, f%steps_to_window_start / 2)
 
          ringing = mpas_is_alarm_ringing(f%clock, f%alarm_id)
          if (ringing) then

src/framework/mpas_timekeeping.F

@@ -543,20 +543,20 @@ subroutine mpas_add_clock_alarm(clock, alarmID, alarmTime, alarmTimeInterval, &
 
          alarmPtr % isSet = .true.
          alarmPtr % ringTime = alarmTime
+         if (present(alarmStartTime)) then
+            alarmPtr % activeStartTime = alarmStartTime
+         else
+            alarmPtr % activeStartTime = mpas_get_clock_time(clock, MPAS_START_TIME)
+         end if
+         if (present(alarmStopTime)) then
+            alarmPtr % activeStopTime = alarmStopTime
+         else
+            alarmPtr % activeStopTime = mpas_get_clock_time(clock, MPAS_STOP_TIME)
+         end if
 
          if (present(alarmTimeInterval)) then
             alarmPtr % isRecurring = .true.
             alarmPtr % ringTimeInterval = alarmTimeInterval
-            if (present(alarmStartTime)) then
-               alarmPtr % activeStartTime = alarmStartTime
-            else
-               alarmPtr % activeStartTime = mpas_get_clock_time(clock, MPAS_START_TIME)
-            end if
-            if (present(alarmStopTime)) then
-               alarmPtr % activeStopTime = alarmStopTime
-            else
-               alarmPtr % activeStopTime = mpas_get_clock_time(clock, MPAS_STOP_TIME)
-            end if
             if(clock % direction == MPAS_FORWARD) then
                alarmPtr % prevRingTime = alarmTime - alarmTimeInterval
             else
@@ -821,55 +821,57 @@ subroutine mpas_print_alarm(clock, alarmID, ierr)
    end subroutine mpas_print_alarm
 
 
-      !-----------------------------------------------------------------------
-      !  function mpas_is_alarm_active
-      !
-      !> \brief Determine if an alarm is currently active.
-      !> \author Andy Stokely
-      !> \date   10/01/2025
-      !> \details This function checks whether the current clock time falls
-      !>   within the active start and stop times of the given alarm. If so,
-      !>   it returns `.true.`. An optional error code may also be returned.
-      !-----------------------------------------------------------------------
-      logical function mpas_is_alarm_active(clock, alarm, time, ierr)
-         implicit none
-         type(MPAS_Clock_type), intent(in) :: clock
-         type(MPAS_Alarm_type), pointer :: alarm
-         type(MPAS_Time_type), intent(in) :: time
-         integer, intent(out), optional :: ierr
-
-         if (present(ierr)) ierr = 0
-
-         mpas_is_alarm_active = (alarm % activeStartTime <= time &
-                 .and. time <= alarm % activeStopTime)
-      end function mpas_is_alarm_active
-
-
-      !-----------------------------------------------------------------------
-      !  function mpas_prev_ring_in_window
-      !
-      !> \brief Check if the alarm’s previous ring was inside its window.
-      !> \author Andy Stokely
-      !> \date   10/01/2025
-      !> \details This function tests whether the alarm’s `prevRingTime`
-      !>   occurred strictly within the defined start and stop times of the
-      !>   alarm’s active window. The check uses an open interval:
-      !>
-      !>       (start, stop)
-      !>
-      !>   The boundaries themselves are excluded. If the previous ring time
-      !>   lies inside this open interval, the function returns `.true.`.
-      !-----------------------------------------------------------------------
-      logical function mpas_prev_ring_in_window(alarm)
-         implicit none
-         type(MPAS_Alarm_type), pointer :: alarm
-
-         mpas_prev_ring_in_window = (alarm % activeStartTime < alarm % prevRingTime &
-                 .and. alarm % prevRingTime < alarm % activeStopTime)
-      end function mpas_prev_ring_in_window
-
-
-      logical function mpas_is_alarm_ringing(clock, alarmID, interval, ierr)
+   !-----------------------------------------------------------------------
+   !  function mpas_is_alarm_active
+   !
+   !> \brief Determine if an alarm is currently active.
+   !> \author Andy Stokely
+   !> \date   10/01/2025
+   !> \details This function checks whether the provided time falls
+   !>   within the active start and stop times of the given alarm. If so,
+   !>   it returns `.true.`.
+   !-----------------------------------------------------------------------
+   logical function mpas_is_alarm_active(alarm, time)
+
+      implicit none
+
+      type(MPAS_Alarm_type), pointer :: alarm
+      type(MPAS_Time_type), intent(in) :: time
+
+      mpas_is_alarm_active = (alarm % activeStartTime <= time &
+              .and. time <= alarm % activeStopTime)
+
+   end function mpas_is_alarm_active
+
+
+   !-----------------------------------------------------------------------
+   !  function mpas_prev_ring_in_window
+   !
+   !> \brief Check if the alarm’s previous ring was inside its window.
+   !> \author Andy Stokely
+   !> \date   10/01/2025
+   !> \details This function tests whether the alarm’s `prevRingTime`
+   !>   occurred strictly within the defined start and stop times of the
+   !>   alarm’s active window. The check uses an open interval:
+   !>
+   !>       (start, stop)
+   !>
+   !>   The boundaries themselves are excluded. If the previous ring time
+   !>   lies inside this open interval, the function returns `.true.`.
+   !-----------------------------------------------------------------------
+   logical function mpas_prev_ring_in_window(alarm)
+
+      implicit none
+
+      type(MPAS_Alarm_type), pointer :: alarm
+
+      mpas_prev_ring_in_window = (alarm % activeStartTime < alarm % prevRingTime &
+              .and. alarm % prevRingTime < alarm % activeStopTime)
+
+   end function mpas_prev_ring_in_window
+
+
+   logical function mpas_is_alarm_ringing(clock, alarmID, interval, ierr)
 
       implicit none
 
@@ -940,10 +942,12 @@ logical function mpas_in_ringing_envelope(clock, alarmPtr, interval, ierr)
       integer, intent(out), optional :: ierr
 
       type (MPAS_Time_type) :: alarmNow
+      type (MPAS_Time_type) :: currentTime
       type (MPAS_Time_type) :: alarmThreshold
 
-      alarmNow = mpas_get_clock_time(clock, MPAS_NOW, ierr)
-      alarmThreshold = alarmPtr % ringTime 
+      currentTime = mpas_get_clock_time(clock, MPAS_NOW, ierr)
+      alarmNow = currentTime
+      alarmThreshold = alarmPtr % ringTime
 
       mpas_in_ringing_envelope = .false.      
 
@@ -958,7 +962,7 @@ logical function mpas_in_ringing_envelope(clock, alarmPtr, interval, ierr)
          end if
 
          if (alarmThreshold <= alarmNow) then
-            if (mpas_is_alarm_active(clock, alarmPtr, alarmNow, ierr) &
+            if (mpas_is_alarm_active(alarmPtr, currentTime) &
                   .or. mpas_prev_ring_in_window(alarmPtr)) then
                mpas_in_ringing_envelope = .true.
             end if
@@ -974,7 +978,7 @@ logical function mpas_in_ringing_envelope(clock, alarmPtr, interval, ierr)
          end if
 
          if (alarmThreshold >= alarmNow) then
-            if (mpas_is_alarm_active(clock, alarmPtr, alarmNow, ierr) &
+            if (mpas_is_alarm_active(alarmPtr, currentTime) &
                   .or. mpas_prev_ring_in_window(alarmPtr)) then
                mpas_in_ringing_envelope = .true.
             end if