From 3c3b0295d2b08868b53dc63bf1276cfb0cae2a8f Mon Sep 17 00:00:00 2001
From: Joachim Meyer <j.meyer@utah.edu>
Date: Tue, 8 Mar 2022 11:32:11 -0700
Subject: [PATCH] AWSM - Framework - Fix paths to previous storm_days

Fix logic that sets the paths to the previous storm_day.nc.
There was a path error which caused the new file not be found and the
initial file (day one) to be re-used throughout a configured time span.
This fixes the path and also resets the filepath once the file can not
be found.
---
 awsm/framework/framework.py | 38 ++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/awsm/framework/framework.py b/awsm/framework/framework.py
index 36a2d08..532e6cf 100755
--- a/awsm/framework/framework.py
+++ b/awsm/framework/framework.py
@@ -504,17 +504,12 @@ def run_awsm_daily_ops(config_file):
     # find output location for previous output
     paths = config.cfg['paths']
 
-    prev_out_base = os.path.join(paths['path_dr'],
-                                 paths['basin'],
-                                 'wy{}'.format(wy),
-                                 paths['project_name'],
-                                 )
-
-    prev_data_base = os.path.join(paths['path_dr'],
-                                  paths['basin'],
-                                  'wy{}'.format(wy),
-                                  paths['project_name'],
-                                  )
+    base_path = os.path.join(
+        paths['path_dr'],
+        paths['basin'],
+        'wy{}'.format(wy),
+        paths['project_name'],
+    )
 
     # find day of start and end
     start_day = pd.to_datetime(model_start.strftime(fmt_day))
@@ -550,21 +545,26 @@ def run_awsm_daily_ops(config_file):
         if idd > 0:
             # find previous output file
             prev_day = sd - pd.to_timedelta(1, unit='D')
-            prev_out = os.path.join(prev_out_base,
-                                    'run{}'.format(prev_day.strftime(fmt_day)),
-                                    'snow.nc')
+            prev_snow = os.path.join(
+                base_path,
+                'run{}'.format(prev_day.strftime(fmt_day)),
+                'snow.nc'
+            )
             # reset if running the model
             if new_config.cfg['awsm master']['model_type'] is not None:
                 new_config.raw_cfg['files']['init_type'] = 'netcdf_out'
-                new_config.raw_cfg['files']['init_file'] = prev_out
+                new_config.raw_cfg['files']['init_file'] = prev_snow
 
             # if we have a previous storm day file, use it
-            prev_storm = os.path.join(prev_data_base,
-                                      'data{}'.format(
-                                          prev_day.strftime(fmt_day)),
-                                      'smrfOutputs', 'storm_days.nc')
+            prev_storm = os.path.join(
+                base_path,
+                'run{}'.format(prev_day.strftime(fmt_day)),
+                'storm_days.nc'
+            )
             if os.path.isfile(prev_storm):
                 new_config.raw_cfg['precip']['storm_days_restart'] = prev_storm
+            else:
+                new_config.raw_cfg['precip']['storm_days_restart'] = ''
 
         # apply recipes with new settings
         new_config.apply_recipes()