geone 1.2.15__tar.gz → 1.2.17__tar.gz

{geone-1.2.15/geone.egg-info → geone-1.2.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geone
-Version: 1.2.15
+Version: 1.2.17
 Summary: Geostatistics tools and Multiple Point Statistics
 Author-email: Julien Straubhaar <julien.straubhaar@unine.ch>, Philippe Renard <philippe.renard@unine.ch>
 License: 
@@ -79,6 +79,8 @@ Requires-Dist: scipy
 
 [![Documentation Status](https://readthedocs.org/projects/geone/badge/?version=latest)](https://geone.readthedocs.io/en/latest/?badge=latest)
 
+**Current version : 1.2.17** <!-- Update manually here! see src/geone/_version.py -->
+
 GEONE is a Python3 package providing a set of tools for geostatistical modeling, including:
 
 - multiple-point statistics (MPS) simulation as "DEESSE wrapper"

{geone-1.2.15 → geone-1.2.17}/README.md

@@ -2,6 +2,8 @@
 
 [![Documentation Status](https://readthedocs.org/projects/geone/badge/?version=latest)](https://geone.readthedocs.io/en/latest/?badge=latest)
 
+**Current version : 1.2.17** <!-- Update manually here! see src/geone/_version.py -->
+
 GEONE is a Python3 package providing a set of tools for geostatistical modeling, including:
 
 - multiple-point statistics (MPS) simulation as "DEESSE wrapper"

{geone-1.2.15 → geone-1.2.17/geone.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geone
-Version: 1.2.15
+Version: 1.2.17
 Summary: Geostatistics tools and Multiple Point Statistics
 Author-email: Julien Straubhaar <julien.straubhaar@unine.ch>, Philippe Renard <philippe.renard@unine.ch>
 License: 
@@ -79,6 +79,8 @@ Requires-Dist: scipy
 
 [![Documentation Status](https://readthedocs.org/projects/geone/badge/?version=latest)](https://geone.readthedocs.io/en/latest/?badge=latest)
 
+**Current version : 1.2.17** <!-- Update manually here! see src/geone/_version.py -->
+
 GEONE is a Python3 package providing a set of tools for geostatistical modeling, including:
 
 - multiple-point statistics (MPS) simulation as "DEESSE wrapper"

{geone-1.2.15 → geone-1.2.17}/src/geone/_version.py

@@ -1,6 +1,6 @@
 # Version
 
 # major, minor, micro
-version_info = (1, 2, 15)
+version_info = (1, 2, 17)
 
 __version__ = '.'.join(map(str, version_info))

{geone-1.2.15 → geone-1.2.17}/src/geone/blockdata.py

@@ -14,6 +14,14 @@ Module for managing block data (for deesse), and relative functions.
 import numpy as np
 import os
 
+# ============================================================================
+class BlockDataError(Exception):
+    """
+    Custom exception related to `blockdata` module.
+    """
+    pass
+# ============================================================================
+
 # ============================================================================
 class BlockData(object):
     """
@@ -36,7 +44,7 @@ class BlockData(object):
         - `nodeIndex[i][j]`: sequence of 3 floats, \
         node index in the simulation grid along x, y, z axis \
         of the j-th node of the i-th block
-        
+
     value : sequence of floats of length `nblock`, optional
         target value for each block (used if `blockDataUsage=1`)
 
@@ -87,6 +95,8 @@ class BlockData(object):
             maximal proportion of informed nodes in the block, above which the block
             data constraint is deactivated, for each block
         """
+        # fname = 'BlockData'
+
         self.blockDataUsage = blockDataUsage
         self.nblock = nblock
         self.nodeIndex = nodeIndex
@@ -159,8 +169,8 @@ def readBlockData(filename):
 
     # Check if the file exists
     if not os.path.isfile(filename):
-        print(f'ERROR ({fname}): invalid filename ({filename})')
-        return None
+        err_msg = f'{fname}: invalid filename ({filename})'
+        raise BlockDataError(err_msg)
 
     # Open the file in read mode
     with open(filename,'r') as ff:
@@ -211,6 +221,7 @@ def writeBlockData(bd, filename, fmt='.5g'):
         format string for target value, tolerance and active proportion (min
         and max) in the block data
     """
+    # fname = 'writeBlockData'
 
     if bd.blockDataUsage == 0:
         return None