Skip to content

Commit a4fba69

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents b7cc6ca + a8d707b commit a4fba69

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
[![license: LGPL v3](https://img.shields.io/badge/license-LGPL%20v3-blue.svg)]()
99
[![Documentation Status](https://readthedocs.org/projects/gempy/badge/?version=latest)](http://gempy.readthedocs.io/?badge=latest)
1010
[![Travis Build](https://travis-ci.org/cgre-aachen/gempy.svg?branch=master)]()
11+
[![DOI](https://zenodo.org/badge/96211155.svg)](https://zenodo.org/badge/latestdoi/96211155)
12+
1113

1214
<p align="center"><img src="docs/source/images/model_examples.png" width="800"></p>
1315

@@ -102,7 +104,7 @@ recommend using either Conda or PyPi as both will take care of automatically ins
102104

103105
`$ conda install gempy`
104106

105-
#### PyPi
107+
#### PyPi (at the moment is an old version. To be updated in the following weeks)
106108

107109
`$ pip install gempy`
108110

@@ -114,7 +116,7 @@ Otherwise you can clone the current repository by downloading is manually or by
114116

115117
and then manually install it using the provided Python install file by calling
116118

117-
`$ python install.py`
119+
`$ python gempy/setup.py install`
118120

119121
in the cloned or downloaded repository folder. Make sure you have installed all necessary dependencies listed above before using *GemPy*.
120122

@@ -127,4 +129,4 @@ explaining its capabilities, [the theory behind it](http://gempy.readthedocs.io/
127129
## References
128130

129131
* Calcagno, P., Chilès, J. P., Courrioux, G., & Guillen, A. (2008). Geological modelling from field data and geological knowledge: Part I. Modelling method coupling 3D potential-field interpolation and geological rules. Physics of the Earth and Planetary Interiors, 171(1-4), 147-157.
130-
* Lajaunie, C., Courrioux, G., & Manuel, L. (1997). Foliation fields and 3D cartography in geology: principles of a method based on potential interpolation. Mathematical Geology, 29(4), 571-584.
132+
* Lajaunie, C., Courrioux, G., & Manuel, L. (1997). Foliation fields and 3D cartography in geology: principles of a method based on potential interpolation. Mathematical Geology, 29(4), 571-584.

0 commit comments

Comments
 (0)