HydPy 6.3.2__tar.gz → 6.4.0__tar.gz

{hydpy-6.3.2 → hydpy-6.4.0}/HydPy.egg-info/PKG-INFO

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

{hydpy-6.3.2 → hydpy-6.4.0}/PKG-INFO

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

{hydpy-6.3.2 → hydpy-6.4.0}/hydpy/__init__.py

@@ -116,7 +116,7 @@ from hydpy.exe.replacetools import xml_replace
 from hydpy.exe.servertools import await_server, start_server
 from hydpy.exe.xmltools import XMLInterface, run_simulation, xml_validate
 
-__version__ = "6.3.2"
+__version__ = "6.4.0"
 
 pub.options = optiontools.Options()
 pub.indexer = indextools.Indexer()

{hydpy-6.3.2 → hydpy-6.4.0}/hydpy/core/filetools.py

@@ -687,8 +687,8 @@ Attribute projectname of module `pub` is not defined at the moment.
 
     @property
     def filenames(self) -> list[str]:
-        """The names of the files in the current working directory, except those
-        starting with an underscore.
+        """The names of the Python files in the current working directory, except those
+        starting with an underscore (_) or a dot (.).
 
         >>> from hydpy.core.filetools import FileManager
         >>> filemanager = FileManager()
@@ -699,12 +699,16 @@ Attribute projectname of module `pub` is not defined at the moment.
         ...     filemanager.currentdir = "testdir"
         ...     open("projectname/basename/testdir/file1.txt", "w").close()
         ...     open("projectname/basename/testdir/file2.npy", "w").close()
-        ...     open("projectname/basename/testdir/_file1.nc", "w").close()
+        ...     open("projectname/basename/testdir/_file1.py", "w").close()
+        ...     open("projectname/basename/testdir/.file1.py", "w").close()
+        ...     open("projectname/basename/testdir/file3.py", "w").close()
         ...     filemanager.filenames
-        ['file1.txt', 'file2.npy']
+        ['file3.py']
         """
         return sorted(
-            fn for fn in os.listdir(self.currentpath) if not fn.startswith("_")
+            fn
+            for fn in os.listdir(self.currentpath)
+            if not fn.startswith(("_", ".")) and fn.endswith(".py")
         )
 
     @property
@@ -721,11 +725,12 @@ Attribute projectname of module `pub` is not defined at the moment.
         ...     filemanager.currentdir = "testdir"
         ...     open("projectname/basename/testdir/file1.txt", "w").close()
         ...     open("projectname/basename/testdir/file2.npy", "w").close()
-        ...     open("projectname/basename/testdir/_file1.nc", "w").close()
+        ...     open("projectname/basename/testdir/_file1.py", "w").close()
+        ...     open("projectname/basename/testdir/.file1.py", "w").close()
+        ...     open("projectname/basename/testdir/file3.py", "w").close()
         ...     for filepath in filemanager.filepaths:
         ...         repr_(filepath)  # doctest: +ELLIPSIS
-        '...hydpy/tests/iotesting/projectname/basename/testdir/file1.txt'
-        '...hydpy/tests/iotesting/projectname/basename/testdir/file2.npy'
+        '...hydpy/tests/iotesting/projectname/basename/testdir/file3.py'
         """
         path = self.currentpath
         return [os.path.join(path, name) for name in self.filenames]
@@ -739,7 +744,7 @@ Attribute projectname of module `pub` is not defined at the moment.
         possible inconsistencies.
 
         As an example scenario, we prepare a |FileManager| object with the current
-        working directory `folder` containing the files `test1.txt` and `text2.txt`:
+        working directory `folder` containing the files `test1.py` and `text2.py`:
 
         >>> from hydpy.core.filetools import FileManager
         >>> filemanager = FileManager()
@@ -753,10 +758,10 @@ Attribute projectname of module `pub` is not defined at the moment.
         >>> with TestIO():
         ...     os.makedirs(basepath)
         ...     filemanager.currentdir = "folder"
-        ...     open(f"{basepath}/folder/file1.txt", "w").close()
-        ...     open(f"{basepath}/folder/file2.txt", "w").close()
+        ...     open(f"{basepath}/folder/file1.py", "w").close()
+        ...     open(f"{basepath}/folder/file2.py", "w").close()
         ...     filemanager.filenames
-        ['file1.txt', 'file2.txt']
+        ['file1.py', 'file2.py']
 
         The directories under the base path are identical to the ones returned by
         property |FileManager.availabledirs|:
@@ -781,7 +786,7 @@ Attribute projectname of module `pub` is not defined at the moment.
         >>> from zipfile import ZipFile
         >>> with TestIO():
         ...     with ZipFile("projectname/basename/folder.zip", "r") as zp:
-        ...         assert sorted(zp.namelist()) == ["file1.txt", "file2.txt"]
+        ...         assert sorted(zp.namelist()) == ["file1.py", "file2.py"]
 
         The zip file is unpacked again when `folder` becomes the current working
         directory:
@@ -789,7 +794,7 @@ Attribute projectname of module `pub` is not defined at the moment.
         >>> with TestIO(), pub.options.printprogress(True):  # doctest: +ELLIPSIS
         ...     filemanager.currentdir = "folder"
         ...     assert os.listdir(basepath) == ["folder"]
-        ...     assert sorted(filemanager.filenames) == ["file1.txt", "file2.txt"]
+        ...     assert sorted(filemanager.filenames) == ["file1.py", "file2.py"]
         ...     filemanager.availabledirs
         The zip file ...folder.zip has been extracted to directory ...folder and \
 removed.
