diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 1fe2db1c0..000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,22 +0,0 @@ -version: 1.0.{build} -platform: x64 -branches: - only: - - dev -build: - verbosity: minimal -notifications: -- provider: Email - to: - - mail@pygimli.org - on_build_success: false - on_build_failure: true - on_build_status_changed: true - -environment: - BOOST_ROOT: C:\Libraries\boost - BOOST_LIBRARYDIR: C:\Libraries\boost\stage\lib - -build_script: - - set PATH=C:\msys64\usr\bin;%PATH% - - C:\msys64\usr\bin\bash -lc "curl -sL http://install.pygimli.org | bash" diff --git a/.grenrc b/.grenrc deleted file mode 100644 index edeb32b03..000000000 --- a/.grenrc +++ /dev/null @@ -1,7 +0,0 @@ -{ - "dataSource": "issues", - "ignoreLabels": [], - "ignoreIssuesWith": ["question", "discussion"], - "onlyMilestones": false, - "groupBy": "label" -} diff --git a/.jenkins.sh b/.jenkins.sh index 966ed1bbe..a049a82ac 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -80,7 +80,7 @@ OMP_THREAD_LIMIT=4 python -c "import pygimli; print(pygimli.Report()); pygimli.t # Setup for 3D visualizations # ------------------------------------------------ export DISPLAY=:99.0 -export PYVISTA_OFF_SCREEN=True +export PYVISTA_OFF_SCREEN=true # ------------------------------------------------ make clean-gallery diff --git a/.landscape.yml b/.landscape.yml deleted file mode 100644 index ff5825b5d..000000000 --- a/.landscape.yml +++ /dev/null @@ -1,50 +0,0 @@ -# Landscape.io configuration file -# Only considers python directory at the moment. -# E-Mail notifications are sent if score decreases. - -python-targets: - - 3 -doc-warnings: yes -test-warnings: no -#strictness: veryhigh # besser nicht =) -strictness: medium -max-line-length: 80 -autodetect: yes -ignore-paths: - - apps - - cmake - - doc - - examples - - external - - matlab - - mingw - - rpm - - thirdParty - - pygimli/gui - -pylint: - disable: - - E1101 # avoids errors about missing C++ members in pygimli - - E0611 # avoids errors about missing C++ members in pygimli - - E0602 # avoids errors about unassigned function calls, i.e. _pygimli_.load - - R0204 # - - C0413 # module level import not at top of file - - E0401 # - options: - max-args: 10 - max-locals: 50 - max-branches: 50 - max-statements: 100 - max-attributes: 10 - -pep8: - disable: - - E402 # same as pylint C0413 - -pep257: - disable: - - D203 # conflicts with D211 - -pyflakes: - disable: - - F401 # imported module not used (mainly for __init__) pylint also checks this diff --git a/.prospector.yml b/.prospector.yml deleted file mode 100644 index 0ea5e34d7..000000000 --- a/.prospector.yml +++ /dev/null @@ -1,17 +0,0 @@ -# used by www.landscape.io - -pylint: - disable: - - E1101 # avoids errors about missing C++ members in pygimli - - E0611 # avoids errors about missing C++ members in pygimli - - E0602 # avoids errors about unassigned function calls, i.e. _pygimli_.load - options: - max-args: 10 - max-locals: 50 - max-branches: 50 - max-statements: 100 - max-attributes: 10 - -pyflakes: - disable: - - F401 # imported module not used (mainly for __init__) pylint also checks this diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index bbf3feaf6..000000000 --- a/.travis.yml +++ /dev/null @@ -1,57 +0,0 @@ -# Configuration file for continous integration using travis. -# See build results on http://travis-ci.org/gimli-org/gimli -# Before commiting changes to this file, check consistency on http://lint.travis-ci.org/ - -# Most explicit routing to GCE Precise -sudo: required -dist: precise -group: edge - -language: cpp - -compiler: clang -os: - - linux - #- osx - -branches: - only: - - dev - -osx_image: xcode7.2b2 - -addons: - apt: - packages: - - build-essential - - clang-3.6 - - libclang-3.6-dev - - llvm-3.6 - - libllvm-3.6-ocaml-dev - - libblas-dev - - liblapack-dev - - libsuitesparse-dev - - libedit-dev - - coreutils - - python3-dev - - python3-numpy - - cmake - - liboost-all-dev - -before_install: - # hack automatic OS detection - - echo 'NAME="Ubuntu"' | sudo tee /etc/os-release - - echo 'VERSION="14.04.2 LTS, Trusty Tahr"' | sudo tee -a /etc/os-release - - echo 'ID=ubuntu' | sudo tee -a /etc/os-release - - echo 'ID_LIKE=debian' | sudo tee -a /etc/os-release - - echo 'PRETTY_NAME="Ubuntu 14.04.2 LTS"' | sudo tee -a /etc/os-release - - echo 'VERSION_ID="14.04"' | sudo tee -a /etc/os-release - - echo 'HOME_URL="http://www.ubuntu.com/"' | sudo tee -a /etc/os-release - -install: - - curl -sL http://install.pygimli.org | bash -s py=3 j=4 - -#notifications: -#email: - #recipients: - #- mail@pygimli.org diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 98b4a4e67..a8f004931 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -8,7 +8,7 @@ Please provide the output of `print(pygimli.Report())` here. If that does not work, please give provide some additional information on your: **Operating system**: e.g. Windows, Linux or Mac? -**Python version**: e.g. 3.8, 3.9, etc.? +**Python version**: e.g. 3.9, 3.10, etc.? **pyGIMLi version**: Output of `print(pygimli.__version__)` **Way of installation**: e.g. Conda package, manual compilation from source, etc. @@ -30,7 +30,7 @@ Tell us what should happen or what you want to achieve. Tell us what happens instead and/or provide the output of your script. ``` -Paste output here. +Paste your script output here. ``` > If possible, please add one or more labels to your issue, e.g. if you expect that your issue is rather a question than a problem with the code, please add the label "question". \ No newline at end of file diff --git a/doc/_static/css/custom.css b/doc/_static/css/custom.css index ed3585984..e6ca2c220 100644 --- a/doc/_static/css/custom.css +++ b/doc/_static/css/custom.css @@ -35,6 +35,13 @@ a:hover { color: #107896; text-decoration: none; } +.btn.btn-primary { + color: white; +} +.btn.btn-primary:hover { + color: white; + text-decoration: underline; +} h1, h2, diff --git a/doc/_static/usecases/uecker2022.png b/doc/_static/usecases/uecker2022.png new file mode 100644 index 000000000..0d5d59745 Binary files /dev/null and b/doc/_static/usecases/uecker2022.png differ diff --git a/doc/examples/4_gravimetry_magnetics/plot_03_inv-gravity-2d.py b/doc/examples/4_gravimetry_magnetics/plot_03_inv-gravity-2d.py index aa1f1845e..16e1e5de5 100644 --- a/doc/examples/4_gravimetry_magnetics/plot_03_inv-gravity-2d.py +++ b/doc/examples/4_gravimetry_magnetics/plot_03_inv-gravity-2d.py @@ -8,7 +8,6 @@ inversion using a depth-weighting function as outlined in the paper. """ -# %%% import numpy as np import pygimli as pg import pygimli.meshtools as mt diff --git a/doc/examples/4_gravimetry_magnetics/plot_08_inv-magnetics-3d.py b/doc/examples/4_gravimetry_magnetics/plot_08_inv-magnetics-3d.py index 0afa46d23..9c8117bbd 100644 --- a/doc/examples/4_gravimetry_magnetics/plot_08_inv-magnetics-3d.py +++ b/doc/examples/4_gravimetry_magnetics/plot_08_inv-magnetics-3d.py @@ -12,7 +12,7 @@ inversion using a depth-weighting function as outlined in the paper. """ -# %%% +# sphinx_gallery_thumbnail_number = 2 import numpy as np import pygimli as pg from pygimli.viewer import pv diff --git a/doc/examples/5_flow_transport/plot_hydrogeophysical_modeling.py b/doc/examples/5_flow_transport/plot_hydrogeophysical_modeling.py index 2bc406f77..cacb9b030 100644 --- a/doc/examples/5_flow_transport/plot_hydrogeophysical_modeling.py +++ b/doc/examples/5_flow_transport/plot_hydrogeophysical_modeling.py @@ -140,7 +140,7 @@ # Create a dipole-dipole measurement scheme and a suitable mesh for ERT forward # simulations. -ertScheme = ert.createERTData(pg.utils.grange(-20, 20, dx=1.0), schemeName='dd') +ertScheme = ert.createData(pg.utils.grange(-20, 20, dx=1.0), schemeName='dd') meshERT = mt.createParaMesh(ertScheme, quality=33, paraMaxCellSize=0.2, boundaryMaxCellSize=50, smooth=[1, 2]) diff --git a/doc/gimliuses.bib b/doc/gimliuses.bib index 179471f9f..b125e6aac 100644 --- a/doc/gimliuses.bib +++ b/doc/gimliuses.bib @@ -888,7 +888,7 @@ @Article{gruenenbaum2023JoH @Article{rochlitz2023GJI, author = {Rochlitz, R. and Becken, M. and G\"{u}nther, T.}, - journal = {Geophys. J. Int.}, + journal = {Geophysical Journal International}, title = {Three-dimensional inversion of semi-airborne electromagnetic data with a second-order finite-element forward solver}, year = {2023}, number = {1}, @@ -898,4 +898,130 @@ @Article{rochlitz2023GJI publisher = {Oxford University Press ({OUP})}, } +@Article{Moser2023, + author = {Moser, C. and Binley, A. and Flores Orozco, A.}, + doi = {10.1016/j.wasman.2023.07.006}, + issn = {0956-053X}, + journal = {Waste Management}, + pages = {208-222}, + title = {3D electrode configurations for spectral induced polarization surveys of landfills}, + volume = {169}, + year = {2023}, +} + + +@Article{su151813574, + abstract = {Seismic characterization of landslides offers the potential for developing high-resolution models on subsurface shear-wave velocity profile. However, seismic methods based on reflection processing are challenging to apply in such scenarios as a consequence of the disturbance to the often well-defined structural and stratigraphic layering by the landslide process itself. We evaluate the use of alternative seismic characterization methods based on elastic full waveform inversion (E-FWI) to probe the subsurface of a landslide complex in Majes, southern Peru, where recent agricultural development and irrigation activities have altered the hydrology and groundwater table and are thought to have contributed to increased regional landslide activities that present continuing sustainability community development challenges. We apply E-FWI to a 2D near-surface seismic data set for the purpose of better understanding the subsurface in the vicinity of a recent landslide location. We use seismic first-arrival travel-time tomography to generate the inputs required for E-FWI to generate the final high-resolution 2D compressional- and shear-wave (P- and S-wave) velocity models. At distances greater than 140 m from the cliff, the inverted models show a predominantly vertically stratified velocity structure with a low-velocity near-surface layer between 5–15 m depth. At distances closer than 140 m from the cliff, though, the models exhibit significantly reduced shear-wave velocities, stronger heterogeneity, and localized shorter wavelength structure in the top 20 m. These observations are consistent with those expected for a recent landslide complex; however, follow-on geotechnical analysis is required to confirm these assertions. Overall, the E-FWI seismic approach may be helpful for future landslide characterization projects and, when augmented with additional geophysical and geotechnical analyses, may allow for improved understanding of the hydrogeophysical properties associated with suspected ground-water-driven landslide activity.}, + author = {Yang, J. and Shragge, J. and Girard, A. J. and Gonzales, E. and Ticona, J. and Minaya, A. and Krahenbuhl, R.}, + doi = {10.3390/su151813574}, + issn = {2071-1050}, + journal = {Sustainability}, + number = {18}, + title = {Seismic Characterization of a Landslide Complex: A Case History from Majes, Peru}, + volume = {15}, + year = {2023}, +} + +@Article{Wang2022, + doi = {10.1007/s10712-022-09747-8}, + year = {2022}, + month = nov, + publisher = {Springer Science and Business Media {LLC}}, + volume = {44}, + number = {2}, + pages = {357--386}, + author = {Wang, Z. and Sun, C. and Wu, D.}, + title = {Near-surface Site Characterization Based on Joint Iterative Analysis of First-arrival and Surface-wave Data}, + journal = {Surveys in Geophysics} +} + +@Article{ArboledaZapata2023, + doi = {10.1002/esp.5695}, + year = {2023}, + month = sep, + publisher = {Wiley}, + author = {Arboleda-Zapata, M. and Guillemoteau, J. and Luc{\'{\i}}a, A. and Eberle, J. and Tronicke, J. and Korup, O.}, + title = {Tracing past extreme floods on an alluvial fan using geophysical surveying}, + journal = {Earth Surface Processes and Landforms} +} + +@Article{Carrier2023, + doi = {10.1007/s10346-023-02137-0}, + year = {2023}, + month = oct, + publisher = {Springer Science and Business Media {LLC}}, + author = {Carrier, A. and Meric, O. and Bottelin, P.}, + title = {Characterizing landslide dynamics from time-lapse time domain induced polarization and ground-based imaging: a case study of the {MontGombert} landslide (French, Alps)}, + journal = {Landslides} +} @Comment{jabref-meta: databaseType:bibtex;} +@Article{Herring2023, + doi = {10.1002/ppp.2207}, + year = {2023}, + month = oct, + publisher = {Wiley}, + volume = {34}, + number = {4}, + pages = {494--512}, + author = {Herring, T. and Lewkowicz, A. G. and Hauck, C. and Hilbich, C. and Mollaret, C. and Oldenborger, G. A. and Uhlemann, S. and Farzamian, M. and Calmels, F. and Scandroglio, R.}, + title = {Best practices for using electrical resistivity tomography to investigate permafrost}, + journal = {Permafrost and Periglacial Processes} +} + +@Article{Pavoni2023, + author = {Pavoni, M. and Boaga, J. and Wagner, F.M. and Bast, A. and Phillips, M.}, + doi = {10.1016/j.jappgeo.2023.105097}, + journal = {Journal of Applied Geophysics}, + keywords = {Mountain permafrost, Electrical resistivity tomography (ERT), Refraction seismic tomography (RST), Joint inversion}, + pages = {105097}, + title = {Characterization of rock glaciers environments combining structurally-coupled and petrophysically-coupled joint inversions of electrical resistivity and seismic refraction datasets}, + year = {2023}, +} + +@article{Steiner2023, + doi = {10.1016/j.cageo.2023.105339}, + year = {2023}, + month = jul, + publisher = {Elsevier {BV}}, + volume = {176}, + pages = {105339}, + author = {Steiner, M. and Flores Orozco, A.}, + title = {formikoj: A flexible library for data management and processing in geophysics - Application for seismic refraction data}, + journal = {Computers {\&} Geosciences} +} + +@article{Fiolleau2023, + doi = {10.1016/j.jappgeo.2023.105090}, + year = {2023}, + month = aug, + publisher = {Elsevier {BV}}, + volume = {215}, + pages = {105090}, + author = {Fiolleau, S. and Uhlemann, S. and Wielandt, S. and Dafflon, B.}, + title = {Understanding slow-moving landslide triggering processes using low-cost passive seismic and inclinometer monitoring}, + journal = {Journal of Applied Geophysics} +} + +@article{Uecker2023, + doi = {10.3389/frwa.2023.1057725}, + year = {2023}, + month = jul, + publisher = {Frontiers Media {SA}}, + volume = {5}, + author = {Uecker, R. K. and Flinchum, B. A. and Holbrook, W. S. and Carr, B. J.}, + title = {Mapping bedrock topography: a seismic refraction survey and landscape analysis in the Laramie Range, Wyoming}, + journal = {Frontiers in Water} +} + +@article{IsunzaManrique2023, + doi = {10.1190/geo2022-0133.1}, + year = {2023}, + month = apr, + publisher = {Society of Exploration Geophysicists}, + volume = {88}, + number = {3}, + pages = {B73--B88}, + author = {Isunza Manrique, I. and Caterina, D. and Nguyen, F. and Hermans, T.}, + title = {Quantitative interpretation of geoelectric inverted data with a robust probabilistic approach}, + journal = {Geophysics} +} \ No newline at end of file diff --git a/doc/paper_carousel.py b/doc/paper_carousel.py index 49d754207..6352dfa71 100644 --- a/doc/paper_carousel.py +++ b/doc/paper_carousel.py @@ -1,6 +1,10 @@ # Paper examples on start page. Images have to be in _static/usecases. # Order does not matter, will be shuffled on doc build. showcase = [ + dict(img="uecker2022.png", + link="https://doi.org/10.3389/frwa.2023.1057725", + title="Mapping bedrock topography", + subtitle="Uecker et al. (2022), Frontiers in Water"), dict(img="nazari2023.png", title="3D SAEM survey design", subtitle="Nazari et al. (2023), Minerals", diff --git a/gimli.code-workspace b/gimli.code-workspace deleted file mode 100644 index 362d7c25b..000000000 --- a/gimli.code-workspace +++ /dev/null @@ -1,7 +0,0 @@ -{ - "folders": [ - { - "path": "." - } - ] -} \ No newline at end of file