Commit a6511876 authored by POLCHER Jan's avatar POLCHER Jan 🚴🏾
Browse files

Conflicts resolved

parents 4a604f39 87085939
...@@ -176,6 +176,7 @@ class HydroGraph : ...@@ -176,6 +176,7 @@ class HydroGraph :
outnf.createDimension('bnd', nbcorners) outnf.createDimension('bnd', nbcorners)
outnf.createDimension('inflow', self.max_inflow) outnf.createDimension('inflow', self.max_inflow)
outnf.createDimension('stnperhtu', nlmax) outnf.createDimension('stnperhtu', nlmax)
outnf.createDimension('locations', nblocated)
else : else :
outnf = None outnf = None
# #
......
...@@ -213,7 +213,7 @@ class trunc: ...@@ -213,7 +213,7 @@ class trunc:
for k in range(len(self.landcorelist)): for k in range(len(self.landcorelist)):
changes = self.get_changes_step2(k, neigh_domain) changes = self.get_changes_step2(k, neigh_domain)
if len(changes)>1: if len(changes)>0:
for ch in changes: for ch in changes:
orig_ops = self.numops[self.landcorelist[k]] orig_ops = self.numops[self.landcorelist[k]]
if orig_ops < self.numop: if orig_ops < self.numop:
...@@ -243,7 +243,7 @@ class trunc: ...@@ -243,7 +243,7 @@ class trunc:
for k in range(len(self.landcorelist)): for k in range(len(self.landcorelist)):
changes = self.get_changes_step3(k, neigh_domain) changes = self.get_changes_step3(k, neigh_domain)
if len(changes)>1: if len(changes)>0:
for ch in changes: for ch in changes:
orig_ops = self.numops[self.landcorelist[k]] orig_ops = self.numops[self.landcorelist[k]]
if orig_ops < self.numop: if orig_ops < self.numop:
......
...@@ -19,7 +19,7 @@ nbasmax = 3 ...@@ -19,7 +19,7 @@ nbasmax = 3
# #
# Number of operation of simplification performed together # Number of operation of simplification performed together
# #
numop = 10 numop = 20
# #
# Output # Output
# #
......
...@@ -15,7 +15,7 @@ Documentation = true ...@@ -15,7 +15,7 @@ Documentation = true
# #
# Configuration for the graph to be generated # Configuration for the graph to be generated
# #
nbasmax = 4 nbasmax = 3
# #
# Number of operation of simplification performed together # Number of operation of simplification performed together
# #
......
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