@@ -1832,6 +1837,31 @@ not allowed to overwrite the existing file `...`.
     _netcdfwriter: netcdftools.NetCDFInterfaceWriter | None = None
     _jitaccesshandler: netcdftools.JITAccessHandler | None = None
 
+    @property
+    def filenames(self) -> list[str]:
+        """The names of valid series files (.nc, .npy, .asc) in the current working
+        directory, except those starting with an underscore (_) or a dot (.).
+
+        >>> from hydpy.core.filetools import SequenceManager
+        >>> sequencemanager = SequenceManager()
+        >>> sequencemanager.BASEDIR = "basename"
+        >>> sequencemanager.projectdir = "projectname"
+        >>> from hydpy import TestIO
+        >>> with TestIO():
+        ...     sequencemanager.currentdir = "testdir"
+        ...     open("projectname/basename/testdir/file1.txt", "w").close()
+        ...     open("projectname/basename/testdir/file2.npy", "w").close()
+        ...     open("projectname/basename/testdir/_file1.nc", "w").close()
+        ...     open("projectname/basename/testdir/.file1.asc", "w").close()
+        ...     sequencemanager.filenames
+        ['file2.npy']
+        """
+        return sorted(
+            fn
+            for fn in os.listdir(self.currentpath)
+            if not fn.startswith(("_", ".")) and fn.endswith((".npy", ".nc", ".asc"))
+        )
+
     def load_file(self, sequence: sequencetools.IOSequence) -> None:
         """Load data from a data file and pass it to the given |IOSequence|."""
         try:

{hydpy-6.3.2 → hydpy-6.4.0}/hydpy/cythons/autogen/c_meteo.pyx

@@ -558,14 +558,19 @@ cdef class Model:
             self.sequences.fluxes.dailyglobalradiation = self.sequences.fluxes.dailyglobalradiation + (self.sequences.logs.loggedglobalradiation[idx])
         self.sequences.fluxes.dailyglobalradiation = self.sequences.fluxes.dailyglobalradiation / (self.parameters.derived.nmblogentries)
     cpdef inline void calc_extraterrestrialradiation_v1(self) noexcept nogil:
-        cdef double d_omega2
-        cdef double d_omega1
-        cdef double d_delta
+        cdef double omega2
+        cdef double omega1
+        cdef double delta
         if self.parameters.derived.days < 1.0:
-            d_delta = self.parameters.fixed.pi * self.parameters.derived.days
-            d_omega1 = self.sequences.factors.solartimeangle - d_delta
-            d_omega2 = self.sequences.factors.solartimeangle + d_delta
-            self.sequences.fluxes.extraterrestrialradiation = max(                (12.0 * self.parameters.fixed.solarconstant / self.parameters.fixed.pi * self.sequences.factors.earthsundistance)                * (                    (                        (d_omega2 - d_omega1)                        * sin(self.parameters.derived.latituderad)                        * sin(self.sequences.factors.solardeclination)                    )                    + (                        cos(self.parameters.derived.latituderad)                        * cos(self.sequences.factors.solardeclination)                        * (sin(d_omega2) - sin(d_omega1))                    )                ),                0.0,            )
+            delta = self.parameters.fixed.pi * self.parameters.derived.days
+            omega1 = self.sequences.factors.solartimeangle - delta
+            omega2 = self.sequences.factors.solartimeangle + delta
+            if omega1 > self.sequences.factors.sunsethourangle or omega2 < -self.sequences.factors.sunsethourangle:
+                self.sequences.fluxes.extraterrestrialradiation = 0.0
+            else:
+                omega1 = max(omega1, -self.sequences.factors.sunsethourangle)
+                omega2 = min(omega2, self.sequences.factors.sunsethourangle)
+                self.sequences.fluxes.extraterrestrialradiation = (                    12.0 * self.parameters.fixed.solarconstant / self.parameters.fixed.pi / self.parameters.derived.hours * self.sequences.factors.earthsundistance                ) * (                    (                        (omega2 - omega1)                        * sin(self.parameters.derived.latituderad)                        * sin(self.sequences.factors.solardeclination)                    )                    + (                        cos(self.parameters.derived.latituderad)                        * cos(self.sequences.factors.solardeclination)                        * (sin(omega2) - sin(omega1))                    )                )
         else:
             self.sequences.fluxes.extraterrestrialradiation = (                self.parameters.fixed.solarconstant / self.parameters.fixed.pi * self.sequences.factors.earthsundistance            ) * (                (                    self.sequences.factors.sunsethourangle                    * sin(self.parameters.derived.latituderad)                    * sin(self.sequences.factors.solardeclination)                )                + (                    cos(self.parameters.derived.latituderad)                    * cos(self.sequences.factors.solardeclination)                    * sin(self.sequences.factors.sunsethourangle)                )            )
     cpdef inline void calc_extraterrestrialradiation_v2(self) noexcept nogil:

{hydpy-6.3.2 → hydpy-6.4.0}/hydpy/cythons/autogen/c_meteo_glob_fao56.pyx

@@ -261,14 +261,19 @@ cdef class Model(masterinterface.MasterInterface):
         else:
             self.sequences.factors.possiblesunshineduration = 24.0 / self.parameters.fixed.pi * self.sequences.factors.sunsethourangle
     cpdef inline void calc_extraterrestrialradiation_v1(self) noexcept nogil:
-        cdef double d_omega2
-        cdef double d_omega1
-        cdef double d_delta
+        cdef double omega2
+        cdef double omega1
+        cdef double delta
         if self.parameters.derived.days < 1.0:
