fix naming

CIROH-UA · Sep 30, 2024 · 71175ea · 71175ea
1 parent 659763a
commit 71175ea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/forcingprocessor/src/forcingprocessor/processor.py b/forcingprocessor/src/forcingprocessor/processor.py
@@ -755,9 +755,6 @@ def prep_ngen_data(conf):
             json.dump(conf, f)
         cp_cmd = f'cp {nwm_file} {metaf_path}'
         os.system(cp_cmd)
-        for jgpkg in gpkg_files:
-            cp_cmd = f'cp {jgpkg} {metaf_path}'
-            os.system(cp_cmd)
 
     elif storage_type == "s3":
         bucket_path  = output_path

diff --git a/forcingprocessor/src/forcingprocessor/weights_hf2ds.py b/forcingprocessor/src/forcingprocessor/weights_hf2ds.py
@@ -23,15 +23,15 @@ def hf2ds(files : list):
     jcatchment_dict = {}
     count = 0
     for jgpkg in files:
-        pattern = r'VPU_([^/]+)'
+        pattern = r'vpuid%3D([^/]+)'
         match = re.search(pattern, jgpkg)
         if match: jname = "VPU_" + match.group(1)
         else:
             count +=1
             jname = str(count)    
         new_dict = hydrofabric2datastream_weights(jgpkg)
         weights_json = weights_json | new_dict
-        jcatchment_dict[jname] = list(weights_json.keys())
+        jcatchment_dict[jname] = list(new_dict.keys())
 
     return weights_json, jcatchment_dict