Skip to content
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f4f9bc6
update logger generic processing tool
Nov 17, 2025
d0b2bfb
Refactor SplitMesh without PVPythonAlgorytmBase
Nov 17, 2025
e5823f3
Merge branch 'main' into RomainBaville/refactor/AddAndCheckLoggerForF…
Nov 17, 2025
be96ffd
Uniform logger of posp-processing filters
Nov 17, 2025
cbba20b
Uniform logger of generic-processing-tools filters
Nov 17, 2025
313469d
Refactor the filter without VTKPythonAlgorythmBase
Nov 17, 2025
97010df
Update with CellTypeCounterEnhanced changes
Nov 17, 2025
5bdc8e0
Refactor the filter without VTKPythonAlgorythmBase
Nov 17, 2025
479813a
Uniform the logger in the paraview plugin
Nov 17, 2025
e8159d3
Merge branch 'main' into RomainBaville/refactor/AddAndCheckLoggerForF…
Nov 17, 2025
ebe20dd
Merge branch 'main' into RomainBaville/refactor/AddAndCheckLoggerForF…
Nov 18, 2025
33e8249
clean ruff and yapf
Nov 18, 2025
94537cb
remove PVPythonAlgorythmBase
Nov 18, 2025
533fce1
update logger
Nov 19, 2025
1e935ed
Uniform the import
Nov 19, 2025
cf9a437
Refactor SplitMesh
Nov 20, 2025
fe04cb2
Refactor CellTypeCounterEnhanced
Nov 20, 2025
380a693
Refactor MeshQualityEnhanced
Nov 20, 2025
934f734
Update to the last version of the main
Nov 20, 2025
5b7a2af
clean test
Nov 20, 2025
e14a065
fix ruff
Nov 20, 2025
1966e36
add source for the paraview handler
Nov 20, 2025
6ac33ec
improve try - except strategy
Nov 21, 2025
c62097c
Update to the last version of the base branch
Nov 21, 2025
d7f69d8
Uniform applyFilter to log messages
Nov 21, 2025
c6c1c9d
fix ruff and yapf
Nov 21, 2025
64c5c21
Fix test
Nov 24, 2025
4eaef30
fix test
Nov 24, 2025
af6e564
Update to the last version of the main
Nov 25, 2025
fa79fd4
Update to the last version of the main
Nov 28, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ def __init__(
else:
self.logger = logging.getLogger( loggerTitle )
self.logger.setLevel( logging.INFO )
self.logger.propagate = False

def setLoggerHandler( self: Self, handler: logging.Handler ) -> None:
"""Set a specific handler for the filter logger.
Expand All @@ -113,7 +114,7 @@ def setLoggerHandler( self: Self, handler: logging.Handler ) -> None:
Args:
handler (logging.Handler): The handler to add.
"""
if not self.logger.hasHandlers():
if len( self.logger.handlers ) == 0:
self.logger.addHandler( handler )
else:
self.logger.warning( "The logger already has an handler, to use yours set the argument 'speHandler'"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ def __init__( self, speHandler: bool = False, **properties: str ) -> None:
else:
self.logger = logging.getLogger( loggerTitle )
self.logger.setLevel( logging.INFO )
self.logger.propagate = False

def ComputeTransform( self ) -> None:
"""Update the transformation."""
Expand Down Expand Up @@ -264,7 +265,7 @@ def SetLoggerHandler( self, handler: logging.Handler ) -> None:
Args:
handler (logging.Handler): The handler to add.
"""
if not self.logger.hasHandlers():
if len( self.logger.handlers ) == 0:
self.logger.addHandler( handler )
else:
self.logger.warning( "The logger already has an handler, to use yours set the argument 'speHandler' to True"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
from typing_extensions import Self

import vtkmodules.util.numpy_support as vnp
from vtkmodules.vtkCommonDataModel import (
vtkMultiBlockDataSet,
vtkDataSet,
)
from vtkmodules.vtkCommonDataModel import vtkMultiBlockDataSet, vtkDataSet

from geos.utils.Logger import ( getLogger, Logger, CountWarningHandler )
from geos.mesh.utils.arrayHelpers import ( getArrayInObject, getComponentNames, getNumberOfComponents,
Expand Down Expand Up @@ -134,6 +131,7 @@ def __init__(
else:
self.logger = logging.getLogger( loggerTitle )
self.logger.setLevel( logging.INFO )
self.logger.propagate = False

def setLoggerHandler( self: Self, handler: logging.Handler ) -> None:
"""Set a specific handler for the filter logger.
Expand All @@ -144,7 +142,7 @@ def setLoggerHandler( self: Self, handler: logging.Handler ) -> None:
Args:
handler (logging.Handler): The handler to add.
"""
if not self.logger.hasHandlers():
if len( self.logger.handlers ) == 0:
self.logger.addHandler( handler )
else:
# This warning does not count for the number of warning created during the application of the filter.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Copyright 2023-2024 TotalEnergies.
# SPDX-FileContributor: Romain Baville, Martin Lemay

import logging
from typing_extensions import Self
from typing import Union, Any

from geos.utils.Logger import logging, Logger, getLogger
from geos.utils.Logger import ( Logger, getLogger )
from geos.mesh.utils.arrayModifiers import fillPartialAttributes
from geos.mesh.utils.arrayHelpers import getAttributePieceInfo

Expand Down Expand Up @@ -89,6 +89,7 @@ def __init__(
else:
self.logger = logging.getLogger( loggerTitle )
self.logger.setLevel( logging.INFO )
self.logger.propagate = False

def setLoggerHandler( self: Self, handler: logging.Handler ) -> None:
"""Set a specific handler for the filter logger.
Expand All @@ -99,7 +100,7 @@ def setLoggerHandler( self: Self, handler: logging.Handler ) -> None:
Args:
handler (logging.Handler): The handler to add.
"""
if not self.logger.hasHandlers():
if len( self.logger.handlers ) == 0:
self.logger.addHandler( handler )
else:
self.logger.warning( "The logger already has an handler, to use yours set the argument 'speHandler' to True"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@

from typing_extensions import Self

from geos.utils.Logger import Logger, getLogger
from geos.utils.Logger import ( Logger, getLogger )
from geos.mesh.utils.multiblockModifiers import mergeBlocks

from vtkmodules.vtkCommonDataModel import (
vtkMultiBlockDataSet,
vtkUnstructuredGrid,
)
from vtkmodules.vtkCommonDataModel import vtkMultiBlockDataSet, vtkUnstructuredGrid

__doc__ = """
Merge Blocks Keeping Partial Attributes is a filter that allows to merge blocks from a multiblock dataset
Expand Down Expand Up @@ -89,6 +86,7 @@ def __init__(
else:
self.logger = logging.getLogger( loggerTitle )
self.logger.setLevel( logging.INFO )
self.logger.propagate = False

def setLoggerHandler( self: Self, handler: logging.Handler ) -> None:
"""Set a specific handler for the filter logger.
Expand All @@ -98,7 +96,7 @@ def setLoggerHandler( self: Self, handler: logging.Handler ) -> None:
Args:
handler (logging.Handler): The handler to add.
"""
if not self.logger.hasHandlers():
if len( self.logger.handlers ) == 0:
self.logger.addHandler( handler )
else:
self.logger.warning( "The logger already has an handler, to use yours set the argument 'speHandler' to True"
Expand All @@ -119,6 +117,8 @@ def applyFilter( self: Self ) -> None:
outputMesh = mergeBlocks( self.inputMesh, keepPartialAttributes=True, logger=self.logger )
self.outputMesh = outputMesh

self.logger.info( f"The filter { self.logger.name } succeeded." )

def getOutput( self: Self ) -> vtkUnstructuredGrid:
"""Get the merged mesh.

Expand Down
Loading