-            d_delta = self.parameters.fixed.pi * self.parameters.derived.days
-            d_omega1 = self.sequences.factors.solartimeangle - d_delta
-            d_omega2 = self.sequences.factors.solartimeangle + d_delta
-            self.sequences.fluxes.extraterrestrialradiation = max(                (12.0 * self.parameters.fixed.solarconstant / self.parameters.fixed.pi * self.sequences.factors.earthsundistance)                * (                    (                        (d_omega2 - d_omega1)                        * sin(self.parameters.derived.latituderad)                        * sin(self.sequences.factors.solardeclination)                    )                    + (                        cos(self.parameters.derived.latituderad)                        * cos(self.sequences.factors.solardeclination)                        * (sin(d_omega2) - sin(d_omega1))                    )                ),                0.0,            )
+            delta = self.parameters.fixed.pi * self.parameters.derived.days
+            omega1 = self.sequences.factors.solartimeangle - delta
+            omega2 = self.sequences.factors.solartimeangle + delta
+            if omega1 > self.sequences.factors.sunsethourangle or omega2 < -self.sequences.factors.sunsethourangle:
+                self.sequences.fluxes.extraterrestrialradiation = 0.0
+            else:
+                omega1 = max(omega1, -self.sequences.factors.sunsethourangle)
+                omega2 = min(omega2, self.sequences.factors.sunsethourangle)
+                self.sequences.fluxes.extraterrestrialradiation = (                    12.0 * self.parameters.fixed.solarconstant / self.parameters.fixed.pi / self.parameters.derived.hours * self.sequences.factors.earthsundistance                ) * (                    (                        (omega2 - omega1)                        * sin(self.parameters.derived.latituderad)                        * sin(self.sequences.factors.solardeclination)                    )                    + (                        cos(self.parameters.derived.latituderad)                        * cos(self.sequences.factors.solardeclination)                        * (sin(omega2) - sin(omega1))                    )                )
         else:
             self.sequences.fluxes.extraterrestrialradiation = (                self.parameters.fixed.solarconstant / self.parameters.fixed.pi * self.sequences.factors.earthsundistance            ) * (                (                    self.sequences.factors.sunsethourangle                    * sin(self.parameters.derived.latituderad)                    * sin(self.sequences.factors.solardeclination)                )                + (                    cos(self.parameters.derived.latituderad)                    * cos(self.sequences.factors.solardeclination)                    * sin(self.sequences.factors.sunsethourangle)                )            )
     cpdef inline void calc_clearskysolarradiation_v1(self) noexcept nogil:
@@ -319,14 +324,19 @@ cdef class Model(masterinterface.MasterInterface):
         else:
             self.sequences.factors.possiblesunshineduration = 24.0 / self.parameters.fixed.pi * self.sequences.factors.sunsethourangle
     cpdef inline void calc_extraterrestrialradiation(self) noexcept nogil:
-        cdef double d_omega2
-        cdef double d_omega1
-        cdef double d_delta
+        cdef double omega2
+        cdef double omega1
+        cdef double delta
         if self.parameters.derived.days < 1.0:
-            d_delta = self.parameters.fixed.pi * self.parameters.derived.days
-            d_omega1 = self.sequences.factors.solartimeangle - d_delta
-            d_omega2 = self.sequences.factors.solartimeangle + d_delta
-            self.sequences.fluxes.extraterrestrialradiation = max(                (12.0 * self.parameters.fixed.solarconstant / self.parameters.fixed.pi * self.sequences.factors.earthsundistance)                * (                    (                        (d_omega2 - d_omega1)                        * sin(self.parameters.derived.latituderad)                        * sin(self.sequences.factors.solardeclination)                    )                    + (                        cos(self.parameters.derived.latituderad)                        * cos(self.sequences.factors.solardeclination)                        * (sin(d_omega2) - sin(d_omega1))                    )                ),                0.0,            )
+            delta = self.parameters.fixed.pi * self.parameters.derived.days
+            omega1 = self.sequences.factors.solartimeangle - delta
+            omega2 = self.sequences.factors.solartimeangle + delta
+            if omega1 > self.sequences.factors.sunsethourangle or omega2 < -self.sequences.factors.sunsethourangle:
+                self.sequences.fluxes.extraterrestrialradiation = 0.0
+            else:
+                omega1 = max(omega1, -self.sequences.factors.sunsethourangle)
+                omega2 = min(omega2, self.sequences.factors.sunsethourangle)
+                self.sequences.fluxes.extraterrestrialradiation = (                    12.0 * self.parameters.fixed.solarconstant / self.parameters.fixed.pi / self.parameters.derived.hours * self.sequences.factors.earthsundistance                ) * (                    (                        (omega2 - omega1)                        * sin(self.parameters.derived.latituderad)                        * sin(self.sequences.factors.solardeclination)                    )                    + (                        cos(self.parameters.derived.latituderad)                        * cos(self.sequences.factors.solardeclination)                        * (sin(omega2) - sin(omega1))                    )                )
         else:
             self.sequences.fluxes.extraterrestrialradiation = (                self.parameters.fixed.solarconstant / self.parameters.fixed.pi * self.sequences.factors.earthsundistance            ) * (                (                    self.sequences.factors.sunsethourangle                    * sin(self.parameters.derived.latituderad)                    * sin(self.sequences.factors.solardeclination)                )                + (                    cos(self.parameters.derived.latituderad)                    * cos(self.sequences.factors.solardeclination)                    * sin(self.sequences.factors.sunsethourangle)                )            )
     cpdef inline void calc_clearskysolarradiation(self) noexcept nogil:

{hydpy-6.3.2 → hydpy-6.4.0}/hydpy/cythons/autogen/c_meteo_sun_fao56.pyx

