Updated tests

Author: Andy Stokely

src/core_test/mpas_test_core_timekeeping_tests.F

@@ -505,10 +505,29 @@ subroutine test_window_alarm(case_idx, ierr)
          end if
 
          !-----------------------------------------------------------------------
-         ! Case 16: Outside window after direction change (D → E → backward)
-         ! Alarm should not ring outside window when clock direction flips.
+         ! Case 16: Reset at window start and reverse direction to exit window
+         !> Alarm should not ring when moving backward out of the window after
+         !> 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 mpas_set_clock_direction(f%clock, MPAS_BACKWARD)
+         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
+            call mpas_log_write('FAIL: Alarm rang after reset when moving backward out of window')
+            ierr = ierr + 1
+         else
+            call mpas_log_write('PASS: Alarm did not ring after reset when moving backward out of window')
+         end if
+
+         !-----------------------------------------------------------------------
+         ! Case 17: Outside window after direction change (D → E → backward)
+         ! Alarm should not ring outside window when clock direction flips.
+         !-----------------------------------------------------------------------
+      case(17)
          call advance_clock_n_times(f%clock, f%steps_to_window_end + f%num_steps_post_window/2)
          call mpas_set_clock_direction(f%clock, MPAS_BACKWARD)
          ringing = mpas_is_alarm_ringing(f%clock, f%alarm_id)
@@ -540,7 +559,7 @@ integer function mpas_window_alarm_tests(domain) result(ierr)
       integer :: i, ierr_local
 
       ierr = 0
-      do i = 1, 16
+      do i = 1, 17
          ierr_local = 0
          call test_window_alarm(i, ierr_local)
          ierr = ierr + ierr_local

src/framework/mpas_timekeeping.F

@@ -831,19 +831,17 @@ end subroutine mpas_print_alarm
       !>   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, ierr)
+      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
-         integer, intent(out), optional    :: ierr
-         type(MPAS_Time_type)              :: now
+         type(MPAS_Alarm_type), pointer :: alarm
+         type(MPAS_Time_type), intent(in) :: time
+         integer, intent(out), optional :: ierr
 
          if (present(ierr)) ierr = 0
 
-         now = mpas_get_clock_time(clock, MPAS_NOW, ierr=ierr)
-         mpas_is_alarm_active = mpas_time_in_interval( &
-               alarm%activeStartTime, alarm%activeStopTime, now)
-
+         mpas_is_alarm_active = (alarm % activeStartTime <= time &
+                 .and. time <= alarm % activeStopTime)
       end function mpas_is_alarm_active
 
 
@@ -866,48 +864,11 @@ logical function mpas_prev_ring_in_window(alarm)
          implicit none
          type(MPAS_Alarm_type), pointer :: alarm
 
-         mpas_prev_ring_in_window = mpas_time_in_interval( &
-               alarm%activeStartTime, alarm%activeStopTime, &
-               alarm%prevRingTime, is_open_interval=.true.)
-
+         mpas_prev_ring_in_window = (alarm % activeStartTime <= alarm % prevRingTime &
+                 .and. alarm % prevRingTime < alarm % activeStopTime)
       end function mpas_prev_ring_in_window
 
 
-      !-----------------------------------------------------------------------
-      !  function mpas_time_in_interval
-      !
-      !> \brief Test if a time lies within a start/stop interval.
-      !> \author Andy Stokely
-      !> \date   10/01/2025
-      !> \details Returns `.true.` if `time` falls between `start_time` and
-      !>   `end_time`. By default, the interval is closed `[start,end]`.
-      !>   If the optional `is_open_interval` flag is present and `.true.`,
-      !>   the interval is treated as open `(start,end)`, excluding the boundaries.
-      !-----------------------------------------------------------------------
-      logical function mpas_time_in_interval(start_time, end_time, time, is_open_interval)
-         implicit none
-         type(MPAS_Time_type), intent(in) :: start_time
-         type(MPAS_Time_type), intent(in) :: end_time
-         type(MPAS_Time_type), intent(in) :: time
-         logical, intent(in), optional    :: is_open_interval
-         logical :: open_interval
-
-         mpas_time_in_interval = .false.
-         open_interval = .false.
-         if (present(is_open_interval)) then
-            open_interval = is_open_interval
-         end if
-         if (time > start_time .and. time < end_time) then
-            mpas_time_in_interval = .true.
-         else if (.not. open_interval) then
-            if (time == start_time .or. time == end_time) then
-               mpas_time_in_interval = .true.
-            end if
-         end if
-
-      end function mpas_time_in_interval
-
-
       logical function mpas_is_alarm_ringing(clock, alarmID, interval, ierr)
 
       implicit none
@@ -997,7 +958,7 @@ logical function mpas_in_ringing_envelope(clock, alarmPtr, interval, ierr)
          end if
 
          if (alarmThreshold <= alarmNow) then
-            if (mpas_is_alarm_active(clock, alarmPtr, ierr) &
+            if (mpas_is_alarm_active(clock, alarmPtr, alarmNow, ierr) &
                   .or. mpas_prev_ring_in_window(alarmPtr)) then
                mpas_in_ringing_envelope = .true.
             end if
@@ -1013,7 +974,7 @@ logical function mpas_in_ringing_envelope(clock, alarmPtr, interval, ierr)
          end if
 
          if (alarmThreshold >= alarmNow) then
-            if (mpas_is_alarm_active(clock, alarmPtr, ierr) &
+            if (mpas_is_alarm_active(clock, alarmPtr, alarmNow, ierr) &
                   .or. mpas_prev_ring_in_window(alarmPtr)) then
                mpas_in_ringing_envelope = .true.
             end if