Skip to content

Commit 5e305d2

Browse files
committed
Merge branch 'main' into RomainBaville/feature/VTK_filter_and_PVCreateConstantAttributePerRegion
Update to main.
2 parents 06f57f9 + 0fa4d8f commit 5e305d2

Some content is hidden

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

41 files changed

+3990
-308
lines changed

.ruff.toml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Exclude a variety of commonly ignored directories.
2-
extend-exclude = ["tests/data"]
2+
extend-exclude = ["tests/data", "geos-mesh/src/geos/mesh/model/_bar_label.py"]
3+
34

45
line-length = 120
56
indent-width = 4
@@ -21,12 +22,12 @@ select = [
2122
"W", # pycodestyle warnings
2223
"F", # pyflakes
2324
# "UP", # pyupgrade deactivate since python39
24-
"B", # flake8-bugbear
25-
"SIM", # flake8-simplify
26-
"ANN", # flake8-annotations
27-
"C4", # flake8-comprehensions
25+
"B", # flake8-bugbear
26+
"SIM", # flake8-simplify
27+
"ANN", # flake8-annotations
28+
"C4", # flake8-comprehensions
2829
# "I", # isort - manage by yapf
29-
"D", # pydocstyle
30+
"D", # pydocstyle
3031
]
3132

3233
ignore = [

README.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Package summary
1717
* `geos-ats` package includes tools for managing integrated tests for GEOS.
1818
* `pygeos-tools` package adds a variety of tools for working with *pygeosx* objects.
1919

20-
The next packages are dedicated to pre- and post-process GEOS inputs/outputs.
20+
The next packages are dedicated to pre- and post-process GEOS inputs/outputs.
2121

2222
The following packages contain basic utilities used by the other ones:
2323

@@ -110,7 +110,7 @@ Installation
110110

111111
* *Manual installation:*
112112

113-
GEOS Python packages can be manually installed with pip using `python` >= 3.10.
113+
GEOS Python packages can be manually installed with pip using `python` >= 3.10.
114114

115115
To install any package, run the following commands from the geosPythonPackage directory:
116116

@@ -131,21 +131,28 @@ Installation
131131
[!WARNING]
132132
Due to local package conflicts with `pip install`, it is recommended to use the `--upgrade` option when building packages, or to use the script `install_packages.sh` located at the root of the repository.
133133
[!NOTE]
134-
geos-pv package cannot be build alone, but together with Paraview ([see Paraview compilation guide](https://gitlab.kitware.com/paraview/paraview/-/blob/master/Documentation/dev/build.md)). It is recommended to use Paraview v5.12+, which is based on python 3.10+. Alternatively, plugins from geos-pv/PVplugins can be manually loaded into Paraview ([see documentation](https://docs.paraview.org/en/latest/ReferenceManual/pythonProgrammableFilter.html#python-algorithm)).
134+
geos-pv package cannot be build alone, but together with Paraview ([see Paraview compilation guide](https://gitlab.kitware.com/paraview/paraview/-/blob/master/Documentation/dev/build.md)). It is recommended to use Paraview v5.12+, which is based on python 3.10+. Alternatively, plugins from `geos-pv/src/geos/pv/plugins` can be manually loaded into Paraview ([see documentation](https://docs.paraview.org/en/latest/ReferenceManual/pythonProgrammableFilter.html#python-algorithm)).
135135
136136
137137
Contributions
138138
-------------
139139
140140
GEOS Python packages repository gathers python scripts from any GEOS developpers and users. Feel free to share any scripts that may benefit to the GEOS community.
141141
142-
If you would like to report a bug, please submit an [issue](https://github.com/GEOS-DEV/geosPythonPackages/issues/new).
142+
If you would like to report a bug, please submit an [issue](https://github.com/GEOS-DEV/geosPythonPackages/issues/new).
143143
144144
If you would like to contribute to GEOS Python packages, please respect the following guidelines:
145145
146146
1. Create a new branch named from this template: `[CONTRIBUTOR]/[TYPE]/[TITLE]` where CONTRIBUTOR is the name of the contributor, TYPE is the type of contribution among 'feature', 'refactor', 'doc', 'ci', TITLE is a short title for the branch.
147147
2. Add your code trying to integrate into the current code architecture.
148-
3. Push the branch, open a new PR respecting naming [semantics](https://gist.github.com/joshbuchea/6f47e86d2510bce28f8e7f42ae84c716), and add reviewers
148+
3. Run mypy, ruff and yapf in this order
149+
```
150+
python -m pip install --upgrade mypy ruff yapf
151+
python -m mypy --config-file ./.mypy.ini --check-untyped-defs ./<PACKAGE_NAME>
152+
python -m ruff check --fix --config .ruff.toml ./<PACKAGE_NAME>
153+
python -m yapf -r -i --style .style.yapf ./<PACKAGE_NAME>
154+
```
155+
4. Push the branch, open a new PR respecting naming [semantics](https://gist.github.com/joshbuchea/6f47e86d2510bce28f8e7f42ae84c716), and add reviewers
149156
150157
If you do not have the rights to push the code and open new PRs, consider opening a new issue to explain what you want to do and ask for the dev rights.
151158

docs/geos-pv.rst

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ GEOS Paraview plugins
77

88
./geos_pv_docs/home.rst
99

10-
./geos_pv_docs/modules.rst
10+
./geos_pv_docs/utilities.rst
1111

12-
./geos_pv_docs/readers.rst
12+
./geos_pv_docs/readers.rst
13+
14+
./geos_pv_docs/meshQuality.rst
15+
16+
./geos_pv_docs/processing.rst

docs/geos_mesh_docs/model.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,18 @@ Model
44
The `model` module of `geos-mesh` package contains data model.
55

66

7-
geos.mesh.model.CellTypeCounts filter
7+
geos.mesh.model.CellTypeCounts module
88
--------------------------------------
99

1010
.. automodule:: geos.mesh.model.CellTypeCounts
11+
:members:
12+
:undoc-members:
13+
:show-inheritance:
14+
15+
geos.mesh.model.QualityMetricSummary module
16+
--------------------------------------------
17+
18+
.. automodule:: geos.mesh.model.QualityMetricSummary
1119
:members:
1220
:undoc-members:
1321
:show-inheritance:

docs/geos_mesh_docs/processing.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ geos.mesh.processing.CreateConstantAttributePerRegion filter
1111
:undoc-members:
1212
:show-inheritance:
1313

14+
geos.mesh.processing.meshQualityMetricHelpers module
15+
-----------------------------------------------------
16+
17+
.. automodule:: geos.mesh.processing.meshQualityMetricHelpers
18+
:members:
19+
:undoc-members:
20+
:show-inheritance:
21+
1422
geos.mesh.processing.SplitMesh filter
1523
--------------------------------------
1624

docs/geos_mesh_docs/stats.rst

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,18 @@ Mesh stats tools
44
The `stats` module of `geos-mesh` package contains filter to compute statistics on meshes.
55

66

7-
geos.mesh.stats.CellTypeCounter filter
8-
--------------------------------------
7+
geos.mesh.stats.CellTypeCounterEnhanced filter
8+
-----------------------------------------------
99

10-
.. automodule:: geos.mesh.stats.CellTypeCounter
10+
.. automodule:: geos.mesh.stats.CellTypeCounterEnhanced
11+
:members:
12+
:undoc-members:
13+
:show-inheritance:
14+
15+
geos.mesh.stats.MeshQualityEnhanced filter
16+
-------------------------------------------
17+
18+
.. automodule:: geos.mesh.stats.MeshQualityEnhanced
1119
:members:
1220
:undoc-members:
1321
:show-inheritance:

docs/geos_pv_docs/geosLogReaderUtils.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,42 @@ GeosLogReaderUtils functions
44
This package define functions dedicated to the GeosLogReader.
55

66

7-
geos.pv.geosLogReaderUtils.GeosLogReaderAquifers module
7+
GeosLogReaderAquifers module
88
-------------------------------------------------------------------
99

1010
.. automodule:: geos.pv.geosLogReaderUtils.GeosLogReaderAquifers
1111
:members:
1212
:undoc-members:
1313
:show-inheritance:
1414

15-
geos.pv.geosLogReaderUtils.geosLogReaderConvergence module
15+
geosLogReaderConvergence module
1616
---------------------------------------------------------------------
1717

1818
.. automodule:: geos.pv.geosLogReaderUtils.GeosLogReaderConvergence
1919
:members:
2020
:undoc-members:
2121
:show-inheritance:
2222

23-
geos.pv.geosLogReaderUtils.GeosLogReaderFlow module
23+
GeosLogReaderFlow module
2424
---------------------------------------------------------------
2525

2626
.. automodule:: geos.pv.geosLogReaderUtils.GeosLogReaderFlow
2727
:members:
2828
:undoc-members:
2929
:show-inheritance:
3030

31-
geos.pv.geosLogReaderUtils.GeosLogReaderFunctions module
31+
GeosLogReaderFunctions module
3232
--------------------------------------------------------------------
3333

3434
.. automodule:: geos.pv.geosLogReaderUtils.geosLogReaderFunctions
3535
:members:
3636
:undoc-members:
3737
:show-inheritance:
3838

39-
geos.pv.geosLogReaderUtils.GeosLogReaderWells module
39+
GeosLogReaderWells module
4040
--------------------------------------------------------------------
4141

4242
.. automodule:: geos.pv.geosLogReaderUtils.GeosLogReaderWells
4343
:members:
4444
:undoc-members:
45-
:show-inheritance:
45+
:show-inheritance:

docs/geos_pv_docs/home.rst

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
Home
22
====
33

4-
**geos-pv** is a Python package that gathers `Paraview <https://www.paraview.org/>`_ plugins of GEOS python tools.
4+
**geos-pv** is a Python package that gathers `Paraview <https://www.paraview.org/>`_ plugins of GEOS python tools.
55

66
It includes:
77

88
* Paraview readers allowing to load data;
9-
* generic tools to processes meshes;
9+
* generic tools to process meshes;
1010
* GEOS pre-processing tools to clean and check GEOS input mesh;
1111
* GEOS post-processing tools to clean GEOS output mesh, compute additional properties, or create specific plots such as Mohr's circle plot.
1212

13-
The packages can be loaded into Paraview using the Plugin Manager from `Tools > Plugin Manager`. On success, you will
14-
see the selected plugin in the `Filters`` menu (see `Paraview documentation <https://docs.paraview.org/en/latest/ReferenceManual/pythonProgrammableFilter.html>`.
13+
The packages can be loaded into Paraview using the Plugin Manager from `Tools > Plugin Manager`. On success, you will
14+
see the selected plugin in the `Filters`` menu (see `Paraview documentation <https://docs.paraview.org/en/latest/ReferenceManual/pythonProgrammableFilter.html>`_).
1515

16-
Alternatively, geos-pv package can be build together with Paraview ([see Paraview compilation guide](https://gitlab.kitware.com/paraview/paraview/-/blob/master/Documentation/dev/build.md)).
16+
Alternatively, geos-pv package can be build together with Paraview (see `Paraview compilation guide <https://gitlab.kitware.com/paraview/paraview/-/blob/master/Documentation/dev/build.md>`_).
1717
It is recommended to use Paraview v5.12+, which is based on python 3.10+. If you need to build geos-pv package with the paraview dependency, use the command:
18-
`pip install Path/To/geosPythonPackages/geos-pv[paraview]`
18+
19+
.. code-block:: bash
20+
21+
pip install path/to/geosPythonPackages/geos-pv[paraview]

docs/geos_pv_docs/meshQuality.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Mesh Quality
2+
================
3+
4+
5+
PVCellTypeCounterEnhanced
6+
----------------------------------
7+
8+
.. automodule:: geos.pv.plugins.PVCellTypeCounterEnhanced
9+
10+
PVMeshQualityEnhanced
11+
---------------------------
12+
13+
.. automodule:: geos.pv.plugins.PVMeshQualityEnhanced

docs/geos_pv_docs/processing.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Post-/Pre-processing
2+
=========================
3+
4+
PVSplitMesh
5+
----------------------------------
6+
7+
.. automodule:: geos.pv.plugins.PVSplitMesh

0 commit comments

Comments
 (0)