HydPy 6.2.dev1__tar.gz → 6.2.dev2__tar.gz

{hydpy-6.2.dev1 → hydpy-6.2.dev2/HydPy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: HydPy
-Version: 6.2.dev1
+Version: 6.2.dev2
 Summary: A framework for the development and application of hydrological models.
 Home-page: https://github.com/hydpy-dev/hydpy
 Author: HydPy Developers

{hydpy-6.2.dev1/HydPy.egg-info → hydpy-6.2.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: HydPy
-Version: 6.2.dev1
+Version: 6.2.dev2
 Summary: A framework for the development and application of hydrological models.
 Home-page: https://github.com/hydpy-dev/hydpy
 Author: HydPy Developers

{hydpy-6.2.dev1 → hydpy-6.2.dev2}/appveyor.yml

@@ -1,5 +1,5 @@
 
-version: 6.2dev1.{build}
+version: 6.2dev2.{build}
 
 image: Visual Studio 2019
 

{hydpy-6.2.dev1 → hydpy-6.2.dev2}/hydpy/__init__.py

@@ -117,7 +117,7 @@ from hydpy.exe.servertools import await_server, start_server
 from hydpy.exe.xmltools import XMLInterface, run_simulation, xml_validate
 
 
-__version__ = "6.2dev1"
+__version__ = "6.2dev2"
 
 pub.options = optiontools.Options()
 pub.indexer = indextools.Indexer()

{hydpy-6.2.dev1 → hydpy-6.2.dev2}/hydpy/docs/sphinx/conf.py

@@ -201,7 +201,7 @@ copyright = f"2013-{datetime.datetime.now().year}, HydPy Developers"
 # The short X.Y version.
 version = "6.2"
 # The full version, including alpha/beta/rc tags.
-release = "6.2dev1"
+release = "6.2dev2"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

{hydpy-6.2.dev1 → hydpy-6.2.dev2}/hydpy/models/whmod/whmod_control.py

@@ -161,7 +161,7 @@ class CisternCapacity(parametertools.Parameter):
 class InterceptionCapacity(parametertools.KeywordParameter2D):
     """Maximum interception storage [mm]."""
 
-    TYPE, TIME, SPAN = float, None, (0.0, 1.0)
+    TYPE, TIME, SPAN = float, None, (0.0, None)
 
     columnnames = parametertools.MonthParameter.entrynames
     rownames = whmod_constants.LANDTYPE_CONSTANTS.get_sortednames(

{hydpy-6.2.dev1 → hydpy-6.2.dev2}/hydpy/models/whmod_rural.py

@@ -663,11 +663,13 @@ layer:
 
 import numpy
 
+from hydpy.core import masktools
 from hydpy.core import modeltools
 from hydpy.core.typingtools import *
 from hydpy.exe.modelimports import *
 from hydpy.interfaces import aetinterfaces
 
+from hydpy.models.whmod import whmod_masks
 from hydpy.models.whmod import whmod_model
 from hydpy.models.whmod.whmod_constants import *
 
@@ -790,5 +792,11 @@ class Model(
         )
 
 
+class Masks(masktools.Masks):
+    """Masks applicable to |whmod_rural|."""
+
+    CLASSES = whmod_masks.Masks.CLASSES
+
+
 tester = Tester()
 cythonizer = Cythonizer()

{hydpy-6.2.dev1 → hydpy-6.2.dev2}/hydpy/models/whmod_urban.py

@@ -861,11 +861,13 @@ All snow processes are modelled exactly as by |whmod_rural| and described in the
 
 import numpy
 
+from hydpy.core import masktools
 from hydpy.core import modeltools
 from hydpy.core.typingtools import *
 from hydpy.exe.modelimports import *
 from hydpy.interfaces import aetinterfaces
 
+from hydpy.models.whmod import whmod_masks
 from hydpy.models.whmod import whmod_model
 from hydpy.models.whmod.whmod_constants import *
 
@@ -1007,5 +1009,11 @@ class Model(
         )
 
 
+class Masks(masktools.Masks):
+    """Masks applicable to |whmod_urban|."""
+
+    CLASSES = whmod_masks.Masks.CLASSES
+
+
 tester = Tester()
 cythonizer = Cythonizer()

{hydpy-6.2.dev1 → hydpy-6.2.dev2}/hydpy/models/wland_gd.py

@@ -770,13 +770,15 @@ ____________
 # import...
 # ...from HydPy
 from hydpy.exe.modelimports import *
+from hydpy.core import masktools
 from hydpy.core import modeltools
 from hydpy.core.typingtools import *
 from hydpy.interfaces import dischargeinterfaces
 from hydpy.interfaces import petinterfaces
 from hydpy.interfaces import stateinterfaces
 
-# ...from lland
+# ...from wland
+from hydpy.models.wland import wland_masks
 from hydpy.models.wland import wland_model
 from hydpy.models.wland import wland_solver
 from hydpy.models.wland.wland_constants import *
@@ -884,5 +886,11 @@ class Model(
     waterlevelmodel = modeltools.SubmodelProperty(stateinterfaces.WaterLevelModel_V1)
 
 
+class Masks(masktools.Masks):
+    """Masks applicable to |wland_gd|."""
+
+    CLASSES = wland_masks.Masks.CLASSES
+
+
 tester = Tester()
 cythonizer = Cythonizer()

{hydpy-6.2.dev1 → hydpy-6.2.dev2}/hydpy/models/wland_wag.py

@@ -1132,6 +1132,7 @@ There is no violation of the water balance:
 # import...
 # ...from HydPy
 from hydpy.exe.modelimports import *
+from hydpy.core import masktools
 from hydpy.core import modeltools
 from hydpy.core.typingtools import *
 from hydpy.interfaces import dischargeinterfaces
@@ -1139,6 +1140,7 @@ from hydpy.interfaces import petinterfaces
 from hydpy.interfaces import stateinterfaces
 
 # ...from wland
+from hydpy.models.wland import wland_masks
 from hydpy.models.wland import wland_model
 from hydpy.models.wland import wland_solver
 from hydpy.models.wland.wland_constants import *
@@ -1240,5 +1242,11 @@ class Model(
     waterlevelmodel = modeltools.SubmodelProperty(stateinterfaces.WaterLevelModel_V1)
 
 
+class Masks(masktools.Masks):
+    """Masks applicable to |wland_wag|."""
+
+    CLASSES = wland_masks.Masks.CLASSES
+
+
 tester = Tester()
 cythonizer = Cythonizer()

{hydpy-6.2.dev1 → hydpy-6.2.dev2}/make_hydpy_installer.cfgt

@@ -1,6 +1,6 @@
 [Application]
 name = HydPy
-version = 6.2dev1-cp[auto]-win_amd64
+version = 6.2dev2-cp[auto]-win_amd64
 entry_point = execute_exe:execute_scriptfunction
 console = true
 icon = logo.ico

{hydpy-6.2.dev1 → hydpy-6.2.dev2}/setup.py

@@ -22,7 +22,7 @@ extension_modules = [
 
 setuptools.setup(
     name="HydPy",
-    version="6.2dev1",
+    version="6.2dev2",
     description="A framework for the development and application of hydrological "
     "models.",
     long_description=long_description,