Changed default param db search type

Problem found at NCSA workshop param_db.search(self.param_const.SEARCH_TYPE_CONSTRAINED
selimnairb · Sep 29, 2016 · 4fa2849 · 4fa2849
1 parent 3225adf
commit 4fa2849
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/rhessysworkflows/command/giconverter.py b/rhessysworkflows/command/giconverter.py
@@ -517,8 +517,12 @@ def _generate_parameter_definitions_for_raster(self, raster_name, raster_type_na
             if verbose:
                 self.outfp.write("\n{rast_type} '{cat}' has dn {dn}".format(rast_type=raster_type_name,
                                                                             cat=key, dn=raster_vals[key]))
-            params_found = self.param_db.search(self.param_const.SEARCH_TYPE_HIERARCHICAL, None, key, None, None, None,
+            #Problem found with soil hierarchy      
+            #params_found = self.param_db.search(self.param_const.SEARCH_TYPE_HIERARCHICAL, None, key, None, None, None,
+            #                                    None, None, None, None, None,
+            #                                    defaultIdOverride=raster_vals[key])
+            params_found = self.param_db.search(self.param_const.SEARCH_TYPE_CONSTRAINED, None, key, None, None, None,
                                                 None, None, None, None, None,
-                                                defaultIdOverride=raster_vals[key])
+                                                defaultIdOverride=raster_vals[key])            
             assert(params_found)
-            self.param_db.writeParamFileForClass(self.paths.RHESSYS_DEF)
+            self.param_db.writeParamFileForClass(self.paths.RHESSYS_DEF)