Fixed broken diffusive routing in Lower Colorado example (NOAA-OWP#805)

* Fixed broken diffusive routing in Lower Colorado example * Fixed bug: link_lake_crosswalk issue * Fixed missing argument for duplicate_ids_df in V3
shorvath-noaa · Jul 19, 2024 · 4e17d80 · 4e17d80
1 parent a9537c4
commit 4e17d80
Show file tree

Hide file tree

Showing 33 changed files with 14 additions and 11 deletions.
diff --git a/src/troute-nwm/src/nwm_routing/__main__.py b/src/troute-nwm/src/nwm_routing/__main__.py
@@ -1789,6 +1789,8 @@ def main_v03(argv):
         if (not kernelTalks):        
             logFileName = 'NONE'
 
+        duplicate_ids_df = pd.DataFrame()
+
         nwm_output_generator(
             run,
             run_results,
@@ -1802,6 +1804,7 @@ def main_v03(argv):
             cpu_pool,
             waterbodies_df,
             waterbody_types_df,
+            duplicate_ids_df,
             data_assimilation_parameters,
             lastobs_df,
             link_gage_df,

diff --git a/src/troute-nwm/src/nwm_routing/output.py b/src/troute-nwm/src/nwm_routing/output.py
@@ -174,7 +174,7 @@ def nwm_output_generator(
             d_df = flow_df.iloc[:,2::3]
 
         # replace waterbody lake_ids with outlet link ids
-        if link_lake_crosswalk:
+        if (link_lake_crosswalk):
             flowveldepth = _reindex_lake_to_link_id(flowveldepth, link_lake_crosswalk)
 
         # todo: create a unit test by saving FVD array to disk and then checking that
@@ -391,7 +391,7 @@ def nwm_output_generator(
         # usgs_df_filtered.to_csv(output_path.joinpath("usgs_df.csv"))
 
     if chano:
-        
+
         LOG.info("- writing t-route flow results at gage locations to CHANOBS file")
         start = time.time()
 

diff --git a/test/LowerColorado_TX/channel_forcing/202108231300.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108231300.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108231400.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108231400.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108231500.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108231500.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108231600.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108231600.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108231700.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108231700.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108231800.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108231800.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108231900.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108231900.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108232000.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108232000.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108232100.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108232100.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108232200.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108232200.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108232300.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108232300.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108240000.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108240000.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108240100.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108240100.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108240200.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108240200.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108240300.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108240300.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108240400.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108240400.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108240500.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108240500.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108240600.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108240600.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108240700.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108240700.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108240800.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108240800.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108240900.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108240900.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108241000.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108241000.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108241100.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108241100.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108241200.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108241200.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108241300.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108241300.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108241400.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108241400.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108241500.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108241500.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/channel_forcing/202108241600.CHRTOUT_DOMAIN1 b/test/LowerColorado_TX/channel_forcing/202108241600.CHRTOUT_DOMAIN1
diff --git a/test/LowerColorado_TX/domain/LAKEPARM.nc b/test/LowerColorado_TX/domain/LAKEPARM.nc
diff --git a/test/LowerColorado_TX/domain/RouteLink.nc b/test/LowerColorado_TX/domain/RouteLink.nc
diff --git a/test/LowerColorado_TX/test_AnA.yaml b/test/LowerColorado_TX/test_AnA.yaml
@@ -35,15 +35,15 @@ compute_parameters:
     restart_parameters:
         #----------
         start_datetime: 2021-08-23_13:00
-        wrf_hydro_channel_restart_file        : restart/HYDRO_RST.2021-08-23_12:00_DOMAIN1
+        #wrf_hydro_channel_restart_file        : restart/HYDRO_RST.2021-08-23_12:00_DOMAIN1
         #lite_channel_restart_file            : restart/RESTART.2020082600_DOMAIN1
         wrf_hydro_channel_ID_crosswalk_file   : domain/RouteLink.nc
-        wrf_hydro_waterbody_restart_file      : restart/HYDRO_RST.2021-08-23_12:00_DOMAIN1
+        #wrf_hydro_waterbody_restart_file      : restart/HYDRO_RST.2021-08-23_12:00_DOMAIN1
         #lite_waterbody_restart_file          : restart/waterbody_restart_202006011200
         wrf_hydro_waterbody_ID_crosswalk_file : domain/LAKEPARM.nc 
         wrf_hydro_waterbody_crosswalk_filter_file: domain/RouteLink.nc 
     hybrid_parameters:
-        run_hybrid_routing: False
+        run_hybrid_routing: True
         diffusive_domain  : domain/coastal_domain_subset.yaml  
         use_natl_xsections: False
         topobathy_domain  : domain/final_diffusive_natural_xs.nc 
@@ -80,7 +80,7 @@ compute_parameters:
             reservoir_persistence_usace : True
             gage_lakeID_crosswalk_file  : domain/reservoir_index_AnA.nc
 #--------------------------------------------------------------------------------
-# output_parameters:
+output_parameters:
 #     #----------
 #     test_output: output/lcr_flowveldepth.pkl
 #     lite_restart:
@@ -94,9 +94,9 @@ compute_parameters:
 #         chanobs_output_directory: output/
 #         chanobs_filepath        : lcr_chanobs.nc
 #     lakeout_output: lakeout/
-#     stream_output: 
-#         stream_output_directory: output/
-#         stream_output_time: 1 #[hr]
-#         stream_output_type: '.nc' #please select only between netcdf '.nc' or '.csv' or '.pkl'
-#         stream_output_internal_frequency: 60 #[min] it should be order of 5 minutes. For instance if you want to output every hour put 60
+    stream_output: 
+        stream_output_directory: output/
+        stream_output_time: 1 #[hr]
+        stream_output_type: '.nc' #please select only between netcdf '.nc' or '.csv' or '.pkl'
+        stream_output_internal_frequency: 60 #[min] it should be order of 5 minutes. For instance if you want to output every hour put 60