Skip to content

Commit 582ade1

Browse files
author
santiagoC
committed
remove year in shapeifle
1 parent 2d20215 commit 582ade1

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/postprocessing/export_average.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def export_raster(dataset, file_name, specific_variable, output_path, inputs_pat
1515
output_path_folder = os.path.join(output_path, file_name)
1616
shape_path = os.path.join(inputs_path, "shapefile")
1717
data_path = os.path.join(inputs_path, "data")
18-
shp_path = os.path.join(shape_path, "limite_nacional_2011", "limite_nacional_2011.shp")
18+
shp_path = os.path.join(shape_path, "limite_nacional", "limite_nacional.shp")
1919

2020
if not os.path.exists(output_path):
2121
os.makedirs(output_path)
@@ -99,7 +99,7 @@ def export_raster(dataset, file_name, specific_variable, output_path, inputs_pat
9999

100100
print(f"Raster for: {specific_variable} day: {date} cut successfully as '{new_raster_filename}'")
101101

102-
generate_image(new_raster_filename, search_csv(os.path.join(data_path,"ranges"), specific_variable), data_path, os.path.join(shape_path, "limites_municipales_2001", "limite_municipal_2001.shp"))
102+
generate_image(new_raster_filename, search_csv(os.path.join(data_path,"ranges"), specific_variable), data_path, os.path.join(shape_path, "limites_municipales", "limite_municipal.shp"))
103103

104104
return var_output
105105

src/postprocessing/extract_data.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def calcWS10m(U10, V10, inputs_path):
9595

9696
print(f"Raster {file_name} created successfully")
9797

98-
generate_image(file_name, search_csv(os.path.join(inputs_path, "data", "ranges"), "WS10m"), os.path.join(inputs_path, "data"), os.path.join(inputs_path, "shapefile", "limites_municipales_2001", "limite_municipal_2001.shp"))
98+
generate_image(file_name, search_csv(os.path.join(inputs_path, "data", "ranges"), "WS10m"), os.path.join(inputs_path, "data"), os.path.join(inputs_path, "shapefile", "limites_municipales", "limite_municipal.shp"))
9999

100100
return U10.replace("U10","WS10m")
101101

@@ -139,7 +139,7 @@ def calcWS2m(WS10m, inputs_path):
139139

140140
print(f"Raster {file_name} created successfully")
141141

142-
generate_image(file_name, search_csv(os.path.join(inputs_path, "data", "ranges"), "WS2m"), os.path.join(inputs_path, "data"), os.path.join(inputs_path, "shapefile", "limites_municipales_2001", "limite_municipal_2001.shp"))
142+
generate_image(file_name, search_csv(os.path.join(inputs_path, "data", "ranges"), "WS2m"), os.path.join(inputs_path, "data"), os.path.join(inputs_path, "shapefile", "limites_municipales", "limite_municipal.shp"))
143143

144144
return WS10m.replace("WS10m","WS2m")
145145

@@ -206,7 +206,7 @@ def calcRH(T2, P, PB, Q, inputs_path):
206206

207207
print(f"Raster {file_name} created successfully")
208208

209-
generate_image(file_name, search_csv(os.path.join(inputs_path, "data", "ranges"), "RH"), os.path.join(inputs_path, "data"), os.path.join(inputs_path, "shapefile", "limites_municipales_2001", "limite_municipal_2001.shp"))
209+
generate_image(file_name, search_csv(os.path.join(inputs_path, "data", "ranges"), "RH"), os.path.join(inputs_path, "data"), os.path.join(inputs_path, "shapefile", "limites_municipales", "limite_municipal.shp"))
210210

211211
return T2.replace("T2","RH")
212212

0 commit comments

Comments
 (0)