last fixes

Author: jafranc

geos-mesh/src/geos/mesh/processing/MergeBlockEnhanced.py

@@ -110,18 +110,17 @@ def applyFilter( self: Self ) -> None:
 
         Returns:
             bool: True if the blocks were successfully merged, False otherwise.
+
+        Raises:
+            VTKError (geos.utils.Errors) : error captured if any from the VTK log
         """
         self.logger.info( f"Applying filter { self.logger.name }." )
 
         outputMesh: vtkUnstructuredGrid
-        try:
-            outputMesh = mergeBlocks( self.inputMesh, keepPartialAttributes=True, logger=self.logger )
-        except ( VTKError ):
-            self.logger.info( f"The filter {self.logger.name} failed." )
-            raise
-        else:
-            self.outputMesh = outputMesh
-            self.logger.info( f"The filter {self.logger.name} succeeded." )
+        outputMesh = mergeBlocks( self.inputMesh, keepPartialAttributes=True, logger=self.logger )
+        self.logger.info( f"The filter {self.logger.name} failed." )
+        self.outputMesh = outputMesh
+        self.logger.info( f"The filter {self.logger.name} succeeded." )
 
 
     def getOutput( self: Self ) -> vtkUnstructuredGrid:

geos-mesh/src/geos/mesh/utils/multiblockModifiers.py

@@ -2,6 +2,8 @@
 # SPDX-FileCopyrightText: Copyright 2023-2024 TotalEnergies.
 # SPDX-FileContributor: Martin Lemay, Paloma Martinez
 from typing import Union
+import logging
+# import re
 
 from vtkmodules.vtkCommonDataModel import ( vtkCompositeDataSet, vtkDataObjectTreeIterator, vtkMultiBlockDataSet,
                                             vtkUnstructuredGrid, vtkDataSet )
@@ -16,7 +18,8 @@
     from vtkmodules.vtkFiltersCore import vtkAppendDataSets
 
 from geos.mesh.utils.arrayModifiers import fillAllPartialAttributes
-from geos.utils.Logger import ( getLogger, Logger, VTKCaptureLog, RegexExceptionFilter )
+from geos.utils.Errors import VTKError
+from geos.utils.Logger import ( getLogger, Logger, VTKCaptureLog, RegexExceptionFilter)
 
 __doc__ = """Contains a method to merge blocks of a VTK multiblock dataset."""
 
@@ -52,7 +55,8 @@ def mergeBlocks(
         logger: Logger = getLogger( "mergeBlocks", True )
 
     vtkLogger.SetStderrVerbosity(vtkLogger.VERBOSITY_TRACE)
-    logger.addFilter(RegexExceptionFilter())
+    logger.addFilter(RegexExceptionFilter()) # will raise VTKError if captured VTK Error
+    logger.setLevel(logging.DEBUG)
 
     # Fill the partial attributes with default values to keep them during the merge.
     if keepPartialAttributes and not fillAllPartialAttributes( inputMesh, logger ):
@@ -87,7 +91,7 @@ def mergeBlocks(
                 captured_log.seek(0) #be kind let's just rewind
                 captured = captured_log.read().decode()
 
-            logger.error(captured.strip())
+            logger.debug(captured.strip())
             outputMesh: vtkUnstructuredGrid = af.GetOutputDataObject( 0 )
 
     return outputMesh

geos-posp/src/PVplugins/PVMohrCirclePlot.py

@@ -804,11 +804,7 @@ def createMohrCirclesAtTimeStep(
             list[MohrCircle]: list of MohrCircles for the current time step.
         """
         # get mesh and merge if needed
-        try:
-            meshMerged: vtkUnstructuredGrid = mergeBlocks( mesh )
-        except (VTKError):
-            raise
-
+        meshMerged: vtkUnstructuredGrid = mergeBlocks( mesh )
         # assert meshMerged is not None, "Input data is undefined"
 
         stressArray: npt.NDArray[ np.float64 ] = getArrayInObject( meshMerged,

geos-posp/src/geos_posp/filters/GeosBlockMerge.py

@@ -366,12 +366,8 @@ def mergeChildBlocks( self: Self, compositeBlock: vtkMultiBlockDataSet ) -> vtkU
             self.m_logger.warning( "Some partial attributes may not have been propagated to the whole mesh." )
 
         # merge blocks
-        try:
-            mergedBlocks = mergeBlocks( compositeBlock )
-        except (VTKError):
-            raise
-        else:
-            return mergedBlocks
+        mergedBlocks = mergeBlocks( compositeBlock )
+        return mergedBlocks
 
     def convertFaultsToSurfaces( self: Self ) -> bool:
         """Convert blocks corresponding to faults to surface.

geos-utils/src/geos/utils/Logger.py

@@ -54,10 +54,13 @@ def __init__(self):
 
     def filter(self, record : logging.LogRecord):
         """
-            Filter VTK Error from stdErr
+            Filter VTK Error from stdErr.
             
             Args:
                 record(loggging.LogRecord)
+
+            Raises:
+                VTKError(geos.utils.Error) if a pattern symbol is caught in the stderr.
         """
         message = record.getMessage()
         if self.regex.search(message):
@@ -82,7 +85,8 @@ def VTKCaptureLog()->Generator[Any,Any,Any]:
     #     print(err)
 
     # Save original stderr file descriptor
-    original_stderr_fd = sys.stderr.fileno()
+    # original_stderr_fd = sys.stderr.fileno()
+    original_stderr_fd = 2
     saved_stderr_fd = os.dup(original_stderr_fd)
 
     # Create a temporary file to capture stderr