Moved the codes copying USGS timeslices to the workin directory from the ABS nwm_forecast to the subclass nwm_analyais_assim. The USGS timeslices are only used by AnA and Extended AnA cycles.

Author: zhengtaocui

nwm.v4.0.0/ush/nwm-realtime/nwm_analysis_assim.py

@@ -487,6 +487,26 @@ def move_outputs_to_storage(self) -> int:
     # ------------------------------------------------------------------ #
 
     def runRTE(self) -> int:
+        #
+        # Copy USGS output timeslices
+        #
+        paths = self._paths()
+        usgs_path = os.path.join(self.comout, "usgs_timeslices")
+        working_usgs_path = os.path.join(paths.host_run_dir, "usgs_timeslices")
+        if os.path.isdir( usgs_path ) and any(os.scandir(usgs_path)):
+            shutil.copytree( usgs_path, working_usgs_path, dirs_exist_ok=True )
+        else:
+            print("WARNING: USGS timeslices does not exist or is empty! Skipping USGS data assimilation!")
+
+        # Copy the previous day USGS output timeslices
+        if self.start_time.hour <= 6 or self.start_time.date() < self.t0.date():
+           usgs_path = os.path.join(self.previous_day_comout, "usgs_timeslices")
+           working_usgs_path = os.path.join(paths.host_run_dir, "usgs_timeslices")
+           if os.path.isdir( usgs_path ) and any(os.scandir(usgs_path)):
+                shutil.copytree( usgs_path, working_usgs_path, dirs_exist_ok=True )
+           else:
+                print("WARNING: Previous day USGS timeslices does not exist or is empty!")
+
         case_type = self.case_type
         if case_type == "CONUS_ANALYSIS_ASSIM":
             # AnA 3h window split into 1h (run 1) + 2h (run 2).

nwm.v4.0.0/ush/nwm-realtime/nwm_forecast.py

@@ -385,25 +385,6 @@ def configureRTE(self) -> None:
            else:
                 print("WARNING: Previous RFC Reservoir timeseries does not exist or is empty!")
 
-        #
-        # Copy USGS output timeslices
-        #
-        usgs_path = os.path.join(self.comout, "usgs_timeslices")
-        working_usgs_path = os.path.join(paths.host_run_dir, "usgs_timeslices")
-        if os.path.isdir( usgs_path ) and any(os.scandir(usgs_path)):
-            shutil.copytree( usgs_path, working_usgs_path, dirs_exist_ok=True )
-        else:
-            print("WARNING: USGS timeslices does not exist or is empty! Skipping USGS data assimilation!")
-
-        # Copy the previous day USGS output timeslices
-        if self.start_time.hour <= 6 or self.start_time.date() < self.t0.date():
-           usgs_path = os.path.join(self.previous_day_comout, "usgs_timeslices")
-           working_usgs_path = os.path.join(paths.host_run_dir, "usgs_timeslices")
-           if os.path.isdir( usgs_path ) and any(os.scandir(usgs_path)):
-                shutil.copytree( usgs_path, working_usgs_path, dirs_exist_ok=True )
-           else:
-                print("WARNING: Previous day USGS timeslices does not exist or is empty!")
-
     # ------------------------------------------------------------------ #
     # ecFlow / container helpers  (shared by all configurations)
     # ------------------------------------------------------------------ #