From 522f1830ec770ecc0c549267c5935719a72d4e81 Mon Sep 17 00:00:00 2001
From: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Date: Fri, 1 Nov 2024 13:36:32 -0600
Subject: [PATCH 1/2] remove check if script is master_metplus.py because it
 has been deprecated

---
 ush/run_metplus.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ush/run_metplus.py b/ush/run_metplus.py
index 6f329867a..b7a99274a 100755
--- a/ush/run_metplus.py
+++ b/ush/run_metplus.py
@@ -45,12 +45,6 @@ def main():
     if not config:
         return False
 
-    # warn if calling master_metplus.py
-    if basename(__file__) == 'master_metplus.py':
-        msg = ("master_metplus.py has been renamed to run_metplus.py. "
-               "This script name will be removed in a future version.")
-        config.logger.warning(msg)
-
     total_errors = run_metplus(config)
 
     return post_run_cleanup(config, 'METplus', total_errors)

From 38b8c0396c0485db3d44474a16aff221d4084e38 Mon Sep 17 00:00:00 2001
From: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Date: Fri, 1 Nov 2024 14:32:31 -0600
Subject: [PATCH 2/2] per #2762, fix bug that caused failure depending on valid
 time relating to leap years

---
 metplus/wrappers/pcp_combine_wrapper.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metplus/wrappers/pcp_combine_wrapper.py b/metplus/wrappers/pcp_combine_wrapper.py
index 3324f519f..e916813d3 100755
--- a/metplus/wrappers/pcp_combine_wrapper.py
+++ b/metplus/wrappers/pcp_combine_wrapper.py
@@ -649,7 +649,7 @@ def get_accumulation(self, time_info, accum, data_src,
         accum_relative = get_relativedelta(accum, 'S')
         # using 1 hour for now
         smallest_input_accum = min(
-            [ti_get_seconds_from_relativedelta(lev['amount'], search_time)
+            [ti_get_seconds_from_relativedelta(lev['amount'], search_time - accum_relative)
              for lev in self.c_dict['ACCUM_DICT_LIST']]
         )
         if smallest_input_accum == 9999999: