fdsreader 1.10.0__tar.gz → 1.10.2__tar.gz

{fdsreader-1.10.0 → fdsreader-1.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdsreader
-Version: 1.10.0
+Version: 1.10.2
 Summary: Python reader for data generated by FDS.
 Home-page: https://github.com/FireDynamics/fdsreader
 Author: FZJ IAS-7 (Jan Vogelsang, Prof. Dr. Lukas Arnold, Tristan Hehnen)

{fdsreader-1.10.0 → fdsreader-1.10.2}/RELEASE.md

@@ -1,4 +1,10 @@
 ## Release History
+* 1.10.2
+    * Fixed to_global function for Plot3D data with obstruction masks
+    * Fixed to_global function for Smoke3D data with obstruction masks
+* 1.10.1
+    * Fixed to_global function for Plot3D data
+    * Fixed to_global function for Smoke3D data
 * 1.10.0
     * Restructured Plot3D data to now be represented by a single Plot3D instance for all timesteps instead of one individual object per timestep
     * Added a to_global function for Plot3D data

{fdsreader-1.10.0 → fdsreader-1.10.2}/fdsreader/_version.py

@@ -7,5 +7,5 @@ Provides fdsreader version information.
 
 from incremental import Version
 
-__version__ = Version("fdsreader", 1, 10, 0)
+__version__ = Version("fdsreader", 1, 10, 2)
 __all__ = ["__version__"]

{fdsreader-1.10.0 → fdsreader-1.10.2}/fdsreader/pl3d/pl3d.py

@@ -136,6 +136,12 @@ class Plot3D(np.lib.mixins.NDArrayOperatorsMixin):
             :param fill: The fill value to use for masked entries. Only used when masked=True.
             :param return_coordinates: If true, return the matching coordinate for each value on the generated grid.
         """
+        if len(self._subplots) == 0:
+            if return_coordinates:
+                return np.array([]), {d: np.array([]) for d in ('x', 'y', 'z')}
+            else:
+                return np.array([])
+
         coord_min = {'x': math.inf, 'y': math.inf, 'z': math.inf}
         coord_max = {'x': -math.inf, 'y': -math.inf, 'z': -math.inf}
         for dim in ('x', 'y', 'z'):
@@ -178,46 +184,49 @@ class Plot3D(np.lib.mixins.NDArrayOperatorsMixin):
             if masked:
                 mask = subplot.mesh.get_obstruction_mask(self.times)
 
+            start_idx = {dim: int(round(
+                (subplot.mesh.coordinates[dim][0] - coord_min[dim]) / step_sizes_min[dim])) for dim in ('x', 'y', 'z')}
+            end_idx = {dim: int(round(
+                (subplot.mesh.coordinates[dim][-1] - coord_min[dim]) / step_sizes_min[dim])) for dim in ('x', 'y', 'z')}
+
+            temp_data = dict()
+            temp_mask = dict()
             for axis in range(3):
                 dim = ('x', 'y', 'z')[axis]
-                n_repeat = max(int(round(
-                    (subplot.mesh.coordinates[dim][1] - subplot.mesh.coordinates[dim][0]) /
-                    step_sizes_min[dim])), 1)
-
-                start_idx[dim] = int(round(
-                    (subplot.mesh.coordinates[dim][0] - coord_min[dim]) / step_sizes_min[dim]))
-                end_idx[dim] = int(round(
-                    (subplot.mesh.coordinates[dim][-1] - coord_min[dim]) / step_sizes_min[dim]))
+                # Temporarily save border points to add them back to the array again later
+                if np.isclose(subplot.mesh.coordinates[dim][-1], global_max[dim]):
+                    temp_data_slices = [slice(s) for s in subplot_data.shape]
+                    end_idx[dim] += 1
+                    temp_data_slices[axis + 1] = slice(subplot_data.shape[axis + 1] - 1, None)
+                    temp_data[dim] = subplot_data[tuple(temp_data_slices)]
+                    if masked:
+                        temp_mask[dim] = mask[tuple(temp_data_slices)]
 
             # We ignore border points unless they are actually on the border of the simulation space as all
             # other border points actually appear twice, as the subslices overlap. This only
             # applies for face_centered slices, as cell_centered slices will not overlap.
-            reduced_shape_slices = (slice(subplot.data.shape[0]),) + tuple(slice(s - 1) for s in subplot.data.shape[1:])
+            reduced_shape_slices = (slice(subplot.data.shape[0]),) + tuple(slice(1, None) for s in subplot.data.shape[1:])
             subplot_data = subplot_data[reduced_shape_slices]
             if masked:
                 mask = mask[reduced_shape_slices]
 
-            for axis in range(3):
-                dim = ('x', 'y', 'z')[axis]
-                # Temporarily save border points to add them back to the array again later
-                if subplot.mesh.coordinates[dim][-1] == global_max[dim]:
-                    end_idx[dim] += 1
-                    temp_data_slices = [slice(s) for s in subplot_data.shape]
-                    temp_data_slices[axis + 1] = slice(subplot_data.shape[axis + 1] - 1, None)
-                    temp_data = subplot_data[tuple(temp_data_slices)]
-                    if masked:
-                        temp_mask = mask[tuple(temp_data_slices)]
-
+                n_repeat = max(int(round(
+                    (subplot.mesh.coordinates[dim][1] - subplot.mesh.coordinates[dim][0]) /
+                    step_sizes_min[dim])), 1)
                 if n_repeat > 1:
                     subplot_data = np.repeat(subplot_data, n_repeat, axis=axis + 1)
                     if masked:
                         mask = np.repeat(mask, n_repeat, axis=axis + 1)
 
+            for axis in range(3):
+                dim = ('x', 'y', 'z')[axis]
                 # Add border points back again if needed
-                if subplot.mesh.coordinates[dim][-1] == global_max[dim]:
-                    subplot_data = np.concatenate((subplot_data, temp_data), axis=axis + 1)
+                if np.isclose(subplot.mesh.coordinates[dim][-1], global_max[dim]):
+                    temp_data_slices = [slice(s) for s in subplot_data.shape]
+                    temp_data_slices[axis + 1] = slice(None)
+                    subplot_data = np.concatenate((subplot_data, temp_data[dim][tuple(temp_data_slices)]), axis=axis + 1)
                     if masked:
-                        mask = np.concatenate((mask, temp_mask), axis=axis + 1)
+                        mask = np.concatenate((mask, temp_mask[dim][tuple(temp_data_slices)]), axis=axis + 1)
 
             # If the slice should be masked, we set all cells at which an obstruction is in the
             # simulation space to the fill value set by the user

{fdsreader-1.10.0 → fdsreader-1.10.2}/fdsreader/slcf/slice.py

@@ -511,6 +511,12 @@ class Slice(np.lib.mixins.NDArrayOperatorsMixin):
             :param fill: The fill value to use for masked slice entries. Only used when masked=True.
             :param return_coordinates: If true, return the matching coordinate for each value on the generated grid.
         """
+        if len(self._subslices) == 0:
+            if return_coordinates:
+                return np.array([]), {d: np.array([]) for d in ('x', 'y', 'z')}
+            else:
+                return np.array([])
+
         subslice_sets = [dict(), dict()]
 
         dimension = ['x', 'y', 'z'][self.orientation - 1]
@@ -600,7 +606,7 @@ class Slice(np.lib.mixins.NDArrayOperatorsMixin):
                             mask = mask[reduced_data_slices]
 
                         # Temporarily save border points to add them back to the array again later
-                        if slc.mesh.coordinates[dim][-1] == global_max[dim]:
+                        if np.isclose(slc.mesh.coordinates[dim][-1], global_max[dim]):
                             end_idx[dim] += 1
                             temp_data_slices = [slice(s) for s in slc_data.shape]
                             temp_data_slices[axis + 1] = slice(slc_data.shape[axis + 1] - 1, None)
@@ -614,7 +620,7 @@ class Slice(np.lib.mixins.NDArrayOperatorsMixin):
                             mask = np.repeat(mask, n_repeat, axis=axis + 1)
 
                     # Add border points back again if needed
-                    if not self.cell_centered and slc.mesh.coordinates[dim][-1] == global_max[dim]:
+                    if not self.cell_centered and np.isclose(slc.mesh.coordinates[dim][-1], global_max[dim]):
                         slc_data = np.concatenate((slc_data, temp_data), axis=axis + 1)
                         if masked:
                             mask = np.concatenate((mask, temp_mask), axis=axis + 1)

{fdsreader-1.10.0 → fdsreader-1.10.2}/fdsreader/smoke3d/smoke3d.py

@@ -125,6 +125,12 @@ class Smoke3D(np.lib.mixins.NDArrayOperatorsMixin):
             :param fill: The fill value to use for masked entries. Only used when masked=True.
             :param return_coordinates: If true, return the matching coordinate for each value on the generated grid.
         """
+        if len(self._subsmokes) == 0:
+            if return_coordinates:
+                return np.array([]), {d: np.array([]) for d in ('x', 'y', 'z')}
+            else:
+                return np.array([])
+
         coord_min = {'x': math.inf, 'y': math.inf, 'z': math.inf}
         coord_max = {'x': -math.inf, 'y': -math.inf, 'z': -math.inf}
         for dim in ('x', 'y', 'z'):
@@ -160,53 +166,54 @@ class Smoke3D(np.lib.mixins.NDArrayOperatorsMixin):
 
         grid = np.full((self.n_t, steps['x'], steps['y'], steps['z']), np.nan)
 
-        start_idx = dict()
-        end_idx = dict()
         for subsmoke in self._subsmokes.values():
             subsmoke_data = subsmoke.data.copy()
             if masked:
                 mask = subsmoke.mesh.get_obstruction_mask(self.times)
 
+            start_idx = {dim: int(round(
+                (subsmoke.mesh.coordinates[dim][0] - coord_min[dim]) / step_sizes_min[dim])) for dim in ('x', 'y', 'z')}
+            end_idx = {dim: int(round(
+                (subsmoke.mesh.coordinates[dim][-1] - coord_min[dim]) / step_sizes_min[dim])) for dim in ('x', 'y', 'z')}
+
+            temp_data = dict()
+            temp_mask = dict()
             for axis in range(3):
                 dim = ('x', 'y', 'z')[axis]
-                n_repeat = max(int(round(
-                    (subsmoke.mesh.coordinates[dim][1] - subsmoke.mesh.coordinates[dim][0]) /
-                    step_sizes_min[dim])), 1)
-
-                start_idx[dim] = int(round(
-                    (subsmoke.mesh.coordinates[dim][0] - coord_min[dim]) / step_sizes_min[dim]))
-                end_idx[dim] = int(round(
-                    (subsmoke.mesh.coordinates[dim][-1] - coord_min[dim]) / step_sizes_min[dim]))
+                # Temporarily save border points to add them back to the array again later
+                if np.isclose(subsmoke.mesh.coordinates[dim][-1], global_max[dim]):
+                    temp_data_slices = [slice(s) for s in subsmoke_data.shape]
+                    end_idx[dim] += 1
+                    temp_data_slices[axis + 1] = slice(subsmoke_data.shape[axis + 1] - 1, None)
+                    temp_data[dim] = subsmoke_data[tuple(temp_data_slices)]
+                    if masked:
+                        temp_mask[dim] = mask[tuple(temp_data_slices)]
 
             # We ignore border points unless they are actually on the border of the simulation space as all
             # other border points actually appear twice, as the subslices overlap. This only
             # applies for face_centered slices, as cell_centered slices will not overlap.
-            reduced_shape_slices = (slice(subsmoke.data.shape[0]),) + tuple(slice(s - 1) for s in subsmoke.data.shape[1:])
+            reduced_shape_slices = (slice(subsmoke.data.shape[0]),) + tuple(slice(1, None) for s in subsmoke.data.shape[1:])
             subsmoke_data = subsmoke_data[reduced_shape_slices]
             if masked:
                 mask = mask[reduced_shape_slices]
 
-            for axis in range(3):
-                dim = ('x', 'y', 'z')[axis]
-                # Temporarily save border points to add them back to the array again later
-                if subsmoke.mesh.coordinates[dim][-1] == global_max[dim]:
-                    end_idx[dim] += 1
-                    temp_data_slices = [slice(s) for s in subsmoke_data.shape]
-                    temp_data_slices[axis + 1] = slice(subsmoke_data.shape[axis + 1] - 1, None)
-                    temp_data = subsmoke_data[tuple(temp_data_slices)]
-                    if masked:
-                        temp_mask = mask[tuple(temp_data_slices)]
-
+                n_repeat = max(int(round(
+                    (subsmoke.mesh.coordinates[dim][1] - subsmoke.mesh.coordinates[dim][0]) /
+                    step_sizes_min[dim])), 1)
                 if n_repeat > 1:
                     subsmoke_data = np.repeat(subsmoke_data, n_repeat, axis=axis + 1)
                     if masked:
                         mask = np.repeat(mask, n_repeat, axis=axis + 1)
 
+            for axis in range(3):
+                dim = ('x', 'y', 'z')[axis]
                 # Add border points back again if needed
-                if subsmoke.mesh.coordinates[dim][-1] == global_max[dim]:
-                    subsmoke_data = np.concatenate((subsmoke_data, temp_data), axis=axis + 1)
+                if np.isclose(subsmoke.mesh.coordinates[dim][-1], global_max[dim]):
+                    temp_data_slices = [slice(s) for s in subsmoke_data.shape]
+                    temp_data_slices[axis + 1] = slice(None)
+                    subsmoke_data = np.concatenate((subsmoke_data, temp_data[dim][tuple(temp_data_slices)]), axis=axis + 1)
                     if masked:
-                        mask = np.concatenate((mask, temp_mask), axis=axis + 1)
+                        mask = np.concatenate((mask, temp_mask[dim][tuple(temp_data_slices)]), axis=axis + 1)
 
             # If the slice should be masked, we set all cells at which an obstruction is in the
             # simulation space to the fill value set by the user

{fdsreader-1.10.0 → fdsreader-1.10.2}/fdsreader.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdsreader
-Version: 1.10.0
+Version: 1.10.2
 Summary: Python reader for data generated by FDS.
 Home-page: https://github.com/FireDynamics/fdsreader
 Author: FZJ IAS-7 (Jan Vogelsang, Prof. Dr. Lukas Arnold, Tristan Hehnen)

fdsreader-1.10.2/requirements.txt

@@ -0,0 +1,163 @@
+aiohttp==3.9.1
+aiosignal==1.3.1
+alabaster==0.7.13
+appdirs==1.4.4
+argcomplete==3.1.6
+argon2-cffi==23.1.0
+argon2-cffi-bindings==21.2.0
+asttokens==2.4.1
+async-timeout==4.0.3
+asynctest==0.13.0
+attrs==23.1.0
+autodocsumm==0.2.11
+Automat==22.10.0
+Babel==2.13.1
+backcall==0.2.0
+beautifulsoup4==4.12.2
+bleach==6.1.0
+bpyutils==0.5.8
+brotlipy==0.7.0
+certifi==2023.11.17
+cffi==1.16.0
+charset-normalizer==2.0.12
+click==8.1.7
+colorama==0.4.6
+comm==0.2.0
+constantly==23.10.4
+contourpy==1.2.0
+cryptography==41.0.7
+cycler==0.12.1
+debugpy==1.8.0
+decorator==5.1.1
+defusedxml==0.7.1
+dill==0.3.7
+docutils==0.20.1
+dpcpp-cpp-rt==2024.0.0
+entrypoints==0.4
+environment-kernels==1.2.0
+executing==2.0.1
+fastjsonschema==2.19.0
+fonttools==4.45.1
+frozenlist==1.4.0
+hyperlink==21.0.0
+idna==3.6
+imageio==2.33.0
+imageio-ffmpeg==0.4.9
+imagesize==1.4.1
+importlib-metadata==6.8.0
+importlib-resources==6.1.1
+incremental==22.10.0
+intel-cmplr-lib-rt==2024.0.0
+intel-cmplr-lic-rt==2024.0.0
+intel-opencl-rt==2024.0.0
+intel-openmp==2024.0.0
+ipykernel==6.27.1
+ipython==8.18.1
+ipython-genutils==0.2.0
+jaraco.classes==3.3.0
+jedi==0.19.1
+jeepney==0.8.0
+Jinja2==3.1.2
+jsonschema==4.20.0
+jsonschema-specifications==2023.11.1
+jupyter_client==8.6.0
+jupyter_core==5.5.0
+jupyterlab_pygments==0.3.0
+keyring==24.3.0
+kiwisolver==1.4.5
+markdown-it-py==3.0.0
+MarkupSafe==2.1.3
+matplotlib==3.8.2
+matplotlib-inline==0.1.6
+mdurl==0.1.2
+meshio==5.3.4
+mistune==3.0.2
+mkl==2024.0.0
+more-itertools==10.1.0
+multidict==6.0.4
+multiprocess==0.70.15
+nbclient==0.9.0
+nbconvert==7.11.0
+nbformat==5.9.2
+nbsphinx==0.9.3
+nest-asyncio==1.5.8
+nh3==0.2.14
+numpy==1.26.2
+olefile==0.46
+packaging==23.2
+pandocfilters==1.5.0
+parso==0.8.3
+pathos==0.3.1
+pexpect==4.9.0
+pickleshare==0.7.5
+Pillow==10.1.0
+pkginfo==1.9.6
+platformdirs==4.0.0
+pooch==1.8.0
+pox==0.3.3
+ppft==1.7.6.7
+prometheus-client==0.19.0
+prompt-toolkit==3.0.41
+psutil==5.9.6
+ptyprocess==0.7.0
+pure-eval==0.2.2
+pyasn1==0.5.1
+pyasn1-modules==0.3.0
+pycparser==2.21
+Pygments==2.17.2
+pyparsing==3.1.1
+PyQt5==5.15.10
+PyQt5-Qt5==5.15.2
+PyQt5-sip==12.13.0
+pyrsistent==0.20.0
+python-dateutil==2.8.2
+pytz==2023.3.post1
+pyvista==0.42.3
+pyvistaqt==0.11.0
+pywinpty==0.5.7
+PyYAML==6.0.1
+pyzmq==25.1.1
+QtPy==2.4.1
+readme-renderer==42.0
+referencing==0.31.0
+requests==2.31.0
+requests-toolbelt==1.0.0
+rfc3986==2.0.0
+rich==13.7.0
+rpds-py==0.13.1
+scooby==0.9.2
+SecretStorage==3.3.3
+setuptools-scm==8.0.4
+six==1.16.0
+snowballstemmer==2.2.0
+soupsieve==2.5
+Sphinx==7.2.6
+sphinx-rtd-theme==2.0.0
+sphinxcontrib-applehelp==1.0.7
+sphinxcontrib-devhelp==1.0.5
+sphinxcontrib-htmlhelp==2.0.4
+sphinxcontrib-jquery==4.1
+sphinxcontrib-jsmath==1.0.1
+sphinxcontrib-qthelp==1.0.6
+sphinxcontrib-serializinghtml==1.1.9
+stack-data==0.6.3
+tbb==2021.11.0
+terminado==0.18.0
+testpath==0.6.0
+tinycss2==1.2.1
+tomli==2.0.1
+tornado==6.4
+traitlets==5.14.0
+transforms3d==0.4.1
+twine==4.0.2
+Twisted==23.10.0
+typing_extensions==4.8.0
+urllib3==2.1.0
+vtk==9.3.0
+wcwidth==0.2.12
+webencodings==0.5.1
+wincertstore==0.2
+wslink==1.12.4
+yarl==1.9.3
+zipp==3.17.0
+zope.interface==6.1