Merge pull request #22 from gsflow/issue-21

Fixing Issue 21
gsflow · Oct 31, 2018 · f615988 · f615988
2 parents 67945e1 + 282f15c
commit f615988
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/scripts/dem_2_streams.py b/scripts/dem_2_streams.py
@@ -258,10 +258,10 @@ def flow_parameters(config_path, overwrite_flag=False, debug_flag=False):
         logging.error('\nERROR: Unsupported model point type(s) found, exiting')
         logging.error('\n  Model point types: {}\n'.format(model_point_types))
         sys.exit()
-##    elif not set(model_point_types).issubset(set(['OUTLET', 'SWALE'])):
-##        logging.error(
-##            '\nERROR: At least one model point must be an OUTLET or SWALE, '
-##            'exiting\n')
+    elif not set(model_point_types).intersection(set(['OUTLET', 'SWALE'])):
+        logging.error(
+            '\nERROR: At least one model point must be an OUTLET or SWALE, '
+            'exiting\n')
         sys.exit()
     else:
         logging.debug('  {}'.format(', '.join(model_point_types)))

diff --git a/scripts/dem_parameters.py b/scripts/dem_parameters.py
@@ -312,16 +312,14 @@ def dem_parameters(config_path, overwrite_flag=False, debug_flag=False):
         logging.error('\nERROR: Unsupported model point type(s) found, exiting')
         logging.error('\n  Model point types: {}\n'.format(model_point_types))
         sys.exit()
-    elif not set(model_point_types).issubset(set(['OUTLET', 'SWALE'])):
+    elif not set(model_point_types).intersection(set(['OUTLET', 'SWALE'])):
         logging.error(
             '\nERROR: At least one model point must be an OUTLET or SWALE, '
             'exiting\n')
         sys.exit()
     else:
         logging.debug('  {}'.format(', '.join(model_point_types)))
 
-
-
     # Check DEM field
     logging.info('\nAdding DEM fields if necessary')
     support.add_field_func(hru.polygon_path, hru.dem_mean_field, 'DOUBLE')

diff --git a/scripts/hru_parameters.py b/scripts/hru_parameters.py
@@ -540,8 +540,7 @@ def hru_parameters(config_path, overwrite_flag=False, debug_flag=False):
         logging.error('\nERROR: Unsupported model point type(s) found, exiting')
         logging.error('\n  Model point types: {}\n'.format(model_point_types))
         sys.exit()
-    elif 'OUTLET' not in model_point_types and 'SWALE' not in model_point_types:
-    #elif not set(model_point_types).issubset(set(['OUTLET', 'SWALE'])):
+    elif not set(model_point_types).intersection(set(['OUTLET', 'SWALE'])):
         logging.error(
             '\nERROR: At least one model point must be an OUTLET or SWALE, '
             'exiting\n')