ladim 2.0.0__py3-none-any.whl → 2.0.1__py3-none-any.whl

ladim/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '2.0.0'
+__version__ = '2.0.1'
 
 from .main import main, run

ladim/__main__.py

@@ -0,0 +1,2 @@
+from . import run
+run()

ladim/release.py

@@ -53,7 +53,7 @@ class TextFileReleaser(Releaser):
         self._dataframe = None
 
         # Continuous release variables
-        self._frequency = read_timedelta(frequency)
+        self._frequency = read_timedelta(frequency) / np.timedelta64(1, 's')
         self._last_release_dataframe = pd.DataFrame()
         self._last_release_time = np.int64(-4611686018427387904)
 
@@ -80,6 +80,12 @@ class TextFileReleaser(Releaser):
             stop_time=self.model.solver.time + self.model.solver.step,
         ).copy(deep=True)
 
+        # If there are no new particles, but the state is empty, we should
+        # still initialize the state by adding the appropriate columns
+        if (len(df) == 0) and ('X' not in self.model.state):
+            self.model.state.append(df.to_dict(orient='list'))
+            self._last_release_dataframe = df
+
         # If there are no new particles and we don't use continuous release,
         # we are done.
         continuous_release = bool(self._frequency)
@@ -99,7 +105,7 @@ class TextFileReleaser(Releaser):
             return
 
         # If we have continuous release, but there are no new particles and
-        # the last release is NOT recent, we should replace the empty
+        # the last release is NOT recent, we should replace empty
         # dataframe with the previously released dataframe
         if continuous_release:
             if (len(df) == 0) and not last_release_is_recent:
@@ -148,6 +154,7 @@ class TextFileReleaser(Releaser):
                 self._dataframe = self._csv_fname
 
             else:
+                # noinspection PyArgumentList
                 with open_or_relay(self._csv_fname, 'r', encoding='utf-8') as fp:
                     self._dataframe = load_release_file(
                         stream=fp,

{ladim-2.0.0.dist-info → ladim-2.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ladim
-Version: 2.0.0
+Version: 2.0.1
 Summary: Lagrangian Advection and Diffusion Model
 Home-page: https://github.com/pnsaevik/ladim
 Author: Bjørn Ådlandsvik

{ladim-2.0.0.dist-info → ladim-2.0.1.dist-info}/RECORD

@@ -1,11 +1,12 @@
-ladim/__init__.py,sha256=Ns1alQ3-vgq1Hh0sgRGMsYsmH5LnEReoG-M-ajzLg04,51
+ladim/__init__.py,sha256=gItkgENsZYTMR2SxeAgoMMvJ9uTjFAJA29jZoVWvM2k,51
+ladim/__main__.py,sha256=8f07EMfxQllDZSgpak5ECyYHnfQFy8LaHl2xdC-aO9c,23
 ladim/config.py,sha256=6b0ikBrBnq_sSElgO2YcVtJHjQU0nyZsVyPV3q9fy5I,4233
 ladim/forcing.py,sha256=f4PpSwyilSScXeNyorTWLMgVTiat9htSLkCwAkRlJVM,3048
 ladim/grid.py,sha256=m6bQrGJ3cux7rqC8pbRXD86cOI-VQKF-XjP9m1jCIcY,2221
 ladim/main.py,sha256=wO91-nLd1gvF3V20XK5qRvvOIV4xoTOKiWFcbwV2oag,2812
 ladim/model.py,sha256=jpjq_ZSh7ULpwi3_RqDb-p5SG8WcdgCPaBkSpnNWblU,3137
 ladim/output.py,sha256=Rz7iujvS7Z3LoABiJduQqyb3zPswNqhhFsywr3MLsBY,8373
-ladim/release.py,sha256=5QD0hxQNmkxGmtrQX72T5QumHeWLQMFHysJD6Sc0BUE,8067
+ladim/release.py,sha256=1j__9Gj0BD0CqVCM2KLZhio1Ia-hz1gbUIhTsa0J3Rg,8451
 ladim/sample.py,sha256=n8wRGd_VsW_qyQe1ZoTpmfZcdcwB929vsM8PoKG6JTs,8292
 ladim/solver.py,sha256=sZvYgOxzJ-EItI-IB2y8_z8Tf-SJAQSrmydlhDRa7ZQ,755
 ladim/state.py,sha256=5ICIiujsV3KOAUYagGLK7YdmhcItgJmtntZeR11nIpw,3781
@@ -23,9 +24,9 @@ postladim/cellcount.py,sha256=nCFu9iJmprubn4YmPB4W0VO02GfEb90Iif7D49w1Kss,2054
 postladim/kde_plot.py,sha256=GvMWzT6VxIeXKh1cnqaGzR-4jGG_WIHGMLPpRMXIpo4,1628
 postladim/particlefile.py,sha256=0aif9wYUJ-VrpQKeCef8wB5VCiBB-gWY6sxNCUYviTA,4889
 postladim/variable.py,sha256=-2aihoppYMMmpSpCqaF31XvpinTMaH3Y01-USDIkbBc,6587
-ladim-2.0.0.dist-info/LICENSE,sha256=BgtXyjNr6Ly9nQ7ZLXKpV3r5kWRLnh5MiN0dxp0Bvfc,1085
-ladim-2.0.0.dist-info/METADATA,sha256=ap0yaeqHIhnmQiMwuH8gaCT__YNxESVoudzgFuko9Zs,1841
-ladim-2.0.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-ladim-2.0.0.dist-info/entry_points.txt,sha256=JDlNJo87GJaOkH0-BpAzTPLCrZcuPSdSlHNQ4XmnoRg,41
-ladim-2.0.0.dist-info/top_level.txt,sha256=TK8Gl7d6MsrAQvqKG4b6YJCbB4UL46Se3SzsI-sJAuc,16
-ladim-2.0.0.dist-info/RECORD,,
+ladim-2.0.1.dist-info/LICENSE,sha256=BgtXyjNr6Ly9nQ7ZLXKpV3r5kWRLnh5MiN0dxp0Bvfc,1085
+ladim-2.0.1.dist-info/METADATA,sha256=-183UhMhVbBOfOcjonoP1P8l2q500OF8vexlV1SDAEg,1841
+ladim-2.0.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+ladim-2.0.1.dist-info/entry_points.txt,sha256=JDlNJo87GJaOkH0-BpAzTPLCrZcuPSdSlHNQ4XmnoRg,41
+ladim-2.0.1.dist-info/top_level.txt,sha256=TK8Gl7d6MsrAQvqKG4b6YJCbB4UL46Se3SzsI-sJAuc,16
+ladim-2.0.1.dist-info/RECORD,,