@@ -261,14 +261,19 @@ cdef class Model(masterinterface.MasterInterface):
         else:
             self.sequences.factors.possiblesunshineduration = 24.0 / self.parameters.fixed.pi * self.sequences.factors.sunsethourangle
     cpdef inline void calc_extraterrestrialradiation_v1(self) noexcept nogil:
-        cdef double d_omega2
-        cdef double d_omega1
-        cdef double d_delta
+        cdef double omega2
+        cdef double omega1
+        cdef double delta
         if self.parameters.derived.days < 1.0:
-            d_delta = self.parameters.fixed.pi * self.parameters.derived.days
-            d_omega1 = self.sequences.factors.solartimeangle - d_delta
-            d_omega2 = self.sequences.factors.solartimeangle + d_delta
-            self.sequences.fluxes.extraterrestrialradiation = max(                (12.0 * self.parameters.fixed.solarconstant / self.parameters.fixed.pi * self.sequences.factors.earthsundistance)                * (                    (                        (d_omega2 - d_omega1)                        * sin(self.parameters.derived.latituderad)                        * sin(self.sequences.factors.solardeclination)                    )                    + (                        cos(self.parameters.derived.latituderad)                        * cos(self.sequences.factors.solardeclination)                        * (sin(d_omega2) - sin(d_omega1))                    )                ),                0.0,            )
+            delta = self.parameters.fixed.pi * self.parameters.derived.days
+            omega1 = self.sequences.factors.solartimeangle - delta
+            omega2 = self.sequences.factors.solartimeangle + delta
+            if omega1 > self.sequences.factors.sunsethourangle or omega2 < -self.sequences.factors.sunsethourangle:
+                self.sequences.fluxes.extraterrestrialradiation = 0.0
+            else:
+                omega1 = max(omega1, -self.sequences.factors.sunsethourangle)
+                omega2 = min(omega2, self.sequences.factors.sunsethourangle)
+                self.sequences.fluxes.extraterrestrialradiation = (                    12.0 * self.parameters.fixed.solarconstant / self.parameters.fixed.pi / self.parameters.derived.hours * self.sequences.factors.earthsundistance                ) * (                    (                        (omega2 - omega1)                        * sin(self.parameters.derived.latituderad)                        * sin(self.sequences.factors.solardeclination)                    )                    + (                        cos(self.parameters.derived.latituderad)                        * cos(self.sequences.factors.solardeclination)                        * (sin(omega2) - sin(omega1))                    )                )
         else:
             self.sequences.fluxes.extraterrestrialradiation = (                self.parameters.fixed.solarconstant / self.parameters.fixed.pi * self.sequences.factors.earthsundistance            ) * (                (                    self.sequences.factors.sunsethourangle                    * sin(self.parameters.derived.latituderad)                    * sin(self.sequences.factors.solardeclination)                )                + (                    cos(self.parameters.derived.latituderad)                    * cos(self.sequences.factors.solardeclination)                    * sin(self.sequences.factors.sunsethourangle)                )            )
     cpdef inline void calc_clearskysolarradiation_v1(self) noexcept nogil:
@@ -321,14 +326,19 @@ cdef class Model(masterinterface.MasterInterface):
         else:
             self.sequences.factors.possiblesunshineduration = 24.0 / self.parameters.fixed.pi * self.sequences.factors.sunsethourangle
     cpdef inline void calc_extraterrestrialradiation(self) noexcept nogil:
-        cdef double d_omega2
-        cdef double d_omega1
-        cdef double d_delta
+        cdef double omega2
+        cdef double omega1
+        cdef double delta
         if self.parameters.derived.days < 1.0:
-            d_delta = self.parameters.fixed.pi * self.parameters.derived.days
-            d_omega1 = self.sequences.factors.solartimeangle - d_delta
-            d_omega2 = self.sequences.factors.solartimeangle + d_delta
-            self.sequences.fluxes.extraterrestrialradiation = max(                (12.0 * self.parameters.fixed.solarconstant / self.parameters.fixed.pi * self.sequences.factors.earthsundistance)                * (                    (                        (d_omega2 - d_omega1)                        * sin(self.parameters.derived.latituderad)                        * sin(self.sequences.factors.solardeclination)                    )                    + (                        cos(self.parameters.derived.latituderad)                        * cos(self.sequences.factors.solardeclination)                        * (sin(d_omega2) - sin(d_omega1))                    )                ),                0.0,            )
+            delta = self.parameters.fixed.pi * self.parameters.derived.days
+            omega1 = self.sequences.factors.solartimeangle - delta
+            omega2 = self.sequences.factors.solartimeangle + delta
+            if omega1 > self.sequences.factors.sunsethourangle or omega2 < -self.sequences.factors.sunsethourangle:
+                self.sequences.fluxes.extraterrestrialradiation = 0.0
+            else:
+                omega1 = max(omega1, -self.sequences.factors.sunsethourangle)
+                omega2 = min(omega2, self.sequences.factors.sunsethourangle)
+                self.sequences.fluxes.extraterrestrialradiation = (                    12.0 * self.parameters.fixed.solarconstant / self.parameters.fixed.pi / self.parameters.derived.hours * self.sequences.factors.earthsundistance                ) * (                    (                        (omega2 - omega1)                        * sin(self.parameters.derived.latituderad)                        * sin(self.sequences.factors.solardeclination)                    )                    + (                        cos(self.parameters.derived.latituderad)                        * cos(self.sequences.factors.solardeclination)                        * (sin(omega2) - sin(omega1))                    )                )
         else:
             self.sequences.fluxes.extraterrestrialradiation = (                self.parameters.fixed.solarconstant / self.parameters.fixed.pi * self.sequences.factors.earthsundistance            ) * (                (                    self.sequences.factors.sunsethourangle                    * sin(self.parameters.derived.latituderad)                    * sin(self.sequences.factors.solardeclination)                )                + (                    cos(self.parameters.derived.latituderad)                    * cos(self.sequences.factors.solardeclination)                    * sin(self.sequences.factors.sunsethourangle)                )            )
     cpdef inline void calc_clearskysolarradiation(self) noexcept nogil:

