diff --git a/modules/hrudelin_3_hrugen.py b/modules/hrudelin_3_hrugen.py index 5354dae645cc998c452a106c332c2d6ab35fd05c..a92591aa8a9ca27e860d3c5931f71f8029073850 100755 --- a/modules/hrudelin_3_hrugen.py +++ b/modules/hrudelin_3_hrugen.py @@ -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) diff --git a/modules/hrudelin_parms_J2000.py b/modules/hrudelin_parms_J2000.py index c661b82c09e1ca981665289cd1922d2101f4c80b..4176dfcbbc876deb974cd5ea740377b18c6a11ad 100755 --- a/modules/hrudelin_parms_J2000.py +++ b/modules/hrudelin_parms_J2000.py @@ -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')