Merge branch 'ogs-import' into 'master'

[py] Import OpenGeoSys module properly

See merge request ogs/ogs!4843

Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/bcs_laplace_eq.py

 from math import cos, cosh, pi, sin, sinh
 
-import OpenGeoSys
+try:
+    import ogs.callbacks as OpenGeoSys
+except ModuleNotFoundError:
+    import OpenGeoSys
 
 a = 2.0 * pi / 3.0
 

Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/sin_x_sin_y_source_term.py

 from math import pi, sin
 
-import OpenGeoSys
+try:
+    import ogs.callbacks as OpenGeoSys
+except ModuleNotFoundError:
+    import OpenGeoSys
 
 a = 2.0 * pi
 b = 2.0 * pi

Tests/Data/HydroMechanics/IdealGas/flow_pressure_boundary/python_boundary.py

-import OpenGeoSys
+try:
+    import ogs.callbacks as OpenGeoSys
+except ModuleNotFoundError:
+    import OpenGeoSys
 
 p_flux_in = 1e-2
 p_0 = 1e5

Tests/Data/HydroMechanics/Linear/Unconfined_Compression_early/python_boundary.py

-import OpenGeoSys
+try:
+    import ogs.callbacks as OpenGeoSys
+except ModuleNotFoundError:
+    import OpenGeoSys
 
 dirichlet_displacement_top = -0.05
 dirichlet_displacement_0 = 0

Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/python_boundary.py

-import OpenGeoSys
+try:
+    import ogs.callbacks as OpenGeoSys
+except ModuleNotFoundError:
+    import OpenGeoSys
 
 dirichlet_displacement_0 = 0
 neumann_displacement_overburden = -2.125e6

Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/python_boundary_staggered.py

-import OpenGeoSys
+try:
+    import ogs.callbacks as OpenGeoSys
+except ModuleNotFoundError:
+    import OpenGeoSys
 
 dirichlet_displacement_0 = 0
 neumann_displacement_overburden = -2.125e6

Tests/Data/Mechanics/Linear/PythonHertzContact/hertz_contact_bc.py

-import OpenGeoSys
+try:
+    import ogs.callbacks as OpenGeoSys
+except ModuleNotFoundError:
+    import OpenGeoSys
 
 SPHERE_RADIUS = 1.0
 START_TIME = 0.0

Tests/Data/Mechanics/Linear/PythonPiston/piston_bc.py

-import OpenGeoSys
+try:
+    import ogs.callbacks as OpenGeoSys
+except ModuleNotFoundError:
+    import OpenGeoSys
 from chamber import *
 
 

Tests/Data/Parabolic/ComponentTransport/elder/elder-python-bcs.py

-import OpenGeoSys
+try:
+    import ogs.callbacks as OpenGeoSys
+except ModuleNotFoundError:
+    import OpenGeoSys
 
 
 class BCPressure(OpenGeoSys.BoundaryCondition):

Tests/Data/Parabolic/T/3D_3BHEs_array/bcs_tespy.py

@@ -11,7 +11,11 @@ print(sys.version)
 import os
 
 import numpy as np
-import OpenGeoSys
+
+try:
+    import ogs.callbacks as OpenGeoSys
+except ModuleNotFoundError:
+    import OpenGeoSys
 from pandas import read_csv
 from tespy.networks import load_network
 

Tests/Data/Parabolic/T/3D_3BHEs_array/bcs_tespy_closedloop.py

@@ -11,7 +11,11 @@ print(sys.version)
 import os
 
 import numpy as np
-import OpenGeoSys
+
+try:
+    import ogs.callbacks as OpenGeoSys
+except ModuleNotFoundError:
+    import OpenGeoSys
 from pandas import read_csv
 from tespy.networks import load_network
 

Tests/Data/Parabolic/T/3D_3BHEs_array_python_interface/bcs_tespy_and_serverCommunication.py

@@ -11,7 +11,11 @@ print(sys.version)
 import os
 
 import numpy as np
-import OpenGeoSys
+
+try:
+    import ogs.callbacks as OpenGeoSys
+except ModuleNotFoundError:
+    import OpenGeoSys
 from pandas import read_csv
 from tespy.networks import load_network
 

Tests/Data/Parabolic/T/3D_Beier_sandbox_python_interface/simulationX_test.py

@@ -8,7 +8,10 @@
 import sys
 
 print(sys.version)
-import OpenGeoSys
+try:
+    import ogs.callbacks as OpenGeoSys
+except ModuleNotFoundError:
+    import OpenGeoSys
 from pandas import read_csv
 
 df_server = read_csv(

scripts/ci/jobs/jupyter.yml

@@ -30,7 +30,7 @@ test notebooks via wheel:
       # status file and sh -c to workaround xvfb-run problems:
       # /usr/bin/xvfb-run: line 186: kill: (<PID>) - No such process"
       find . -type f -iname '*.ipynb' \
-          | grep -vP '\.ipynb_checkpoints|\.ci-skip\.ipynb$|_out|\.venv|PhaseField' \
+          | grep -vP '\.ipynb_checkpoints|\.ci-skip\.ipynb$|_out|\.venv|PhaseField|mtest' \
           | xargs xvfb-run -a \
               sh -c 'statf="$1"; shift; "$@" || echo "$?" >"$statf"' \
               -- "$status_file" \

web/content/docs/benchmarks/elliptic/poisson_equation/index.md

@@ -105,7 +105,11 @@ Python object `sinx_sinx_source_term` that is created in the last line of the
 Python script:
 
 ```python
-import OpenGeoSys
+try:
+    import ogs.callbacks as OpenGeoSys
+except ModuleNotFoundError:
+    import OpenGeoSys
+
 from math import pi, sin
 
 a = 2.0*pi

web/content/docs/userguide/features/python_bc.md

@@ -48,7 +48,10 @@ The path to the file can be defined in relative or absolute terms. For example:
 First, the OpenGeoSys module has to be imported:
 
 ```python
-import OpenGeoSys
+try:
+    import ogs.callbacks as OpenGeoSys
+except ModuleNotFoundError:
+    import OpenGeoSys
 ```
 
 This module doesn't need to be installed, if OpenGeoSys is compiled with Python support, then it is part of the Python
@@ -127,7 +130,10 @@ Examples of the application of Python boundary conditions can be found in [this
 ## Full example of a Python boundary condition
 
 ```python
-import OpenGeoSys
+try:
+    import ogs.callbacks as OpenGeoSys
+except ModuleNotFoundError:
+    import OpenGeoSys
 
 class BoundaryCondition(OpenGeoSys):