{hydpy-6.3.2 → hydpy-6.4.0}/hydpy/docs/sphinx/conf.py

@@ -199,9 +199,9 @@ copyright = f"2013-{datetime.datetime.now().year}, HydPy Developers"
 # built documents.
 #
 # The short X.Y version.
-version = "6.3"
+version = "6.4"
 # The full version, including alpha/beta/rc tags.
-release = "6.3.2"
+release = "6.4.0"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

{hydpy-6.3.2 → hydpy-6.4.0}/hydpy/models/evap_ret_fao56.py

@@ -156,7 +156,7 @@ of the saturation vapour pressure:
     | 2001-30-09 02:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            38.175107 |   -38.175107 |   -19.087554 |                   -0.000649 |                       -0.000649 |
     | 2001-30-09 03:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            38.175107 |   -38.175107 |   -19.087554 |                   -0.000649 |                       -0.000649 |
     | 2001-30-09 04:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            38.175107 |   -38.175107 |   -19.087554 |                   -0.000649 |                       -0.000649 |
-    | 2001-30-09 05:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            38.175107 |   -38.175107 |   -19.087554 |                   -0.000649 |                       -0.000649 |
+    | 2001-30-09 05:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |        1.725719 |               0.079022 |              1.328804 |            38.175107 |   -36.846304 |   -18.423152 |                    0.000002 |                        0.000002 |
     | 2001-30-09 06:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |      115.964852 |             133.805599 |             89.292936 |            31.303588 |    57.989348 |     5.798935 |                    0.069246 |                        0.069246 |
     | 2001-30-09 07:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |      328.283435 |             378.788578 |            252.778245 |            31.303588 |   221.474657 |    22.147466 |                    0.213528 |                        0.213528 |
     | 2001-30-09 08:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |      517.046121 |             596.591678 |            398.125513 |            31.303588 |   366.821925 |    36.682193 |                    0.341803 |                        0.341803 |
@@ -168,19 +168,19 @@ of the saturation vapour pressure:
     | 2001-30-09 14:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |      641.592713 |             740.299284 |            494.026389 |            31.303588 |   462.722801 |     46.27228 |                     0.42644 |                         0.42644 |
     | 2001-30-09 15:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |      480.821234 |             554.793732 |             370.23235 |            31.303588 |   338.928763 |    33.892876 |                    0.317186 |                        0.317186 |
     | 2001-30-09 16:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |      286.098661 |             330.113839 |            220.295969 |            31.303588 |   188.992381 |    18.899238 |                    0.184861 |                        0.184861 |
