diff --git a/AUTHORS.rst b/AUTHORS.rst index 0c0561de5..d7d2db53a 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -12,7 +12,7 @@ * `Florian Wagner `_ - *RWTH Aachen University, Institute for Applied Geophysics and Geothermal Energy, Aachen, Germany* + *RWTH Aachen University, Geophysical Imaging and Monitoring (GIM), Aachen, Germany* florian@pygimli.org @@ -28,4 +28,4 @@ * `Andrea Balza `_ - *RWTH Aachen University, Institute for Applied Geophysics and Geothermal Energy, Aachen, Germany* + *RWTH Aachen University, Geophysical Imaging and Monitoring (GIM), Aachen, Germany* diff --git a/INSTALLATION.rst b/INSTALLATION.rst index 12f5da33c..52ddee7c8 100644 --- a/INSTALLATION.rst +++ b/INSTALLATION.rst @@ -36,7 +36,7 @@ Open a terminal (Linux & Mac) or the Anaconda Prompt (Windows) and type: .. code-block:: bash - conda create -n pg -c gimli -c conda-forge pygimli=1.3.1 + conda create -n pg -c gimli -c conda-forge pygimli=1.4.0 If you are using Windows or Mac, a new environment named "pg" should be visible in the Anaconda Navigator. If you want to use pyGIMLi from the command line, you @@ -78,13 +78,13 @@ condacolab package by condacolab.install() After doing so, the kernel is automatically restarted, so import condacolab -again and install pygimli using mamba just as mentioned above. +again and install pygimli using conda just as mentioned above. .. code:: Python import condacolab condacolab.check() - !mamba install -c gimli pygimli=1.3.1 + !conda install -c gimli pygimli=1.4.0 Testing the installation ------------------------ @@ -139,4 +139,4 @@ Later you can just update the pygimli code by Only if you need recent changes to the C++ core, you have to compile pyGIMLi using your systems toolchain as described in -https://www.pygimli.org/compilation.html#sec-build \ No newline at end of file +https://www.pygimli.org/compilation.html#sec-build diff --git a/README.md b/README.md index 60ea78aa8..2d9a5347c 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ separate environment. Here we call this environment pg, but you can give it any name. Note that this environment has to be created only once. ``` bash -conda create -n pg -c gimli -c conda-forge pygimli=1.3.1 +conda create -n pg -c gimli -c conda-forge pygimli=1.4.0 ``` If you are using Windows or Mac, a new environment named “pg” should be visible in the Anaconda Navigator. If you want to use pygimli from the command line, you have to activate the environment. You can put this line in your ~/.bashrc file so that it is activated automatically if you open a terminal. diff --git a/doc/gimliuses.bib b/doc/gimliuses.bib index 210c3b155..179471f9f 100644 --- a/doc/gimliuses.bib +++ b/doc/gimliuses.bib @@ -884,7 +884,6 @@ @Article{gruenenbaum2023JoH volume = {617}, doi = {10.1016/j.jhydrol.2023.129074}, publisher = {Elsevier {BV}}, - url = {https://doi.org/10.1016/j.jhydrol.2023.129074}, } @Article{rochlitz2023GJI, diff --git a/environment.yml b/environment.yml index d76b7a39b..a24720fe6 100644 --- a/environment.yml +++ b/environment.yml @@ -4,7 +4,7 @@ channels: - defaults - gimli dependencies: - - pgcore >= 1.3.0 + - pgcore >= 1.4.0 - matplotlib - jupyter - sphinx >= 3.1 diff --git a/pygimli/core/__init__.py b/pygimli/core/__init__.py index b7043f3c0..535a5d16b 100644 --- a/pygimli/core/__init__.py +++ b/pygimli/core/__init__.py @@ -888,7 +888,7 @@ def __ModellingBase__createJacobian_mt__(self, model, resp): if sys.platform == 'win32' or 'darwin': # strange pickle problem: see python test_PhysicsManagers.py ves from .logger import warn - warn('Multiprocess jacobian currently unavailable for win build') + warn('Multiprocess Jacobian currently unavailable for Win32 and Mac.') nProcs = 1 if nProcs == 1: