Skip to content

Commit ce3b253

Browse files
refactor: Move PVGeomechanicsAnalysis to geos-pv and GeomechanicsCalculator to geos-processing (#140)
* move GeomechnicsCalculator to geos-mesh * move PVGeomechanicsAnalysis in geos-pv * move GeomechanicsCalculator in the correct folder * Remove PVPythonAlgorithmBase * refactor computeElasticModulus functions * refactor compute biot coefficient * refactor computeCompressibilityCoefficient function * refactor computeRealEffectiveStressRatio * refactor computeSpecificGravity * refactor computeTotalStresses * refactor computBasicOutputs * refactor computeAdvence * Add the function getOutput * Clean for the ci * update the doc * Change the name to add logic * refactor the doc * Refactor the paraview plugin * clean for ci * clean the doc * fix the ci * Update the workflow plugins using the filter * fix the test * fix the ci * Add the new folder geos-processing * move GeomechanicsCalculators to geos-processing * Apply suggestions from Paloma's review Co-authored-by: paloma-martinez <104762252+paloma-martinez@users.noreply.github.com> * Keep the old way to load the file, this update is for another pr * fix the ci * Factorize the checkMandatoryAttributesFunction and add docs * update import * fix Install packages * fix ci * fix geos-post build * Apply Jacques suggestion with dataclass * update dataclass * fix ruff * update the doc * Apply suggestions from Paloma's review Co-authored-by: paloma-martinez <104762252+paloma-martinez@users.noreply.github.com> * Fix dataclass default value --------- Co-authored-by: paloma-martinez <104762252+paloma-martinez@users.noreply.github.com>
1 parent ccb1e18 commit ce3b253

28 files changed

Lines changed: 1942 additions & 1829 deletions

.github/workflows/python-package.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jobs:
6161
- geos-geomechanics
6262
- geos-mesh
6363
- geos-posp
64+
- geos-processing
6465
- geos-timehistory
6566
- geos-trame
6667
- geos-xml-tools
@@ -72,8 +73,10 @@ jobs:
7273
dependencies: "geos-utils"
7374
- package-name: geos-mesh
7475
dependencies: "geos-utils geos-geomechanics"
75-
- package-name: geos-posp
76+
- package-name: geos-processing
7677
dependencies: "geos-utils geos-mesh geos-geomechanics"
78+
- package-name: geos-posp
79+
dependencies: "geos-utils geos-mesh geos-geomechanics geos-processing"
7780
- package-name: pygeos-tools
7881
dependencies: "geos-utils geos-mesh"
7982
- package-name: geos-timehistory

.github/workflows/typing-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: "Pull Request Typing Check"
2-
on:
2+
on:
33
- pull_request
44

55
# Cancels in-progress workflows for a PR when updated
@@ -16,7 +16,7 @@ jobs:
1616
max-parallel: 3
1717
matrix:
1818
# add packages to check typing
19-
package-name: ["geos-geomechanics", "geos-posp", "geos-timehistory", "geos-utils", "geos-trame", "geos-xml-tools", "hdf5-wrapper"]
19+
package-name: ["geos-geomechanics", "geos-posp", "geos-processing", "geos-timehistory", "geos-utils", "geos-trame", "geos-xml-tools", "hdf5-wrapper"]
2020

2121
steps:
2222
- uses: actions/checkout@v4

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
# Add python modules to be documented
1919
python_root = '..'
20-
python_modules = ( 'geos-ats', 'geos-geomechanics', 'geos-mesh', 'geos-posp', 'geos-pv', 'geos-timehistory',
20+
python_modules = ( 'geos-ats', 'geos-geomechanics', 'geos-mesh', 'geos-posp', 'geos-processing', 'geos-pv', 'geos-timehistory',
2121
'geos-utils', 'geos-xml-tools', 'geos-xml-viewer', 'hdf5-wrapper', 'pygeos-tools' )
2222

2323

@@ -45,7 +45,7 @@
4545
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
4646
# ones.
4747
extensions = [
48-
'sphinx.ext.napoleon', 'sphinx_design', 'sphinx_rtd_theme', 'sphinxarg.ext', 'sphinxcontrib.programoutput',
48+
'sphinx.ext.napoleon', 'sphinx_design', 'sphinx_rtd_theme', 'sphinxarg.ext', 'sphinxcontrib.programoutput',
4949
'sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.mathjax', 'sphinx.ext.todo', 'sphinx.ext.viewcode'
5050
]
5151

docs/geos-processing.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
GEOS Processing tools
2+
========================
3+
4+
5+
.. toctree::
6+
:maxdepth: 5
7+
:caption: Contents:
8+
9+
./geos_processing_docs/post_processing.rst
10+
11+
./geos_processing_docs/pre_processing.rst
12+
13+
./geos_processing_docs/generic_processing_tools.rst

docs/geos_mesh_docs/processing.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ geos.mesh.processing.FillPartialArrays filter
2727
:undoc-members:
2828
:show-inheritance:
2929

30-
3130
geos.mesh.processing.meshQualityMetricHelpers module
3231
-----------------------------------------------------
3332

docs/geos_posp_docs/PVplugins.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@ PVExtractMergeBlocksVolumeWell plugin
3434

3535
.. automodule:: PVplugins.PVExtractMergeBlocksVolumeWell
3636

37-
38-
PVGeomechanicsAnalysis plugin
39-
---------------------------------------
40-
41-
.. automodule:: PVplugins.PVGeomechanicsAnalysis
42-
43-
4437
PVGeomechanicsWorkflowVolume plugin
4538
---------------------------------------------
4639

docs/geos_posp_docs/filters.rst

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@ vtk Filters
33

44
This package defines vtk filters that allows to process Geos outputs.
55

6-
geos_posp.filters.GeomechanicsCalculator module
7-
---------------------------------------------------
8-
9-
.. automodule:: geos_posp.filters.GeomechanicsCalculator
10-
:members:
11-
:undoc-members:
12-
:show-inheritance:
13-
146
geos_posp.filters.GeosBlockExtractor module
157
-----------------------------------------------
168

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Generic processing filters
2+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3+
4+
In progress..
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Post-processing filters
2+
^^^^^^^^^^^^^^^^^^^^^^^^^^
3+
4+
This module contains GEOS post-processing tools.
5+
6+
Geomechanics post-processing tools
7+
=====================================
8+
9+
geos.processing.post_processing.GeomechanicsCalculator module
10+
--------------------------------------------------------------
11+
12+
.. automodule:: geos.processing.post_processing.GeomechanicsCalculator
13+
:members:
14+
:undoc-members:
15+
:show-inheritance:
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Pre-processing filters
2+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3+
4+
In progress..

0 commit comments

Comments
 (0)