Fix merge issues and ci fix

Author: mlemayTTE

geos-geomechanics/src/geos/geomechanics/model/MohrCircle.py

@@ -113,4 +113,3 @@ def computePrincipalComponents( self: Self, stressVector: npt.NDArray[ np.float6
         """
         # get stress principal components
         self.m_p3, self.m_p2, self.m_p1 = ( computeStressPrincipalComponentsFromStressVector( stressVector ) )
-

geos-geomechanics/src/geos/geomechanics/processing/geomechanicsCalculatorFunctions.py

@@ -925,4 +925,3 @@ def computeNormalShearStress( stressTensor: npt.NDArray[ np.float64 ],
     tauVec: npt.NDArray[ np.float64 ] = T - np.dot( sigmaN, directionVector )
     tau: float = float( np.linalg.norm( tauVec ) )
     return ( sigmaN, tau )
-

geos-geomechanics/tests/testsFunctionsGeomechanicsCalculator.py

@@ -247,9 +247,9 @@ def test_shearCapacityUtilization( self: Self ) -> None:
 
         # calculation
         obtained: npt.NDArray[ np.float64 ] = fcts.shearCapacityUtilization( traction, rockCohesion, frictionAngle )
-        expected: npt.NDArray[ np.float64 ] = np.array( [ 0.899, 0.923, 0.982, 1.004, 1.048 ] )
+        expected: list[ float ] = [ 0.899, 0.923, 0.982, 1.004, 1.048 ]
 
-        self.assertSequenceEqual( np.round( obtained, 3 ).flatten().tolist(), expected.tolist() )
+        self.assertSequenceEqual( np.round( obtained, 3 ).flatten().tolist(), expected )
 
     def test_computeStressPrincipalComponents( self: Self ) -> None:
         """Test calculation of stress principal components from stress tensor."""

geos-geomechanics/tests/testsMohrCircle.py

@@ -75,7 +75,7 @@ def test_MohrCoulombInit( self: Self ) -> None:
     def test_computeShearStress( self: Self ) -> None:
         """Test calculation of shear stress from normal stress."""
         # inputs
-        stressNormal: npt.NDArray[ np.float64 ] = np.linspace( 5.0e8, 1.0e9, 100 )
+        stressNormal: npt.NDArray[ np.float64 ] = np.linspace( 5.0e8, 1.0e9, 100 ).astype( float )
         # expected values
         expectedValues: npt.NDArray[ np.float64 ] = np.array( [
             888163490.0,
@@ -184,7 +184,7 @@ def test_computeShearStress( self: Self ) -> None:
         obtained: npt.NDArray[ np.float64 ] = np.array( mohrCoulomb.computeShearStress( stressNormal ) )
 
         # test results
-        self.assertSequenceEqual( expectedValues.tolist(), np.round( obtained ).tolist() )
+        self.assertSequenceEqual( expectedValues.tolist(), np.round( obtained ).tolist() )  # type: ignore[arg-type]
 
     def test_computeFailureEnvelop1( self: Self ) -> None:
         """Test calculation of failure envelop from minimum normal stress."""
@@ -221,8 +221,12 @@ def test_computeFailureEnvelop1( self: Self ) -> None:
         normalStressObtained, shearStressObtained = mohrCoulomb.computeFailureEnvelop( stressNormalMax, n=10 )
 
         # test results
-        self.assertSequenceEqual( normalStressExpected.tolist(), np.round( normalStressObtained ).tolist() )
-        self.assertSequenceEqual( shearStressExpected.tolist(), np.round( shearStressObtained ).tolist() )
+        self.assertSequenceEqual(
+            normalStressExpected.tolist(),  # type: ignore[arg-type]
+            np.round( normalStressObtained ).tolist() )
+        self.assertSequenceEqual(
+            shearStressExpected.tolist(),  # type: ignore[arg-type]
+            np.round( shearStressObtained ).tolist() )
 
     def test_computeFailureEnvelop2( self: Self ) -> None:
         """Test calculation of failure envelop in user-defined range."""
@@ -262,5 +266,9 @@ def test_computeFailureEnvelop2( self: Self ) -> None:
                                                                                        n=10 )
 
         # test results
-        self.assertSequenceEqual( normalStressExpected.tolist(), np.round( normalStressObtained ).tolist() )
-        self.assertSequenceEqual( shearStressExpected.tolist(), np.round( shearStressObtained ).tolist() )
+        self.assertSequenceEqual(
+            normalStressExpected.tolist(),  # type: ignore[arg-type]
+            np.round( normalStressObtained ).tolist() )
+        self.assertSequenceEqual(
+            shearStressExpected.tolist(),  # type: ignore[arg-type]
+            np.round( shearStressObtained ).tolist() )

geos-posp/setup.py

@@ -2,18 +2,15 @@
 from setuptools import setup
 
 # This is where you add any fancy path resolution to the local lib:
-geos_geomecha_path: str = (Path(__file__).parent.parent / "geos-geomechanics").as_uri()
-geos_utils_path: str = (Path(__file__).parent.parent / "geos-utils").as_uri()
-
-setup(
-    install_requires=[
-        "vtk >= 9.3",
-        "numpy >= 1.26",
-        "pandas >= 2.2",
-        "typing_extensions >= 4.12",
-	"types-setuptools >= 78.1.0",
-        f"geos-geomechanics @ {geos_geomecha_path}",
-        f"geos-utils @ {geos_utils_path}",
-    ]
-)
+geos_geomecha_path: str = ( Path( __file__ ).parent.parent / "geos-geomechanics" ).as_uri()
+geos_utils_path: str = ( Path( __file__ ).parent.parent / "geos-utils" ).as_uri()
 
+setup( install_requires=[
+    "vtk >= 9.3",
+    "numpy >= 1.26",
+    "pandas >= 2.2",
+    "typing_extensions >= 4.12",
+    "types-setuptools >= 78.1.0",
+    f"geos-geomechanics @ {geos_geomecha_path}",
+    f"geos-utils @ {geos_utils_path}",
+] )

geos-posp/src/PVplugins/PVGeomechanicsAnalysis.py

@@ -14,7 +14,6 @@
 from vtkmodules.vtkCommonCore import vtkInformation, vtkInformationVector
 from vtkmodules.vtkCommonDataModel import vtkPointSet, vtkUnstructuredGrid
 
-
 dir_path = os.path.dirname( os.path.realpath( __file__ ) )
 parent_dir_path = os.path.dirname( dir_path )
 if parent_dir_path not in sys.path:
@@ -322,12 +321,7 @@ def RequestData(
             int: 1 if calculation successfully ended, 0 otherwise.
         """
         try:
-<<<<<<< HEAD
             self.m_logger.info( f"Apply filter {__name__}" )
-            from filters.GeomechanicsCalculator import GeomechanicsCalculator
-=======
-            self.m_logger.info(f"Apply filter {__name__}")
->>>>>>> main
 
             inData = self.GetInputData( inInfoVec, 0, 0 )
             assert inData is not None

geos-posp/src/PVplugins/PVGeosLogReader.py

@@ -144,8 +144,9 @@ def __init__( self: Self ) -> None:
             self.m_propertiesWells.AddArray( prop )
 
         self.m_propertiesAquifers: vtkDAS = vtkDAS()
-        self.m_propertiesAquifers.AddObserver( "ModifiedEvent",
-                                               createModifiedCallback( self ) )  # type: ignore[arg-type]
+        self.m_propertiesAquifers.AddObserver(
+            "ModifiedEvent",  # type: ignore[arg-type]
+            createModifiedCallback( self ) )
         propsAquifers: list[ str ] = [
             "Volume",
             "VolumetricRate",

geos-posp/src/PVplugins/__init__.py

@@ -11,4 +11,3 @@
     m_path = os.path.abspath( os.path.join( dir_path, python_root, m, 'src' ) )
     if m_path not in sys.path:
         sys.path.insert( 0, m_path )
-