Skip to content

Commit b80dcd7

Browse files
RomainBavilleRomainBaville
authored
refactor: move filter vtk from geos-mesh to geos-processing (#161)
* Move filter vtk from geos-mesh to geos-processing * Update the filters doc * Move the test of the filters to geos-processing
1 parent e518d95 commit b80dcd7

51 files changed

Lines changed: 1382 additions & 438 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/geos-mesh.rst‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ GEOS Mesh tools
1515

1616
./geos_mesh_docs/model
1717

18-
./geos_mesh_docs/processing
19-
2018
./geos_mesh_docs/stats
2119

2220
./geos_mesh_docs/utils

‎docs/geos_mesh_docs/processing.rst‎

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎docs/geos_mesh_docs/stats.rst‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
11
Mesh stats tools
22
^^^^^^^^^^^^^^^^
33

4-
The `stats` module of `geos-mesh` package contains filter to compute statistics on meshes.
4+
The `stats` module of `geos-mesh` package contains module to compute statistics on meshes.
55

66

7-
geos.mesh.stats.CellTypeCounterEnhanced filter
7+
geos.mesh.stats.meshQualityMetricHelpers module
88
-----------------------------------------------
99

10-
.. automodule:: geos.mesh.stats.CellTypeCounterEnhanced
10+
.. automodule:: geos.mesh.stats.meshQualityMetricHelpers
1111
:members:
1212
:undoc-members:
1313
:show-inheritance:
14-
15-
geos.mesh.stats.MeshQualityEnhanced filter
16-
-------------------------------------------
17-
18-
.. automodule:: geos.mesh.stats.MeshQualityEnhanced
19-
:members:
20-
:undoc-members:
21-
:show-inheritance:

‎docs/geos_processing_docs/generic_processing_tools.rst‎

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,58 @@
11
Generic processing filters
22
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
33

4-
In progress..
4+
The `generic_processing_tools` module of `geos-processing` package contains filters to process meshes.
5+
6+
7+
geos.processing.generic_processing_tools.AttributeMapping filter
8+
----------------------------------------------------------------
9+
10+
.. automodule:: geos.processing.generic_processing_tools.AttributeMapping
11+
:members:
12+
:undoc-members:
13+
:show-inheritance:
14+
15+
16+
geos.processing.generic_processing_tools.CreateConstantAttributePerRegion filter
17+
--------------------------------------------------------------------------------
18+
19+
.. automodule:: geos.processing.generic_processing_tools.CreateConstantAttributePerRegion
20+
:members:
21+
:undoc-members:
22+
:show-inheritance:
23+
24+
25+
geos.processing.generic_processing_tools.FillPartialArrays filter
26+
-----------------------------------------------------------------
27+
28+
.. automodule:: geos.processing.generic_processing_tools.FillPartialArrays
29+
:members:
30+
:undoc-members:
31+
:show-inheritance:
32+
33+
34+
geos.processing.generic_processing_tools.SplitMesh filter
35+
---------------------------------------------------------
36+
37+
.. automodule:: geos.processing.generic_processing_tools.SplitMesh
38+
:members:
39+
:undoc-members:
40+
:show-inheritance:
41+
42+
43+
geos.processing.generic_processing_tools.MergeBlockEnhanced filter
44+
------------------------------------------------------------------
45+
46+
.. automodule:: geos.processing.generic_processing_tools.MergeBlockEnhanced
47+
:members:
48+
:undoc-members:
49+
:show-inheritance:
50+
51+
52+
geos.processing.generic_processing_tools.ClipToMainFrame filter
53+
---------------------------------------------------------------
54+
55+
.. automodule:: geos.processing.generic_processing_tools.ClipToMainFrame
56+
:members:
57+
:undoc-members:
58+
:show-inheritance:

‎docs/geos_processing_docs/pre_processing.rst‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
11
Pre-processing filters
22
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
33

4-
In progress..
4+
The `pre_processing` module of `geos-processing` package contains filters to pre-process meshes for GEOS simulation.
5+
6+
geos.processing.pre_processing.CellTypeCounterEnhanced filter
7+
-------------------------------------------------------------
8+
9+
.. automodule:: geos.processing.pre_processing.CellTypeCounterEnhanced
10+
:members:
11+
:undoc-members:
12+
:show-inheritance:
13+
14+
geos.processing.pre_processing.MeshQualityEnhanced filter
15+
---------------------------------------------------------
16+
17+
.. automodule:: geos.processing.pre_processing.MeshQualityEnhanced
18+
:members:
19+
:undoc-members:
20+
:show-inheritance:

‎geos-mesh/src/geos/mesh/model/QualityMetricSummary.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
from matplotlib.patches import Patch
1818
from vtkmodules.vtkCommonDataModel import ( vtkCellTypes, VTK_TRIANGLE, VTK_QUAD, VTK_TETRA, VTK_PYRAMID,
1919
VTK_HEXAHEDRON, VTK_WEDGE, VTK_POLYGON, VTK_POLYHEDRON )
20-
from geos.mesh.processing.meshQualityMetricHelpers import ( QUALITY_METRIC_OTHER_START_INDEX, getAllCellTypesExtended,
21-
getQualityMeasureNameFromIndex, getQualityMetricFromIndex,
22-
MeshQualityMetricEnum, CellQualityMetricEnum,
23-
VtkCellQualityMetricEnum, CellQualityMetricAdditionalEnum,
24-
QualityMetricOtherEnum, QualityRange )
20+
from geos.mesh.stats.meshQualityMetricHelpers import ( QUALITY_METRIC_OTHER_START_INDEX, getAllCellTypesExtended,
21+
getQualityMeasureNameFromIndex, getQualityMetricFromIndex,
22+
MeshQualityMetricEnum, CellQualityMetricEnum,
23+
VtkCellQualityMetricEnum, CellQualityMetricAdditionalEnum,
24+
QualityMetricOtherEnum, QualityRange )
2525
from geos.mesh.model.CellTypeCounts import CellTypeCounts
2626

2727
from packaging.version import Version

geos-mesh/src/geos/mesh/processing/meshQualityMetricHelpers.py renamed to geos-mesh/src/geos/mesh/stats/meshQualityMetricHelpers.py

File renamed without changes.

‎geos-mesh/tests/test_meshQualityHelpers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from vtkmodules.vtkCommonDataModel import ( VTK_TRIANGLE, VTK_QUAD, VTK_TETRA, VTK_PYRAMID, VTK_WEDGE, VTK_HEXAHEDRON,
1111
VTK_POLYGON, VTK_POLYHEDRON )
1212

13-
from geos.mesh.processing.meshQualityMetricHelpers import (
13+
from geos.mesh.stats.meshQualityMetricHelpers import (
1414
VtkCellQualityMetricEnum,
1515
CellQualityMetricAdditionalEnum,
1616
QualityRange,

0 commit comments

Comments
 (0)