diff --git a/data_exemple_ardeche/boundaries.cpg b/data_exemple_ardeche/boundaries.cpg index 1e59c84a3a5150b77a9a325861bcd9cc79d709ea..3ad133c048f2189041151425a73485649e6c32c0 100644 --- a/data_exemple_ardeche/boundaries.cpg +++ b/data_exemple_ardeche/boundaries.cpg @@ -1 +1 @@ -420 \ No newline at end of file +UTF-8 \ No newline at end of file diff --git a/data_exemple_ardeche/boundaries.dbf b/data_exemple_ardeche/boundaries.dbf index d320863ae0adb14a337d3774af2bb707cbdea205..be69806bfd723374d84ea3642e03a713f7bf9a2f 100644 Binary files a/data_exemple_ardeche/boundaries.dbf and b/data_exemple_ardeche/boundaries.dbf differ diff --git a/data_exemple_ardeche/boundaries.prj b/data_exemple_ardeche/boundaries.prj index 5adb2a9108a4bd847464a2c506a40c8d199faa69..ae0206b68de2ed81139b89a08ddd36a6b0ed7e35 100644 --- a/data_exemple_ardeche/boundaries.prj +++ b/data_exemple_ardeche/boundaries.prj @@ -1 +1 @@ -PROJCS["RGF93_Lambert_93",GEOGCS["GCS_RGF93",DATUM["D_RGF_1993",SPHEROID["GRS_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["standard_parallel_1",49],PARAMETER["standard_parallel_2",44],PARAMETER["latitude_of_origin",46.5],PARAMETER["central_meridian",3],PARAMETER["false_easting",700000],PARAMETER["false_northing",6600000],UNIT["Meter",1]] \ No newline at end of file +PROJCS["RGF_1993_Lambert_93",GEOGCS["GCS_RGF_1993",DATUM["D_RGF_1993",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",700000.0],PARAMETER["False_Northing",6600000.0],PARAMETER["Central_Meridian",3.0],PARAMETER["Standard_Parallel_1",49.0],PARAMETER["Standard_Parallel_2",44.0],PARAMETER["Latitude_Of_Origin",46.5],UNIT["Meter",1.0]] \ No newline at end of file diff --git a/data_exemple_ardeche/boundaries.qpj b/data_exemple_ardeche/boundaries.qpj deleted file mode 100644 index 52a60bf44d9f6d1ad3e986837ac8859cf97d222f..0000000000000000000000000000000000000000 --- a/data_exemple_ardeche/boundaries.qpj +++ /dev/null @@ -1 +0,0 @@ -PROJCS["RGF93 / Lambert-93",GEOGCS["RGF93",DATUM["Reseau_Geodesique_Francais_1993",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6171"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4171"]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",49],PARAMETER["standard_parallel_2",44],PARAMETER["latitude_of_origin",46.5],PARAMETER["central_meridian",3],PARAMETER["false_easting",700000],PARAMETER["false_northing",6600000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["X",EAST],AXIS["Y",NORTH],AUTHORITY["EPSG","2154"]] diff --git a/data_exemple_ardeche/boundaries.shp b/data_exemple_ardeche/boundaries.shp index 9d60e33e27a3ae3cf4c004f896ac9897e7c3449c..aacf2e5fae2a240c597b93df18323569eac743e9 100644 Binary files a/data_exemple_ardeche/boundaries.shp and b/data_exemple_ardeche/boundaries.shp differ diff --git a/data_exemple_ardeche/boundaries.shx b/data_exemple_ardeche/boundaries.shx index 97210e07e8c004bea37bc9faac3c2745202e1bc3..8df27f6d595741a1b6b170521178bc86658b270e 100644 Binary files a/data_exemple_ardeche/boundaries.shx and b/data_exemple_ardeche/boundaries.shx differ diff --git a/data_exemple_ardeche/dams.dbf b/data_exemple_ardeche/dams.dbf index 67a9667b602addae33fb7a12bb42a8456253c8fa..d7093abb73207ec3f9ad4104155bd9504562a206 100644 Binary files a/data_exemple_ardeche/dams.dbf and b/data_exemple_ardeche/dams.dbf differ diff --git a/data_exemple_ardeche/dams.prj b/data_exemple_ardeche/dams.prj index f904335fe5023555790abfa69e50304e1cf3fa1f..ae0206b68de2ed81139b89a08ddd36a6b0ed7e35 100644 --- a/data_exemple_ardeche/dams.prj +++ b/data_exemple_ardeche/dams.prj @@ -1 +1 @@ -PROJCS["RGF93_Lambert_93",GEOGCS["GCS_RGF93_geographiques_dms",DATUM["D_RGF_1993",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",700000.0],PARAMETER["False_Northing",6600000.0],PARAMETER["Central_Meridian",3.0],PARAMETER["Standard_Parallel_1",44.0],PARAMETER["Standard_Parallel_2",49.0],PARAMETER["Latitude_Of_Origin",46.5],UNIT["Meter",1.0]] \ No newline at end of file +PROJCS["RGF_1993_Lambert_93",GEOGCS["GCS_RGF_1993",DATUM["D_RGF_1993",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",700000.0],PARAMETER["False_Northing",6600000.0],PARAMETER["Central_Meridian",3.0],PARAMETER["Standard_Parallel_1",49.0],PARAMETER["Standard_Parallel_2",44.0],PARAMETER["Latitude_Of_Origin",46.5],UNIT["Meter",1.0]] \ No newline at end of file diff --git a/data_exemple_ardeche/dams.shp b/data_exemple_ardeche/dams.shp index 4a4b4ce68cdcb063c49e9f39c7331a9ca4699f75..327b99c117a3dfe517123180c6853dfdcb808b11 100644 Binary files a/data_exemple_ardeche/dams.shp and b/data_exemple_ardeche/dams.shp differ diff --git a/data_exemple_ardeche/dams.shx b/data_exemple_ardeche/dams.shx index baab8dabafc419a4e71eb8547d65b71de69f85fc..e024b7e3c2776e5d5ee70e875f0887f825486746 100644 Binary files a/data_exemple_ardeche/dams.shx and b/data_exemple_ardeche/dams.shx differ diff --git a/data_exemple_ardeche/gauges.dbf b/data_exemple_ardeche/gauges.dbf index 21433e931c27a9cf221fcdf167e923326283f00d..2de2ca2c05275de95e566676f030f7d6b759dcd8 100644 Binary files a/data_exemple_ardeche/gauges.dbf and b/data_exemple_ardeche/gauges.dbf differ diff --git a/data_exemple_ardeche/gauges.prj b/data_exemple_ardeche/gauges.prj index f904335fe5023555790abfa69e50304e1cf3fa1f..ae0206b68de2ed81139b89a08ddd36a6b0ed7e35 100644 --- a/data_exemple_ardeche/gauges.prj +++ b/data_exemple_ardeche/gauges.prj @@ -1 +1 @@ -PROJCS["RGF93_Lambert_93",GEOGCS["GCS_RGF93_geographiques_dms",DATUM["D_RGF_1993",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",700000.0],PARAMETER["False_Northing",6600000.0],PARAMETER["Central_Meridian",3.0],PARAMETER["Standard_Parallel_1",44.0],PARAMETER["Standard_Parallel_2",49.0],PARAMETER["Latitude_Of_Origin",46.5],UNIT["Meter",1.0]] \ No newline at end of file +PROJCS["RGF_1993_Lambert_93",GEOGCS["GCS_RGF_1993",DATUM["D_RGF_1993",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",700000.0],PARAMETER["False_Northing",6600000.0],PARAMETER["Central_Meridian",3.0],PARAMETER["Standard_Parallel_1",49.0],PARAMETER["Standard_Parallel_2",44.0],PARAMETER["Latitude_Of_Origin",46.5],UNIT["Meter",1.0]] \ No newline at end of file diff --git a/data_exemple_ardeche/gauges.shp b/data_exemple_ardeche/gauges.shp index 39bd431a03d686fcb9c9205c222b1e455f3c8ba0..10221b911d7d09bc1ee72f820d2198d71e41dfdf 100644 Binary files a/data_exemple_ardeche/gauges.shp and b/data_exemple_ardeche/gauges.shp differ diff --git a/data_exemple_ardeche/gauges.shx b/data_exemple_ardeche/gauges.shx index a1870da10deaab81a6e7232166a14aab7db7427a..ce3e8cba4e891a856438e1b8604e18bc5226e031 100644 Binary files a/data_exemple_ardeche/gauges.shx and b/data_exemple_ardeche/gauges.shx differ diff --git a/data_exemple_ardeche/hrudelin_config.cfg b/data_exemple_ardeche/hrudelin_config.cfg new file mode 100644 index 0000000000000000000000000000000000000000..12a89cba5c604773d95694f892c490080d061200 --- /dev/null +++ b/data_exemple_ardeche/hrudelin_config.cfg @@ -0,0 +1,159 @@ +# ----------- +# environment +# ----------- + +[dir_in] +dir: + +[dem] +dem: + + +[data] +hgeo: +landuse: +soil: + + +[gauges] +gauges: +#for watershed ID, used for identification of watersheds +gauges_col_name= +# drained surface +gauges_area_col_name= +relocated_gauges= + + +[irrigation] +# yes or no +to_do: +irrigation: +irrig_col_name= +#for irrig_col_type, 2 for groundwater and 3 for surfaceirrig_col_type= + +# you can indicate a minimum surface value for an HRU to be a GU: +#minimum surface can be null, global (irrig_surf_min_GU) or spatialized (irrig_col_min_GU) +irrig_surf_min_GU= +irrig_col_min_GU= +#you can specify a maximum distance search for GU (default is 5000 m +irrig_distance_GU=5000 + +irrigation_sector: +irrig_sector_col_name= +irrig_col_sau_irr= +irrig_col_dom_sau_irr= +irrigation_table: +relocated_irrigation= + +[dams] +# yes or no +to_do: +dams= +dams_col_name= +dams_smax= +dams_s0= +#drained surface +dams_area_col_name= +relocated_dams= + +[dir_out] +files: +results: +# ------------------------- +# 1st step : hru-delin_init +# ------------------------- + +[surface] +#selection: total -> full dem +# polygon -> polygon: name of the shapefile +# coords -> give the coords upper left (west and north) and lower right (east and south) +selection: +polygon: +west: +north: +east: +south: + + +[demfill] +# +# if demfill = yes : depressionless DEM will be generated +# no : no action on input DEM +# +demfill: + +# +# if rules_auto_* = yes : rules will be calculated by the module +# if no : fill the corresponding file (reclass_default_rules_*) +# +[reclass_dem] +rules_auto_dem: +step_dem: + +[reclass_slope] +rules_auto_slope: + +[reclass_aspect] +rules_auto_aspect: + +[basin_min_size] +# minimum size of calculated watersheds (r.watershed) +# number of pixels +# size = N = SURFACE_km2 / ( RES_km2^2 ) +# ex: S = 10km2, RES = 200m = 0.2 km ==> N = 250 pixels +# S = 20km2, RES = 90m = 0.09 km ==> N = 2469 pixels +size= + +# --------------------------- +# 2nd step : hru-delin_basins +# --------------------------- +# So it's possible to specify a variable using : or = ??? +[auto_relocation] +# yes or no +to_do: +# -------- first rule +# surface is in percent! +# distance is in pixels: N = D / RES +# example: for 3km distance with a 50m DEM, the number of pixel is: 3000/50 = 33 pixels +surface_tolerance_1= +distance_tolerance_1= +# -------- second rule +# second rule with a distance tolerance of 6km and a surface tolerance of 30% +surface_tolerance_2= +distance_tolerance_2=120 + +# unit = 1 : m , = 2 : km +area_unit= + + + +# --------------------------- +# 3rd step : hru-delin_hrugen +# --------------------------- + +[hrus_min_surface] +# there, this is in pixel so pay attention to the DEM resolution +# same as for bassin_min_size: N = SURFACE_km2 / ( RES_km2^2 ) # see 'size' parameter in step 1 for examples +# 2 km2 = 247 pixels +surface= + +# +# MNT-derived layers to be integrated in the overlay operation +# +[layer_overlay] +# yes or no +dem: +slope: +aspect: + +# -------------------------------- +# 4th step : hru-delin_parms_J2000 +# -------------------------------- +# yes or no +[topology] +dissolve_cycle: +hru_no_topology_log: +OF_domain_export: +[hru_param] +hru_cat: +hru_landuse: diff --git a/data_exemple_ardeche/hrudelin_config_ardeche.cfg b/data_exemple_ardeche/hrudelin_config_ardeche.cfg index b0d6f437d754c4f985e5b0735726fad81899d31f..47a10272327f63e4f6dbd17bee5bfdfaff80a516 100644 --- a/data_exemple_ardeche/hrudelin_config_ardeche.cfg +++ b/data_exemple_ardeche/hrudelin_config_ardeche.cfg @@ -3,7 +3,7 @@ # ----------- [dir_in] -dir:/home/michael.rabotin/temporaires/ardeche/hru-delin-test_ardeche +dir:/home/michael.rabotin/temporaires/ardeche/data_exemple_ardeche [dem] dem:ih_ardeche_dem50m_grass_1.tif @@ -56,8 +56,8 @@ dams_area_col_name=S_BH relocated_dams= [dir_out] -files:/home/michael.rabotin/temporaires/ardeche/hru-delin-test_ardeche/out_files -results:/home/michael.rabotin/temporaires/ardeche/hru-delin-test_ardeche/out_results +files:/home/michael.rabotin/temporaires/ardeche/data_exemple_ardeche/out_files +results:/home/michael.rabotin/temporaires/ardeche/data_exemple_ardeche/out_results # ------------------------- # 1st step : hru-delin_init # ------------------------- @@ -139,15 +139,21 @@ surface=1000 # MNT-derived layers to be integrated in the overlay operation # [layer_overlay] -dem:x -slope:x -aspect:x +dem:yes +slope:yes +aspect:yes # -------------------------------- # 4th step : hru-delin_parms_J2000 # -------------------------------- +# yes or no [topology] -dissolve_cycle:y +dissolve_cycle:yes +hru_no_topology_log:yes +OF_domain_export:yes +[hru_param] +hru_cat:no +hru_landuse:no diff --git a/data_exemple_ardeche/ih_ardeche_dem50m_grass_1.tif b/data_exemple_ardeche/ih_ardeche_dem50m_grass_1.tif index 584209ecb7a3771a62898cf1b283341d939928ac..1d8961944a2f200caa84d039f59f28c0f19ee72d 100644 Binary files a/data_exemple_ardeche/ih_ardeche_dem50m_grass_1.tif and b/data_exemple_ardeche/ih_ardeche_dem50m_grass_1.tif differ diff --git a/data_exemple_ardeche/ih_ardeche_geology_1.tif b/data_exemple_ardeche/ih_ardeche_geology_1.tif index 69349f5ca0b0a2dedc002d759efdee9ca21d2a9f..d6d8512204b1a91da95e7ba8b14ed4e9f4389d1a 100644 Binary files a/data_exemple_ardeche/ih_ardeche_geology_1.tif and b/data_exemple_ardeche/ih_ardeche_geology_1.tif differ diff --git a/data_exemple_ardeche/ih_ardeche_geology_1.tif.aux.xml b/data_exemple_ardeche/ih_ardeche_geology_1.tif.aux.xml deleted file mode 100644 index 344a727a713e938c89b6018c93074173c3a93cbf..0000000000000000000000000000000000000000 --- a/data_exemple_ardeche/ih_ardeche_geology_1.tif.aux.xml +++ /dev/null @@ -1,11 +0,0 @@ -<PAMDataset> - <PAMRasterBand band="1"> - <Metadata> - <MDI key="STATISTICS_MAXIMUM">8</MDI> - <MDI key="STATISTICS_MEAN">4.0402148216672</MDI> - <MDI key="STATISTICS_MINIMUM">0</MDI> - <MDI key="STATISTICS_STDDEV">2.321907533606</MDI> - <MDI key="STATISTICS_VALID_PERCENT">100</MDI> - </Metadata> - </PAMRasterBand> -</PAMDataset> diff --git a/data_exemple_ardeche/ih_ardeche_soil_1.tif b/data_exemple_ardeche/ih_ardeche_soil_1.tif index e382040e1fdb26f041f18dfb655d9180d585e28d..6171d45b07599c97226812cfea48bf4ddebaa516 100644 Binary files a/data_exemple_ardeche/ih_ardeche_soil_1.tif and b/data_exemple_ardeche/ih_ardeche_soil_1.tif differ diff --git a/data_exemple_ardeche/ih_ardeche_stations_dams_4.cpg b/data_exemple_ardeche/ih_ardeche_stations_dams_4.cpg new file mode 100644 index 0000000000000000000000000000000000000000..3ad133c048f2189041151425a73485649e6c32c0 --- /dev/null +++ b/data_exemple_ardeche/ih_ardeche_stations_dams_4.cpg @@ -0,0 +1 @@ +UTF-8 \ No newline at end of file diff --git a/data_exemple_ardeche/ih_ardeche_stations_dams_4.dbf b/data_exemple_ardeche/ih_ardeche_stations_dams_4.dbf index c6fe95a1e6555157e883ac58147c1bc143063f92..5edf56a51e23f267123e94c41a4bcd682f978e6d 100644 Binary files a/data_exemple_ardeche/ih_ardeche_stations_dams_4.dbf and b/data_exemple_ardeche/ih_ardeche_stations_dams_4.dbf differ diff --git a/data_exemple_ardeche/ih_ardeche_stations_dams_4.prj b/data_exemple_ardeche/ih_ardeche_stations_dams_4.prj index 5adb2a9108a4bd847464a2c506a40c8d199faa69..ae0206b68de2ed81139b89a08ddd36a6b0ed7e35 100644 --- a/data_exemple_ardeche/ih_ardeche_stations_dams_4.prj +++ b/data_exemple_ardeche/ih_ardeche_stations_dams_4.prj @@ -1 +1 @@ -PROJCS["RGF93_Lambert_93",GEOGCS["GCS_RGF93",DATUM["D_RGF_1993",SPHEROID["GRS_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["standard_parallel_1",49],PARAMETER["standard_parallel_2",44],PARAMETER["latitude_of_origin",46.5],PARAMETER["central_meridian",3],PARAMETER["false_easting",700000],PARAMETER["false_northing",6600000],UNIT["Meter",1]] \ No newline at end of file +PROJCS["RGF_1993_Lambert_93",GEOGCS["GCS_RGF_1993",DATUM["D_RGF_1993",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",700000.0],PARAMETER["False_Northing",6600000.0],PARAMETER["Central_Meridian",3.0],PARAMETER["Standard_Parallel_1",49.0],PARAMETER["Standard_Parallel_2",44.0],PARAMETER["Latitude_Of_Origin",46.5],UNIT["Meter",1.0]] \ No newline at end of file diff --git a/data_exemple_ardeche/ih_ardeche_stations_dams_4.qpj b/data_exemple_ardeche/ih_ardeche_stations_dams_4.qpj deleted file mode 100644 index 52a60bf44d9f6d1ad3e986837ac8859cf97d222f..0000000000000000000000000000000000000000 --- a/data_exemple_ardeche/ih_ardeche_stations_dams_4.qpj +++ /dev/null @@ -1 +0,0 @@ -PROJCS["RGF93 / Lambert-93",GEOGCS["RGF93",DATUM["Reseau_Geodesique_Francais_1993",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6171"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4171"]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",49],PARAMETER["standard_parallel_2",44],PARAMETER["latitude_of_origin",46.5],PARAMETER["central_meridian",3],PARAMETER["false_easting",700000],PARAMETER["false_northing",6600000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["X",EAST],AXIS["Y",NORTH],AUTHORITY["EPSG","2154"]] diff --git a/data_exemple_ardeche/ih_ardeche_stations_dams_4.shp b/data_exemple_ardeche/ih_ardeche_stations_dams_4.shp index 8ace024f1fb5de39a3d28538c0db77090a2444a3..815f7ae536555c74200dd11ad715828f6ce7c56c 100644 Binary files a/data_exemple_ardeche/ih_ardeche_stations_dams_4.shp and b/data_exemple_ardeche/ih_ardeche_stations_dams_4.shp differ diff --git a/data_exemple_ardeche/ih_ardeche_stations_dams_4.shx b/data_exemple_ardeche/ih_ardeche_stations_dams_4.shx index cedd35828a61ecce184c0cfae843ea072a2a0507..264c3129e6216f0ec84dbd5b43656472d2a95479 100644 Binary files a/data_exemple_ardeche/ih_ardeche_stations_dams_4.shx and b/data_exemple_ardeche/ih_ardeche_stations_dams_4.shx differ diff --git a/modules/hrudelin_parms_J2000.py b/modules/hrudelin_parms_J2000.py index fdf723167435b564bd3ecb2d6218865e3b63b2bf..c661b82c09e1ca981665289cd1922d2101f4c80b 100755 --- a/modules/hrudelin_parms_J2000.py +++ b/modules/hrudelin_parms_J2000.py @@ -943,9 +943,9 @@ def main(parms_file, nbProc, generator=False): if (parms.get('topology', 'hru_no_topology_log')) == 'yes': - print('------------- Export HRU with no topology in hru_with_no_toology.par -------------') + print('------------- Export HRU with no topology in hru_with_no_topology.par -------------') # export in csv the hru with no topology (no downstream reach and hru) - notopology_file = os.path.join(dir_results, 'hru_with_no_toology.par') + notopology_file = os.path.join(dir_results, 'hru_with_no_topology.par') grass_run_command('v.db.select', flags='c', map='hrus_c_pnt', columns='cat', where='to_reach IS NULL AND to_poly IS NULL', file=notopology_file, overwrite=True)