Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -83,6 +83,13 @@ def __init__( self, inputMesh: vtkUnstructuredGrid, speHandler: bool = False ) -
self.logger = logging.getLogger( loggerTitle )
self.logger.setLevel( logging.INFO )
self.logger.propagate = False
handlers: list[ logging.Handler ] = self.logger.handlers
# Get the handler to specify if the logger already exist and have it
for handler in handlers:
# The CountWarningHandler can't be the handler to specify
if type( handler ) is not type( CountWarningHandler() ):
self.handler = handler
break

counter: CountWarningHandler = CountWarningHandler()
self.counter: CountWarningHandler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ def __init__(
self._allCellTypesExtended: tuple[ int, ...] = getAllCellTypesExtended()
self._allCellTypes: tuple[ int, ...] = getAllCellTypes()
self.speHandler: bool = speHandler
self.handler: logging.Handler

# Logger
self.logger: Logger
Expand All @@ -141,6 +142,13 @@ def __init__(
self.logger = logging.getLogger( loggerTitle )
self.logger.setLevel( logging.INFO )
self.logger.propagate = False
handlers: list[ logging.Handler ] = self.logger.handlers
# Get the handler to specify if the logger already exist and have it
for handler in handlers:
# The CountWarningHandler can't be the handler to specify
if type( handler ) is not type( CountWarningHandler() ):
self.handler = handler
break

counter: CountWarningHandler = CountWarningHandler()
self.counter: CountWarningHandler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@

"""

HANDLER: logging.Handler = VTKHandler()


@smproxy.filter( name="PVAttributeMapping", label="Attribute Mapping" )
@smhint.xml( f'<ShowInMenu category="{ FilterCategory.GENERIC_PROCESSING.value }"/>' )
Expand All @@ -76,7 +78,6 @@ def __init__( self: Self ) -> None:
self.piece: Piece = Piece.CELLS
self.clearAttributeNames = True
self.attributeNames: list[ str ] = []
self.handler: logging.Handler = VTKHandler()

@smproperty.intvector(
name="AttributePiece",
Expand Down Expand Up @@ -190,8 +191,8 @@ def RequestData(
attributeMappingFilter: AttributeMapping = AttributeMapping( meshFrom, outData, set( self.attributeNames ),
self.piece, True )

if not isHandlerInLogger( self.handler, attributeMappingFilter.logger ):
attributeMappingFilter.setLoggerHandler( self.handler )
if not isHandlerInLogger( HANDLER, attributeMappingFilter.logger ):
attributeMappingFilter.setLoggerHandler( HANDLER )

try:
attributeMappingFilter.applyFilter()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@

"""

HANDLER: logging.Handler = VTKHandler()


@SISOFilter( category=FilterCategory.GENERIC_PROCESSING,
decoratedLabel="Clip to the main frame",
Expand All @@ -45,10 +47,9 @@ class PVClipToMainFrame( VTKPythonAlgorithmBase ):
def __init__( self ) -> None:
"""Init motherclass, filter and logger."""
self._realFilter = ClipToMainFrame( speHandler=True )
self.handler: logging.Handler = VTKHandler()

if not isHandlerInLogger( self.handler, self._realFilter.logger ):
self._realFilter.SetLoggerHandler( self.handler )
if not isHandlerInLogger( HANDLER, self._realFilter.logger ):
self._realFilter.SetLoggerHandler( HANDLER )

def ApplyFilter( self, inputMesh: vtkMultiBlockDataSet, outputMesh: vtkMultiBlockDataSet ) -> None:
"""Is applying clipToMainFrame filter.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@

"""

HANDLER: logging.Handler = VTKHandler()


@SISOFilter( category=FilterCategory.GENERIC_PROCESSING,
decoratedLabel="Create Constant Attribute Per Region",
Expand All @@ -72,7 +74,6 @@ def __init__( self: Self ) -> None:

# Use the handler of paraview for the log.
self.speHandler: bool = True
self.handler: logging.Handler = VTKHandler()

# Settings of the attribute with the region indexes:
@smproperty.stringvector(
Expand Down Expand Up @@ -292,8 +293,8 @@ def ApplyFilter( self, inputMesh: vtkDataSet, outputMesh: vtkDataSet ) -> None:
self.speHandler,
)

if not isHandlerInLogger( self.handler, createConstantAttributePerRegionFilter.logger ):
createConstantAttributePerRegionFilter.setLoggerHandler( self.handler )
if not isHandlerInLogger( HANDLER, createConstantAttributePerRegionFilter.logger ):
createConstantAttributePerRegionFilter.setLoggerHandler( HANDLER )

try:
createConstantAttributePerRegionFilter.applyFilter()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@

"""

HANDLER: logging.Handler = VTKHandler()


@SISOFilter( category=FilterCategory.GENERIC_PROCESSING,
decoratedLabel="Fill Partial Arrays",
Expand All @@ -51,7 +53,6 @@ def __init__( self: Self, ) -> None:
"""Fill a partial attribute with constant value per component."""
self.clearDictAttributesValues: bool = True
self.dictAttributesValues: dict[ str, Union[ list[ Any ], None ] ] = {}
self.handler: logging.Handler = VTKHandler()

@smproperty.xml( """
<StringVectorProperty
Expand Down Expand Up @@ -108,8 +109,8 @@ def ApplyFilter( self, inputMesh: vtkMultiBlockDataSet, outputMesh: vtkMultiBloc
speHandler=True,
)

if not isHandlerInLogger( self.handler, fillPartialArraysFilter.logger ):
fillPartialArraysFilter.setLoggerHandler( self.handler )
if not isHandlerInLogger( HANDLER, fillPartialArraysFilter.logger ):
fillPartialArraysFilter.setLoggerHandler( HANDLER )

try:
fillPartialArraysFilter.applyFilter()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
- nan for float data.
"""

HANDLER: logging.Handler = VTKHandler()


@smproxy.filter( name="PVMergeBlocksEnhanced", label="Merge Blocks Keeping Partial Attributes" )
@smhint.xml( f'<ShowInMenu category="{ FilterCategory.GENERIC_PROCESSING.value }"/>' )
Expand All @@ -68,7 +70,6 @@ def __init__( self: Self ) -> None:
inputType="vtkMultiBlockDataSet",
outputType="vtkUnstructuredGrid",
)
self.handler: logging.Handler = VTKHandler()

def RequestDataObject(
self: Self,
Expand Down Expand Up @@ -118,8 +119,8 @@ def RequestData(

mergeBlockEnhancedFilter: MergeBlockEnhanced = MergeBlockEnhanced( inputMesh, True )

if not isHandlerInLogger( self.handler, mergeBlockEnhancedFilter.logger ):
mergeBlockEnhancedFilter.setLoggerHandler( self.handler )
if not isHandlerInLogger( HANDLER, mergeBlockEnhancedFilter.logger ):
mergeBlockEnhancedFilter.setLoggerHandler( HANDLER )

try:
mergeBlockEnhancedFilter.applyFilter()
Expand Down
7 changes: 4 additions & 3 deletions geos-pv/src/geos/pv/plugins/generic_processing/PVSplitMesh.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,14 @@

"""

HANDLER: logging.Handler = VTKHandler()


@SISOFilter( category=FilterCategory.GENERIC_PROCESSING, decoratedLabel="Split Mesh", decoratedType="vtkPointSet" )
class PVSplitMesh( VTKPythonAlgorithmBase ):

def __init__( self: Self ) -> None:
"""Split mesh cells."""
self.handler: logging.Handler = VTKHandler()

def ApplyFilter( self: Self, inputMesh: vtkPointSet, outputMesh: vtkPointSet ) -> None:
"""Apply vtk filter.
Expand All @@ -55,8 +56,8 @@ def ApplyFilter( self: Self, inputMesh: vtkPointSet, outputMesh: vtkPointSet ) -
outputMesh: Output mesh.
"""
splitMeshFilter: SplitMesh = SplitMesh( inputMesh, True )
if not isHandlerInLogger( self.handler, splitMeshFilter.logger ):
splitMeshFilter.setLoggerHandler( self.handler )
if not isHandlerInLogger( HANDLER, splitMeshFilter.logger ):
splitMeshFilter.setLoggerHandler( HANDLER )

try:
splitMeshFilter.applyFilter()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@

"""

HANDLER: logging.Handler = VTKHandler()

loggerTitle: str = "Geomechanics Calculator"


Expand All @@ -93,10 +95,9 @@ def __init__( self: Self ) -> None:
self.rockCohesion: float = DEFAULT_ROCK_COHESION
self.frictionAngle: float = DEFAULT_FRICTION_ANGLE_DEG

self.handler: logging.Handler = VTKHandler()
self.logger = logging.getLogger( loggerTitle )
self.logger.setLevel( logging.INFO )
self.logger.addHandler( self.handler )
self.logger.addHandler( HANDLER )
self.logger.propagate = False

counter: CountWarningHandler = CountWarningHandler()
Expand Down Expand Up @@ -265,8 +266,8 @@ def ApplyFilter(
speHandler=True,
)

if not isHandlerInLogger( self.handler, geomechanicsCalculatorFilter.logger ):
geomechanicsCalculatorFilter.setLoggerHandler( self.handler )
if not isHandlerInLogger( HANDLER, geomechanicsCalculatorFilter.logger ):
geomechanicsCalculatorFilter.setLoggerHandler( HANDLER )

geomechanicsCalculatorFilter.physicalConstants.grainBulkModulus = self.grainBulkModulus
geomechanicsCalculatorFilter.physicalConstants.specificDensity = self.specificDensity
Expand Down Expand Up @@ -303,8 +304,8 @@ def ApplyFilter(
True,
)

if not isHandlerInLogger( self.handler, geomechanicsCalculatorFilter.logger ):
geomechanicsCalculatorFilter.setLoggerHandler( self.handler )
if not isHandlerInLogger( HANDLER, geomechanicsCalculatorFilter.logger ):
geomechanicsCalculatorFilter.setLoggerHandler( HANDLER )

geomechanicsCalculatorFilter.physicalConstants.grainBulkModulus = self.grainBulkModulus
geomechanicsCalculatorFilter.physicalConstants.specificDensity = self.specificDensity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@

"""

HANDLER: logging.Handler = VTKHandler()
loggerTitle: str = "GEOS Geomechanics Workflow"


Expand Down Expand Up @@ -139,10 +140,9 @@ def __init__( self: Self ) -> None:
self.rockCohesion: float = DEFAULT_ROCK_COHESION
self.frictionAngle: float = DEFAULT_FRICTION_ANGLE_DEG

self.handler: logging.Handler = VTKHandler()
self.logger = logging.getLogger( loggerTitle )
self.logger.setLevel( logging.INFO )
self.logger.addHandler( self.handler )
self.logger.addHandler( HANDLER )
self.logger.propagate = False

counter: CountWarningHandler = CountWarningHandler()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@

"""

HANDLER: logging.Handler = VTKHandler()
loggerTitle: str = "Extract & Merge GEOS Block"


Expand Down Expand Up @@ -129,10 +130,9 @@ def __init__( self: Self ) -> None:

self.outputCellsT0: vtkMultiBlockDataSet = vtkMultiBlockDataSet()

self.handler: logging.Handler = VTKHandler()
self.logger = logging.getLogger( loggerTitle )
self.logger.setLevel( logging.INFO )
self.logger.addHandler( self.handler )
self.logger.addHandler( HANDLER )
self.logger.propagate = False

counter: CountWarningHandler = CountWarningHandler()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@

"""

HANDLER: logging.Handler = VTKHandler()
loggerTitle: str = "Geos Log Reader"


Expand Down Expand Up @@ -150,10 +151,9 @@ def __init__( self: Self ) -> None:
for prop in propsSolvers:
self.m_convergence.AddArray( prop )

self.handler: logging.Handler = VTKHandler()
self.logger = logging.getLogger( loggerTitle )
self.logger.setLevel( logging.INFO )
self.logger.addHandler( self.handler )
self.logger.addHandler( HANDLER )
self.logger.propagate = False

counter: CountWarningHandler = CountWarningHandler()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
* The attribute 'CellId' has to be used for the 'Selection Labels'.
"""

HANDLER: logging.Handler = VTKHandler()
loggerTitle: str = "Mohr Circle"


Expand Down Expand Up @@ -181,10 +182,9 @@ def __init__( self: Self ) -> None:
# Request data processing step - incremented each time RequestUpdateExtent is called
self.requestDataStep: int = -1

self.handler: logging.Handler = VTKHandler()
self.logger = logging.getLogger( loggerTitle )
self.logger.setLevel( logging.INFO )
self.logger.addHandler( self.handler )
self.logger.addHandler( HANDLER )
self.logger.propagate = False

counter: CountWarningHandler = CountWarningHandler()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@

"""

HANDLER: logging.Handler = VTKHandler()
loggerTitle: str = "Surface Geomechanics"


Expand All @@ -70,10 +71,9 @@ def __init__( self: Self ) -> None:
# friction angle (°)
self.frictionAngle: float = DEFAULT_FRICTION_ANGLE_DEG

self.handler: logging.Handler = VTKHandler()
self.logger = logging.getLogger( loggerTitle )
self.logger.setLevel( logging.INFO )
self.logger.addHandler( self.handler )
self.logger.addHandler( HANDLER )
self.logger.propagate = False

counter: CountWarningHandler = CountWarningHandler()
Expand Down Expand Up @@ -148,8 +148,8 @@ def ApplyFilter( self: Self, inputMesh: vtkMultiBlockDataSet, outputMesh: vtkMul
loggerName: str = f"Surface geomechanics for the blockIndex { blockIndex }"
sgFilter: SurfaceGeomechanics = SurfaceGeomechanics( surfaceBlock, loggerName, True )

if not isHandlerInLogger( self.handler, sgFilter.logger ):
sgFilter.SetLoggerHandler( self.handler )
if not isHandlerInLogger( HANDLER, sgFilter.logger ):
sgFilter.SetLoggerHandler( HANDLER )

sgFilter.SetRockCohesion( self._getRockCohesion() )
sgFilter.SetFrictionAngle( self._getFrictionAngle() )
Expand Down
8 changes: 4 additions & 4 deletions geos-pv/src/geos/pv/plugins/qc/PVCellTypeCounterEnhanced.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@

"""

HANDLER: logging.Handler = VTKHandler()


@smproxy.filter( name="PVCellTypeCounterEnhanced", label="Cell Type Counter Enhanced" )
@smhint.xml( f'<ShowInMenu category="{ FilterCategory.QC.value }"/>' )
Expand All @@ -60,8 +62,6 @@ def __init__( self: Self ) -> None:
# used to concatenate results if vtkMultiBlockDataSet
self._countsAll: CellTypeCounts = CellTypeCounts()

self.handler: logging.Handler = VTKHandler()

@smproperty.intvector(
name="SetSaveToFile",
label="Save to file",
Expand Down Expand Up @@ -141,8 +141,8 @@ def RequestData(
assert outputTable is not None, "Output pipeline is null."

cellTypeCounterEnhancedFilter: CellTypeCounterEnhanced = CellTypeCounterEnhanced( inputMesh, True )
if not isHandlerInLogger( self.handler, cellTypeCounterEnhancedFilter.logger ):
cellTypeCounterEnhancedFilter.setLoggerHandler( self.handler )
if not isHandlerInLogger( HANDLER, cellTypeCounterEnhancedFilter.logger ):
cellTypeCounterEnhancedFilter.setLoggerHandler( HANDLER )

try:
cellTypeCounterEnhancedFilter.applyFilter()
Expand Down
Loading