021e7c794c
Merge branch 'master' into docs
...
# Conflicts:
# SimPEG/Mesh/TensorMesh.py
2016-03-29 22:53:16 -07:00
b4f329f65a
Bump version: 0.1.9 → 0.1.10
2016-03-23 13:04:18 -07:00
b5b70390cb
Merge branch 'dev' into docs
2016-03-06 21:50:27 -08:00
16239aa414
Merge branch 'dev' of https://github.com/simpeg/simpeg into dcip/dev
...
# Conflicts:
# SimPEG/Examples/__init__.py
2016-02-16 22:14:22 -08:00
4067106956
fixed merge conflict in examples __init__.py
2016-02-16 16:14:41 -08:00
059850f282
Clean examples and remove duplicate.
2016-02-16 09:41:24 -08:00
999a37547e
Merge branch 'dev' into docs
...
# Conflicts:
# .travis.yml
# SimPEG/EM/FDEM/FDEM.py
# SimPEG/Mesh/TensorMesh.py
2016-02-09 08:32:41 -08:00
463b9b6164
Merge pull request #240 from simpeg/em/dev
...
Em/dev
2016-02-09 08:04:45 -08:00
00774176f3
cleanup of math
2016-02-08 08:55:02 -08:00
81c13b12e3
cleanup of docs, docs for survey
2016-02-07 13:04:13 -08:00
e4fc128383
organizing toctree in EM docs
2016-02-06 15:06:23 -08:00
bdfabe620a
Add the DC examples
2016-02-05 14:01:56 -08:00
8262ee94bc
Initial commit of DCIP.
2016-02-04 17:03:42 -08:00
05ce38013e
Merge pull request #223 from simpeg/em/dev
...
Em/dev
2016-02-02 14:35:22 -08:00
abc464ab46
Merge pull request #224 from simpeg/patch/docsbadges
...
make travis badge look at master for docs
2016-02-02 08:13:35 -08:00
2adc7d4eb9
make travis badge look at master for docs
2016-02-01 22:31:12 -08:00
92b5435149
Merge branch 'dev' into em/dev
2016-02-01 22:12:22 -08:00
6b359f49b5
docs clean-up (using autoclass is more stable than automodule)
2016-01-31 15:21:46 -08:00
012d2cadf1
use intersphinx mapping to get numpy, scipy, matplotlib, python inventories
2016-01-31 13:54:24 -08:00
841ba61006
clean up the html build
2016-01-31 13:22:36 -08:00
2874e204ee
exclude _static from warnings
2016-01-31 12:52:42 -08:00
adca273565
ignore nonlocal images in sphinx build
2016-01-31 12:46:24 -08:00
ef201be832
Merge branch 'dev' of https://github.com/simpeg/simpeg into mt/dev
...
Conflicts:
SimPEG/Utils/meshutils.py
docs/index.rst
tests/mesh/test_MeshIO.py
2016-01-29 11:46:19 -08:00
37d37369d8
added example to docs
2016-01-28 22:36:39 -08:00
20d5582c0f
Merge branch 'master' of https://github.com/simpeg/simpeg into dev
2016-01-28 22:29:59 -08:00
814bd00346
move examples right after getting started with SimPEG
2016-01-26 22:47:11 -08:00
98f209d1f0
specify that example is FDEM
2016-01-20 08:04:01 -08:00
7107cd9d94
plot a harmonic mag dipole
2016-01-19 23:57:41 -08:00
0b971f4a50
updated examples init to also update docs
2016-01-15 10:46:31 -08:00
c6e90230d4
Updates to the correct pointer for the flow module (docs)
2016-01-14 15:57:15 -08:00
b63434b89d
Updates to the documentation.
2016-01-14 15:56:35 -08:00
558e8879fe
SimPEG.MT Mergify.
...
Merge branch 'move2Simpeg' of https://github.com/simpeg/simpegmt into mt/dev
Conflicts:
.gitignore
.travis.yml
LICENSE
docs/conf.py
docs/index.rst
requirements.txt
setup.py
2016-01-14 15:36:58 -08:00
2c5b19b7a0
Updates to the documentation.
2016-01-10 17:21:01 -08:00
985d5b6469
Bump version: 0.1.7 → 0.1.8 (+7 squashed commits)
...
Squashed commits:
[ac5bb36] Bump version: 0.1.8 → 0.1.9
[8acd6b2] ImportException --> ImportError
[ac410a8] matplotlib.pyplot has errors on import, put these in the functions
that rely on them directly.
[f128a20] Bump version: 0.1.6 → 0.1.7
[5866bea] Remove IPython utils.
These are out of date, and have problems on Linux (without a proper
visual backend).
[a519e56] Bump version: 0.1.5 → 0.1.6
[f45aa83] Bump version: 0.1.4 → 0.1.5
2016-01-10 13:38:06 -08:00
d93a23306c
Bump version: 0.1.3 → 0.1.4
2016-01-10 12:47:43 -08:00
f0f3f6c06a
Update the examples init.py to explicitly reference things.
...
You can run the main function to update the docs and imports.
2016-01-02 18:06:49 -08:00
b2aab4163b
New examples for Mesh
2015-11-26 13:56:04 -07:00
be3667b4ab
New Examples
...
- Put all examples in same directory
- Make a single test
- use __init__.py to create the docs automatically
2015-11-25 16:03:08 -08:00
56d5019b94
Updates to examples and documentation.
2015-11-24 22:09:50 -08:00
e622dfb5cc
Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev
...
Conflicts:
.coveragerc
.gitignore
.travis.yml
docs/api_Utils.rst
docs/conf.py
docs/index.rst
requirements.txt
setup.py
2015-11-04 09:59:11 -08:00
465087beba
SimPEG.FLOW
2015-10-30 14:36:51 -07:00
0d88ec3652
explicit integration of sources (s_e for E-B formulation, s_m for H-J formulation) in the calculation of the RHS and associated updates to the documentation
2015-10-01 21:45:06 -07:00
7cd4ba7d61
updated inversion workflow image, discretization --> mesh and colors are same as in paper
2015-07-21 14:31:22 -07:00
cb73c38e8e
cleaned up math in docs
2015-07-06 23:59:21 -05:00
a84bc5cbc1
documentation updates
2015-07-06 19:04:24 -05:00
0c432e1d82
Bump version: 0.1.2 → 0.1.3
2015-05-15 12:36:26 -07:00
abe0a9affe
Bump version: 0.1.1 → 0.1.2
2015-05-15 11:35:06 -07:00
6380add4ee
Logically Rectangular --> Curvilinear
2015-05-15 09:08:05 -07:00
e9fea3bad2
lrm --> curv
2015-05-14 23:43:32 -07:00
46b2e11ef8
LRM --> Curv
2015-05-14 23:35:38 -07:00
Lindsey Heagy