add script to run all steps

geoglows · Nov 30, 2023 · dd29dc5 · dd29dc5
1 parent 61353e1
commit dd29dc5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/run_3_make_vpu_files.py b/run_3_make_vpu_files.py
@@ -26,9 +26,9 @@
 os.makedirs(gpkg_dir, exist_ok=True)
 
 logging.info('Creating Model Master Table')
-if not os.path.exists(os.path.join(vpu_inputs_dir, 'master_table.parquet')):
+if not os.path.exists(os.path.join(vpu_inputs_dir, 'geoglows-v2-master-table.parquet')):
     rp.inputs.concat_tdxregions(tdx_inputs_dir, vpu_inputs_dir, vpu_table)
-mdf = pd.read_parquet(os.path.join(vpu_inputs_dir, 'master_table.parquet'))
+mdf = pd.read_parquet(os.path.join(vpu_inputs_dir, 'geoglows-v2-master-table.parquet'))
 logging.info(f'Total streams: {len(mdf)}')
 
 if not os.path.exists(os.path.join(vpu_inputs_dir, 'global_streams_simplified.geoparquet')):

diff --git a/run_all.sh b/run_all.sh
@@ -0,0 +1,6 @@
+#!/bin/zsh
+python run_1_gpkg_to_geoparquet.py
+python run_1_netcdfs_to_grids.py
+python run_2_tdxhydro_rapid_masters.py
+python run_3_make_vpu_files.py
+python run_4_make_gpkg.py
diff --git a/tdxhydrorapid/network.py b/tdxhydrorapid/network.py
@@ -294,7 +294,7 @@ def make_final_streams(final_inputs_directory: str,
     mgdf = pd.concat([gpd.read_parquet(gpq) for gpq in modified_gpqs])
 
     print('merging with master table')
-    mgdf = mgdf.merge(pd.read_parquet(os.path.join(final_inputs_directory, 'master_table.parquet')),
+    mgdf = mgdf.merge(pd.read_parquet(os.path.join(final_inputs_directory, 'geoglows-v2-master-table.parquet')),
                       on='TDXHydroLinkNo', how='inner')
 
     for vpu_code in sorted(mgdf['VPUCode'].unique()):