-    | 2001-30-09 17:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |       80.296089 |              81.571169 |             61.827989 |            37.369516 |    24.458473 |     2.445847 |                    0.039653 |                        0.039653 |
-    | 2001-30-09 18:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            32.809472 |   -32.809472 |   -16.404736 |                    0.001981 |                        0.001981 |
-    | 2001-30-09 19:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            32.642447 |   -32.642447 |   -16.321224 |                    0.002063 |                        0.002063 |
-    | 2001-30-09 20:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            32.464689 |   -32.464689 |   -16.232345 |                     0.00215 |                         0.00215 |
-    | 2001-30-09 21:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |             32.27513 |    -32.27513 |   -16.137565 |                    0.002243 |                        0.002243 |
-    | 2001-30-09 22:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            32.072553 |   -32.072553 |   -16.036276 |                    0.002343 |                        0.002343 |
-    | 2001-30-09 23:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            31.855571 |   -31.855571 |   -15.927785 |                    0.002449 |                        0.002449 |
-    | 2001-01-10 00:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |             31.62259 |    -31.62259 |   -15.811295 |                    0.002563 |                        0.002563 |
-    | 2001-01-10 01:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            31.371772 |   -31.371772 |   -15.685886 |                    0.002686 |                        0.002686 |
-    | 2001-01-10 02:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            31.371772 |   -31.371772 |   -15.685886 |                    0.002686 |                        0.002686 |
-    | 2001-01-10 03:00 |        86.833333 |  2.016667 |              1001.0 |      28.833333 |    2.016667 |                 39.67258 |                      2.295429 |            34.449023 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            31.089954 |   -31.089954 |   -15.544977 |                    0.010157 |                        0.010157 |
-    | 2001-01-10 04:00 |        83.666667 |  2.133333 |              1001.0 |      29.666667 |    2.133333 |                41.626121 |                      2.393447 |            34.827188 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            30.876731 |   -30.876731 |   -15.438365 |                    0.018451 |                        0.018451 |
-    | 2001-01-10 05:00 |             80.5 |      2.25 |              1001.0 |           30.5 |        2.25 |                43.662793 |                      2.494953 |            35.148549 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            30.741149 |   -30.741149 |   -15.370574 |                    0.027586 |                        0.027586 |
+    | 2001-30-09 17:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |       84.430643 |              85.771379 |             65.011595 |            37.369516 |     27.64208 |     2.764208 |                    0.042463 |                        0.042463 |
+    | 2001-30-09 18:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            32.820818 |   -32.820818 |   -16.410409 |                    0.001976 |                        0.001976 |
+    | 2001-30-09 19:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            32.654226 |   -32.654226 |   -16.327113 |                    0.002057 |                        0.002057 |
+    | 2001-30-09 20:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            32.476934 |   -32.476934 |   -16.238467 |                    0.002144 |                        0.002144 |
+    | 2001-30-09 21:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            32.287877 |   -32.287877 |   -16.143939 |                    0.002237 |                        0.002237 |
+    | 2001-30-09 22:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            32.085845 |   -32.085845 |   -16.042923 |                    0.002336 |                        0.002336 |
+    | 2001-30-09 23:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            31.869454 |   -31.869454 |   -15.934727 |                    0.002442 |                        0.002442 |
+    | 2001-01-10 00:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            31.637117 |   -31.637117 |   -15.818558 |                    0.002556 |                        0.002556 |
+    | 2001-01-10 01:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            31.387003 |   -31.387003 |   -15.693502 |                    0.002679 |                        0.002679 |
+    | 2001-01-10 02:00 |             90.0 |       1.9 |              1001.0 |           28.0 |         1.9 |                37.799304 |                      2.200803 |            34.019373 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            31.387003 |   -31.387003 |   -15.693502 |                    0.002679 |                        0.002679 |
+    | 2001-01-10 03:00 |        86.833333 |  2.016667 |              1001.0 |      28.833333 |    2.016667 |                 39.67258 |                      2.295429 |            34.449023 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            31.105049 |   -31.105049 |   -15.552524 |                    0.010149 |                        0.010149 |
+    | 2001-01-10 04:00 |        83.666667 |  2.133333 |              1001.0 |      29.666667 |    2.133333 |                41.626121 |                      2.393447 |            34.827188 |              0.665665 |             0.0 |                    0.0 |                   0.0 |            30.891722 |   -30.891722 |   -15.445861 |                    0.018443 |                        0.018443 |
+    | 2001-01-10 05:00 |             80.5 |      2.25 |              1001.0 |           30.5 |        2.25 |                43.662793 |                      2.494953 |            35.148549 |              0.665665 |        1.592027 |               0.064247 |              1.225861 |            37.407726 |   -36.181865 |   -18.090932 |                     0.02487 |                         0.02487 |
     | 2001-01-10 06:00 |        77.333333 |  2.366667 |              1001.0 |      31.333333 |    2.366667 |                45.785544 |                      2.600043 |            35.407488 |              0.665665 |      117.778042 |             133.166127 |             90.689092 |            31.522798 |    59.166294 |     5.916629 |                    0.106493 |                        0.106493 |
     | 2001-01-10 07:00 |        74.166667 |  2.483333 |              1001.0 |      32.166667 |    2.483333 |                47.997402 |                      2.708817 |            35.598073 |              0.665665 |      336.055513 |             378.062452 |            258.762745 |            31.799047 |   226.963698 |     22.69637 |                     0.27044 |                         0.27044 |
     | 2001-01-10 08:00 |             71.0 |       2.6 |              1001.0 |           33.0 |         2.6 |                50.301478 |                      2.821374 |            35.714049 |              0.665665 |      532.152561 |             595.693165 |            409.757472 |            32.191063 |   377.566409 |    37.756641 |                    0.421442 |                        0.421442 |

{hydpy-6.3.2 → hydpy-6.4.0}/hydpy/models/meteo/meteo_model.py

@@ -426,9 +426,9 @@ class Calc_ExtraterrestrialRadiation_V1(modeltools.Method):
       SunsetHourAngle \cdot sin(LatitudeRad) \cdot sin(SolarDeclination) +
       cos(LatitudeRad) \cdot cos(SolarDeclination) \cdot sin(SunsetHourAngle))`
 
-    Basic equation for (sub)hourly steps (:cite:t:`ref-Allen1998`, eq. 28 to 30):
+    Basic equation for subdaily steps (:cite:t:`ref-Allen1998`, eq. 28 to 30):
       :math:`ExternalTerrestrialRadiation =
