Commit 3e185dad authored by Rabotin Michael's avatar Rabotin Michael
Browse files

modified get.parms called yes

parent f5fdd223
......@@ -492,21 +492,21 @@ def main(parms_file, nbProc, generator=True):
data_list = []
mask_list = []
if parms.get('layer_overlay', 'dem') == 'x':
if parms.get('layer_overlay', 'dem') == 'yes':
print('----------------------------- Importing raster \'step1_dem_reclass.tif\'')
dem = 'dem'
grass_run_command('r.in.gdal', flags='o', input=dem_recl, output=dem, overwrite='True', stdout=DEVNULL, stderr=DEVNULL)
data_list.append('dem')
mask_list.append('dem_msk')
if parms.get('layer_overlay', 'slope') == 'x':
if parms.get('layer_overlay', 'slope') == 'yes':
print('----------------------------- Importing raster \'step1_slope_reclass.tif\'')
slp_recl = os.path.join(directory_out, 'step1_slope_reclass.tif')
grass_run_command('r.in.gdal', flags='o', input=slp_recl, output='slp', overwrite='True', stdout=DEVNULL, stderr=DEVNULL)
data_list.append('slp')
mask_list.append('slp_msk')
if parms.get('layer_overlay', 'aspect') == 'x':
if parms.get('layer_overlay', 'aspect') == 'yes':
print('----------------------------- Importing raster \'step1_aspect_reclass.tif\'')
asp_recl = os.path.join(directory_out, 'step1_aspect_reclass.tif')
grass_run_command('r.in.gdal', flags='o', input=asp_recl, output='asp', overwrite='True', stdout=DEVNULL, stderr=DEVNULL)
......
......@@ -492,7 +492,7 @@ def main(parms_file, nbProc, generator=False):
# Find maximum destination rate (need to be updated because of additiona 2 line header
# output adapted to requirements for Bjoern tool (see next)
if (parms.get('topology', 'dissolve_cycle')) == 'y':
if (parms.get('topology', 'dissolve_cycle')) == 'yes':
print('------------- Dissolve cycles -------------', time.strftime('%a, %d %b %Y, %H:%M:%S', time.localtime()))
# adaptation N1
topoToHruPath = os.path.join(tmpPath, 'topologie_to_hru.par')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment