def4b01080
Merge branch 'dev' into ex/mt1d
...
# Conflicts:
# SimPEG/Examples/MT_1D_analytic_nlayer_Earth.py
# SimPEG/Examples/__init__.py
# SimPEG/Examples/sphereElectrostatic_example.py
# SimPEG/Optimization.py
# docs/examples/DC_PseudoSection_Simulation.rst
# docs/examples/Inversion_IRLS.rst
# docs/examples/MT_1D_analytic_nlayer_Earth.rst
2016-05-18 09:13:35 -07:00
e305600de5
Update example list. Add comments for the DC_Forward_PseudoSection example. Fix Z of pseudo section plot.
2016-04-07 13:09:28 -07:00
c86b9bdd6a
Merge remote-tracking branch 'origin/Examples' into ex/mt1d
...
# Conflicts:
# SimPEG/Examples/MT_1D_analytic_nlayer_Earth.py
# SimPEG/Examples/__init__.py
# SimPEG/Examples/sphereElectrostatic_example.py
# SimPEG/Optimization.py
2016-04-07 11:19:54 -07:00
45c4fa0d95
Merge branch 'master' into ex/mt1d
...
# Conflicts:
# SimPEG/Examples/__init__.py
2016-04-07 11:09:07 -07:00
636d178fbf
removed examples that are in Examples PR
2016-04-06 16:19:39 -07:00
ae9ca6cec9
Merge branch 'feat/sparse-regularization' into patch/sparse-dcip
...
# Conflicts:
# SimPEG/Examples/__init__.py
# SimPEG/Optimization.py
2016-04-06 14:53:45 -07:00
ea0500e056
Merge branch 'dev' into Examples
...
# Conflicts:
# SimPEG/Examples/__init__.py
# SimPEG/Optimization.py
2016-04-05 13:30:33 -07:00
aa9cc367c5
update docs
2016-04-05 11:28:16 -07:00
7a6f4e0780
Merge branch 'master' into feat/sparse-regularization
2016-04-03 17:26:57 -07:00
16d62a6d0a
Merge branch 'Examples' into feat/sparse-regularization
...
Conflicts:
SimPEG/Examples/__init__.py
2016-04-03 11:11:35 -07:00
b531c162a2
tab so we don't cut off the first characters in the docstring
2016-03-31 23:50:35 -07:00
c7883673bf
added the figshare doi link for the example
2016-03-31 09:36:55 -07:00
7aa5599211
improve the description
2016-03-29 14:41:45 -07:00
fbec011983
typo fix
2016-03-29 14:29:39 -07:00
5fb8cdb88c
example casing forward simulation to calculate vertical current
2016-03-29 13:00:37 -07:00
b4f329f65a
Bump version: 0.1.9 → 0.1.10
2016-03-23 13:04:18 -07: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
9715108aee
remove EM_FDEM_SusEffects.py from this pr
2016-02-16 09:37:50 -08:00
e0eb36257b
removed DC example, put default value in MT1Danalytic_nlayer_earth
2016-02-16 09:28:46 -08:00
3a506b9051
Fix DC examples ...
2016-02-11 08:54:44 -08:00
fa6bcd3ffa
Minor changes
2016-02-11 00:10:25 -08:00
47895ef270
consistent file name
2016-02-10 23:58:48 -08:00
774d612c18
Merge branch 'master' of https://github.com/simpeg/simpeg into Examples
...
Conflicts:
SimPEG/Examples/__init__.py
2016-02-10 23:38:51 -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
433457f649
docs and import for DC_PseudoSection_Simulation.rst
2016-02-03 20:12:55 -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
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
Lindsey Heagy