-      \frac{12 \cdot SolarConstant}{Pi} \cdot EarthSunDistance \cdot \Big(
+      \frac{12 \cdot SolarConstant}{Pi \cdot Hours} \cdot EarthSunDistance \cdot \Big(
       (\omega_2 - \omega_1) \cdot sin(LatitudeRad) \cdot sin(SolarDeclination) +
       cos(LatitudeRad) \cdot cos(SolarDeclination) \cdot (sin(\omega_2) -
       sin(\omega_1)) \Big)`
@@ -457,9 +457,10 @@ class Calc_ExtraterrestrialRadiation_V1(modeltools.Method):
         time step, still covering the whole day:
 
         >>> import numpy
-        >>> longitude(-20)
-        >>> derived.utclongitude(-20)
-        >>> derived.days(1/24)
+        >>> longitude(-20.0)
+        >>> derived.utclongitude(-20.0)
+        >>> derived.days(1.0 / 24.0)
+        >>> derived.hours(1.0)
         >>> derived.doy.shape = 24
         >>> derived.doy(246)
         >>> derived.sct.shape = 24
@@ -479,7 +480,7 @@ class Calc_ExtraterrestrialRadiation_V1(modeltools.Method):
         3: 0.0
         4: 0.0
         5: 0.0
-        6: 116.280258
+        6: 119.649822
         7: 431.467206
         8: 713.483659
         9: 943.11066
@@ -490,7 +491,7 @@ class Calc_ExtraterrestrialRadiation_V1(modeltools.Method):
         14: 933.146907
         15: 700.498642
         16: 416.345834
-        17: 100.053027
+        17: 106.182221
         18: 0.0
         19: 0.0
         20: 0.0
@@ -498,60 +499,42 @@ class Calc_ExtraterrestrialRadiation_V1(modeltools.Method):
         22: 0.0
         23: 0.0
 
-        Note that, even with identical values of the local longitude (|Longitude|) and
-        the one of the time zone (|UTCLongitude|), the calculated radiation values are
-        not symmetrical due to the eccentricity of the Earth"s orbit (see `solar
-        time`_).
-
-        There is a slight deviation between the directly calculated daily value and the
-        mean of the hourly values:
+        Note that, even with identical values of the local longitude (|Longitude|) the
+        time zone (|UTCLongitude|), the calculated radiation values are not symmetrical
+        due to the eccentricity of the Earth"s orbit (see `solar time`_).
 
-        >>> round_(sum_/24)
-        372.077574
+        The daily average of the calculated extraterrestrial radiation should be the
+        same for all simulation step sizes:
 
-        For sub-daily simulation time steps, results are most accurate for the shortest
-        step size.  On the other hand, they can be (extremely) inaccurate for timesteps
-        between one hour and one day.  We demonstrate this by comparing the mean
-        sub-daily values of different step sizes with the directly calculated daily
-        value (note the apparent total fail of method
-        |Calc_ExtraterrestrialRadiation_V1| for a step size of 720 minutes):
+        >>> round_(sum_ / 24.0)
+        372.473355
 
-        >>> for minutes in [1, 5, 15, 30, 60, 90, 120, 144, 160,
-        ...                 180, 240, 288, 360, 480, 720, 1440]:
-        ...     derived.days(minutes/60/24)
-        ...     nmb = int(1440/minutes)
+        >>> for minutes in [1.0, 5.0, 15.0, 30.0, 60.0, 90.0, 120.0, 144.0, 160.0,
+        ...                 180.0, 240.0, 288.0, 360.0, 480.0, 720.0, 1440.0]:
+        ...     derived.days(minutes / 60.0 / 24.0)
+        ...     derived.hours(minutes / 60.0)
+        ...     nmb = int(1440.0 / minutes)
         ...     derived.doy.shape = nmb
         ...     derived.doy(246)
         ...     derived.sct.shape = nmb
-        ...     derived.sct = numpy.linspace(minutes/60/2, 24-minutes/60/2, nmb)
+        ...     derived.sct = numpy.linspace(
+        ...         minutes / 60.0 / 2.0, 24.0 - minutes / 60.0 / 2.0, nmb
+        ...     )
         ...     sum_ = 0.0
         ...     for idx in range(nmb):
         ...         model.idx_sim = idx
         ...         model.calc_solartimeangle_v1()
         ...         model.calc_extraterrestrialradiation_v1()
         ...         sum_ += fluxes.extraterrestrialradiation
-        ...     print(minutes, end=": ")
-        ...     round_(sum_/24 - 372.473355)
-        1: -0.000626
-        5: -0.008549
-        15: -0.100092
-        30: -0.395781
-        60: -0.395781
-        90: -0.395781
-        120: -0.395781
-        144: -14.43193
-        160: -9.539017
-        180: -0.395781
-        240: -44.735212
-        288: -25.486399
-        360: -0.395781
-        480: -44.735212
-        720: -372.473355
-        1440: -356.953632
+        ...     assert round(sum_/nmb, 6) == 372.473355
     """
 
     FIXEDPARAMETERS = (meteo_fixed.Pi, meteo_fixed.SolarConstant)
-    DERIVEDPARAMETERS = (meteo_derived.Days, meteo_derived.LatitudeRad)
+    DERIVEDPARAMETERS = (
+        meteo_derived.Days,
+        meteo_derived.Hours,
+        meteo_derived.LatitudeRad,
+    )
     REQUIREDSEQUENCES = (
         meteo_factors.SolarTimeAngle,
         meteo_factors.EarthSunDistance,
@@ -567,25 +550,28 @@ class Calc_ExtraterrestrialRadiation_V1(modeltools.Method):
         fac = model.sequences.factors.fastaccess
         flu = model.sequences.fluxes.fastaccess
         if der.days < 1.0:
-            d_delta = fix.pi * der.days
-            d_omega1 = fac.solartimeangle - d_delta
-            d_omega2 = fac.solartimeangle + d_delta
-            flu.extraterrestrialradiation = max(
-                (12.0 * fix.solarconstant / fix.pi * fac.earthsundistance)
-                * (
+            delta: float = fix.pi * der.days
+            omega1: float = fac.solartimeangle - delta
+            omega2: float = fac.solartimeangle + delta
+            if omega1 > fac.sunsethourangle or omega2 < -fac.sunsethourangle:
+                flu.extraterrestrialradiation = 0.0
+            else:
+                omega1 = max(omega1, -fac.sunsethourangle)
+                omega2 = min(omega2, fac.sunsethourangle)
+                flu.extraterrestrialradiation = (
+                    12.0 * fix.solarconstant / fix.pi / der.hours * fac.earthsundistance
+                ) * (
                     (
-                        (d_omega2 - d_omega1)
+                        (omega2 - omega1)
                         * modelutils.sin(der.latituderad)
                         * modelutils.sin(fac.solardeclination)
                     )
                     + (
                         modelutils.cos(der.latituderad)
                         * modelutils.cos(fac.solardeclination)
-                        * (modelutils.sin(d_omega2) - modelutils.sin(d_omega1))
+                        * (modelutils.sin(omega2) - modelutils.sin(omega1))
                     )
-                ),
-                0.0,
-            )
+                )
         else:
             flu.extraterrestrialradiation = (
                 fix.solarconstant / fix.pi * fac.earthsundistance

{hydpy-6.3.2 → hydpy-6.4.0}/hydpy/models/meteo_glob_fao56.py

@@ -135,7 +135,7 @@ results given by :cite:t:`ref-Allen1998`:
     | 2001-30-09 02:00 |              0.0 |         0.999717 |        -0.070087 |        1.550377 |      -2.460182 |                      0.0 |                       0.0 |                    0.0 |             0.0 |        0.0 |        0.0 |
     | 2001-30-09 03:00 |              0.0 |         0.999717 |        -0.070087 |        1.550377 |      -2.198383 |                      0.0 |                       0.0 |                    0.0 |             0.0 |        0.0 |        0.0 |
     | 2001-30-09 04:00 |              0.0 |         0.999717 |        -0.070087 |        1.550377 |      -1.936583 |                      0.0 |                       0.0 |                    0.0 |             0.0 |        0.0 |        0.0 |
-    | 2001-30-09 05:00 |              0.8 |         0.999717 |        -0.070087 |        1.550377 |      -1.674784 |                   0.0248 |                       0.0 |                    0.0 |             0.0 |        0.0 |        0.0 |
+    | 2001-30-09 05:00 |              0.8 |         0.999717 |        -0.070087 |        1.550377 |      -1.674784 |                   0.0248 |                  0.105363 |               0.079022 |        1.725719 |   1.725719 |   0.079022 |
     | 2001-30-09 06:00 |              0.8 |         0.999717 |        -0.070087 |        1.550377 |      -1.412985 |                      1.0 |                178.407465 |             133.805599 |      115.964852 | 115.964852 | 133.805599 |
     | 2001-30-09 07:00 |              0.8 |         0.999717 |        -0.070087 |        1.550377 |      -1.151185 |                      1.0 |                505.051438 |             378.788578 |      328.283435 | 328.283435 | 378.788578 |
     | 2001-30-09 08:00 |              0.8 |         0.999717 |        -0.070087 |        1.550377 |      -0.889386 |                      1.0 |                795.455571 |             596.591678 |      517.046121 | 517.046121 | 596.591678 |
@@ -147,7 +147,7 @@ results given by :cite:t:`ref-Allen1998`:
     | 2001-30-09 14:00 |              0.8 |         0.999717 |        -0.070087 |        1.550377 |        0.68141 |                      1.0 |                987.065712 |             740.299284 |      641.592713 | 641.592713 | 740.299284 |
     | 2001-30-09 15:00 |              0.8 |         0.999717 |        -0.070087 |        1.550377 |        0.94321 |                      1.0 |                739.724976 |             554.793732 |      480.821234 | 480.821234 | 554.793732 |
     | 2001-30-09 16:00 |              0.8 |         0.999717 |        -0.070087 |        1.550377 |       1.205009 |                      1.0 |                440.151786 |             330.113839 |      286.098661 | 286.098661 | 330.113839 |
-    | 2001-30-09 17:00 |              0.8 |         0.999717 |        -0.070087 |        1.550377 |       1.466809 |                 0.819208 |                108.761559 |              81.571169 |       80.296089 |  80.296089 |  81.571169 |
+    | 2001-30-09 17:00 |              0.8 |         0.999717 |        -0.070087 |        1.550377 |       1.466809 |                 0.819208 |                114.361839 |              85.771379 |       84.430643 |  84.430643 |  85.771379 |
     | 2001-30-09 18:00 |              0.0 |         0.999717 |        -0.070087 |        1.550377 |       1.728608 |                      0.0 |                       0.0 |                    0.0 |             0.0 |        0.0 |        0.0 |
     | 2001-30-09 19:00 |              0.0 |         0.999717 |        -0.070087 |        1.550377 |       1.990407 |                      0.0 |                       0.0 |                    0.0 |             0.0 |        0.0 |        0.0 |
     | 2001-30-09 20:00 |              0.0 |         0.999717 |        -0.070087 |        1.550377 |       2.252207 |                      0.0 |                       0.0 |                    0.0 |             0.0 |        0.0 |        0.0 |
@@ -159,7 +159,7 @@ results given by :cite:t:`ref-Allen1998`:
     | 2001-01-10 02:00 |              0.0 |         1.000283 |        -0.076994 |        1.548357 |        -2.4588 |                      0.0 |                       0.0 |                    0.0 |             0.0 |        0.0 |        0.0 |
     | 2001-01-10 03:00 |              0.0 |         1.000283 |        -0.076994 |        1.548357 |      -2.197001 |                      0.0 |                       0.0 |                    0.0 |             0.0 |        0.0 |        0.0 |
     | 2001-01-10 04:00 |              0.0 |         1.000283 |        -0.076994 |        1.548357 |      -1.935202 |                      0.0 |                       0.0 |                    0.0 |             0.0 |        0.0 |        0.0 |
-    | 2001-01-10 05:00 |             0.82 |         1.000283 |        -0.076994 |        1.548357 |      -1.673402 |                 0.022362 |                       0.0 |                    0.0 |             0.0 |        0.0 |        0.0 |
+    | 2001-01-10 05:00 |             0.82 |         1.000283 |        -0.076994 |        1.548357 |      -1.673402 |                 0.022362 |                  0.085662 |               0.064247 |        1.592027 |   1.592027 |   0.064247 |
     | 2001-01-10 06:00 |         0.826667 |         1.000283 |        -0.076994 |        1.548357 |      -1.411603 |                      1.0 |                177.554837 |             133.166127 |      117.778042 | 117.778042 | 133.166127 |
     | 2001-01-10 07:00 |         0.833333 |         1.000283 |        -0.076994 |        1.548357 |      -1.149804 |                      1.0 |                 504.08327 |             378.062452 |      336.055513 | 336.055513 | 378.062452 |
     | 2001-01-10 08:00 |             0.84 |         1.000283 |        -0.076994 |        1.548357 |      -0.888004 |                      1.0 |                794.257553 |             595.693165 |      532.152561 | 532.152561 | 595.693165 |