Minor interface change. Version 1.2.1

dalmo1991 · Apr 17, 2021 · 7acd5ea · 7acd5ea
1 parent f317f6b
commit 7acd5ea
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 setuptools.setup(
     name='superflexpy',
-    version='1.2.0',
+    version='1.2.1',
     author='Marco Dal Molin, Fabrizio Fenicia, Dmitri Kavetski',
     author_email='marco.dalmolin.1991@gmail.com',
     description='Framework for building hydrological models',

diff --git a/superflexpy/framework/network.py b/superflexpy/framework/network.py
@@ -36,7 +36,7 @@ class Network(GenericComponent):
     tree.
     """
 
-    def __init__(self, nodes, topography):
+    def __init__(self, nodes, topology):
         """
         This is the initializer of the class Network.
 
@@ -45,8 +45,8 @@ def __init__(self, nodes, topography):
         nodes : list(superflexpy.framework.node.Node)
             List of nodes that belongs to the network. The order is not
             important.
-        topography : dict(str : str)
-            Topography of the network. Keys are the id of the nodes and values
+        topology : dict(str : str)
+            Topology of the network. Keys are the id of the nodes and values
             are the id of the downstream node the key. Since the network must
             be a tree, each key has only one downstream element
         """
@@ -60,7 +60,7 @@ def __init__(self, nodes, topography):
                 raise TypeError(message)
 
         self._content = nodes
-        self._downstream = topography
+        self._downstream = topology
 
         self._build_network()
 
@@ -69,7 +69,7 @@ def __init__(self, nodes, topography):
     def get_output(self, solve=True):
         """
         This method solves the network, solving each node and putting together
-        their outputs according to the topography of the network.
+        their outputs according to the topology of the network.
 
         Parameters
         ----------

diff --git a/superflexpy/implementation/models/thur_M2.py b/superflexpy/implementation/models/thur_M2.py
@@ -237,7 +237,7 @@
         stgallen,
         waengi,
     ],
-    topography={
+    topology={
         'andelfingen': None,
         'appenzell': 'stgallen',
         'frauenfeld': 'andelfingen',

diff --git a/test/unittest/06_3Cats_2HRUs.py b/test/unittest/06_3Cats_2HRUs.py
@@ -112,7 +112,7 @@ def _init_model(self, solver):
 
         # Define the network
         net = Network(nodes = [cat1, cat2, cat3],
-                      topography = {
+                      topology = {
                         'Cat1' : 'Cat3',
                         'Cat2' : 'Cat3',
                         'Cat3' : None,