From 2aaa40d07f1a9ec99d52a31045d6fc283c07dfe6 Mon Sep 17 00:00:00 2001
From: "jean.marcais" <jean.marcais@irstea.fr>
Date: Sat, 3 Apr 2021 15:22:38 +0200
Subject: [PATCH] Add option for user choice (fix directory changes)
---
extract_HydroSig.py | 41 +++++++++++++++++++++++++----------------
1 file changed, 25 insertions(+), 16 deletions(-)
diff --git a/extract_HydroSig.py b/extract_HydroSig.py
index e086217..3178fce 100644
--- a/extract_HydroSig.py
+++ b/extract_HydroSig.py
@@ -12,23 +12,31 @@ from Watershed import Watershed
-
+computer = 'jean'
# **************************** Data *****************************
+if(computer == 'laura'):
+ # Banque Hydro
+ banquehydro_foldername = 'C:/Users/laura.lindeperg/Documents/DonneesLaura/BanqueHydro/Export2020/'
+ # SAFRAN
+ safran_foldername = 'C:/Users/laura.lindeperg/Documents/DonneesLaura/Watersheds/SAFRAN/'
+ # GEOL
+ BDLisa_filepath = 'C:/Users/laura.lindeperg/Documents/DonneesLaura/Watersheds/GEOL/BDLisa/'
+ BRGM_filepath = 'C:/Users/laura.lindeperg/Documents/DonneesLaura/Watersheds/GEOL/BRGM/'
+ # Watersheds
+ shp_watersheds_path = 'C:/Users/laura.lindeperg/Documents/DonneesLaura/Watersheds/complete_df_wrong_geometries.shp'
+ shp_foldername = 'C:/Users/laura.lindeperg/Documents/DonneesLaura/Watersheds/GEOMETRY/'
+elif(computer== 'jean'):
+ # Banque Hydro
+ banquehydro_foldername = '/home/jean.marcais/Donnees/BanqueHydro/' #'/media/jean.marcais/My Passport/DonneesLaura/BanqueHydro/Export2020/'
+ # SAFRAN
+ safran_foldername = '/home/jean.marcais/Donnees/DonneesLaura/Watersheds/SAFRAN/' #'/media/jean.marcais/My Passport/DonneesLaura/SAFRAN/daily/'
+ # GEOL
+ BDLisa_filepath = '/home/jean.marcais/Donnees/DonneesLaura/Watersheds/GEOL/BDLisa/'
+ BRGM_filepath = '/home/jean.marcais/Donnees/DonneesLaura/Watersheds/GEOL/BRGM/'
+ # Watersheds
+ shp_watersheds_path = '/home/jean.marcais/Donnees/DonneesLaura/Watersheds/complete_df_wrong_geometries.shp'
+ shp_foldername = '/home/jean.marcais/Donnees/DonneesLaura/Watersheds/GEOMETRY/'
-# Banque Hydro
-banquehydro_foldername = 'C:/Users/laura.lindeperg/Documents/DonneesLaura/BanqueHydro/Export2020/'
-
-# SAFRAN
-safran_foldername = 'C:/Users/laura.lindeperg/Documents/DonneesLaura/Watersheds/SAFRAN/'
-
-# GEOL
-BDLisa_filepath = 'C:/Users/laura.lindeperg/Documents/DonneesLaura/Watersheds/GEOL/BDLisa/'
-
-BRGM_filepath = 'C:/Users/laura.lindeperg/Documents/DonneesLaura/Watersheds/GEOL/BRGM/'
-
-# Watersheds
-shp_watersheds_path = 'C:/Users/laura.lindeperg/Documents/DonneesLaura/Watersheds/complete_df_wrong_geometries.shp'
-shp_foldername = 'C:/Users/laura.lindeperg/Documents/DonneesLaura/Watersheds/GEOMETRY/'
shp_watersheds = gpd.read_file(shp_watersheds_path)
@@ -44,6 +52,7 @@ watershed_code = shp_watersheds.loc[:,'Code']
studied_watersheds = pd.DataFrame()
# for i in code_for_test:
for i in watershed_code:
+ print(i)
# Get the station's name
watershed_stations_i = shp_watersheds[shp_watersheds.loc[:, 'Code'] == i]
watershed_name_i = watershed_stations_i.loc[:, 'Nom'].values[0]
@@ -56,7 +65,7 @@ for i in watershed_code:
watershed_i.extract_banquehydro_discharge_timeseries(banquehydro_foldername)
safran_timeseries_i = pd.read_csv(safran_foldername+i+'_safran_timeseries.csv')
watershed_i.hydro_climatic_fluxes.safran_timeseries = safran_timeseries_i
- watershed_i.extract_hydrological_signatures()
+ watershed_i.extract_hydrological_signatures(adimensioned='yes')
watershed_i.extract_geologic_properties_from_filename(BDLisa_filepath+i+'_BDLisa.shp')
watershed_i.geologic_properties.extract_average_age_geology(BRGM_filepath+i+'_BRGM.shp')
--
GitLab