wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-06-27 20:53:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,016 Commits 28 Branches 6 Tags
636d178fbf06ccdc30cd4bb8833bbce0e5d3a204
Commit Graph

192 Commits

Author SHA1 Message Date
Lindsey Heagy 636d178fbf removed examples that are in Examples PR 2016-04-06 16:19:39 -07:00
Lindsey Heagy 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
D Fournier 7a6f4e0780 Merge branch 'master' into feat/sparse-regularization 2016-04-03 17:26:57 -07:00
D Fournier 16d62a6d0a Merge branch 'Examples' into feat/sparse-regularization 
Conflicts:
	SimPEG/Examples/__init__.py
 2016-04-03 11:11:35 -07:00
Lindsey Heagy b531c162a2 tab so we don't cut off the first characters in the docstring 2016-03-31 23:50:35 -07:00
Lindsey Heagy c7883673bf added the figshare doi link for the example 2016-03-31 09:36:55 -07:00
Lindsey Heagy 7aa5599211 improve the description 2016-03-29 14:41:45 -07:00
Lindsey Heagy fbec011983 typo fix 2016-03-29 14:29:39 -07:00
Lindsey Heagy 5fb8cdb88c example casing forward simulation to calculate vertical current 2016-03-29 13:00:37 -07:00
Lindsey Heagy b4f329f65a Bump version: 0.1.9 → 0.1.10 2016-03-23 13:04:18 -07:00
Rowan Cockett 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
Lindsey Heagy 4067106956 fixed merge conflict in examples __init__.py 2016-02-16 16:14:41 -08:00
Rowan Cockett 059850f282 Clean examples and remove duplicate. 2016-02-16 09:41:24 -08:00
seogi_macbook 3a506b9051 Fix DC examples ... 2016-02-11 08:54:44 -08:00
seogi_macbook fa6bcd3ffa Minor changes 2016-02-11 00:10:25 -08:00
seogi_macbook 47895ef270 consistent file name 2016-02-10 23:58:48 -08:00
seogi_macbook 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
Lindsey 463b9b6164 Merge pull request #240 from simpeg/em/dev 
Em/dev
 2016-02-09 08:04:45 -08:00
Lindsey Heagy 00774176f3 cleanup of math 2016-02-08 08:55:02 -08:00
Lindsey Heagy 81c13b12e3 cleanup of docs, docs for survey 2016-02-07 13:04:13 -08:00
Lindsey Heagy e4fc128383 organizing toctree in EM docs 2016-02-06 15:06:23 -08:00
Rowan Cockett bdfabe620a Add the DC examples 2016-02-05 14:01:56 -08:00
Rowan Cockett 8262ee94bc Initial commit of DCIP. 2016-02-04 17:03:42 -08:00
Lindsey Heagy 433457f649 docs and import for DC_PseudoSection_Simulation.rst 2016-02-03 20:12:55 -08:00
Lindsey 05ce38013e Merge pull request #223 from simpeg/em/dev 
Em/dev
 2016-02-02 14:35:22 -08:00
Lindsey 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
Lindsey Heagy 2adc7d4eb9 make travis badge look at master for docs 2016-02-01 22:31:12 -08:00
Lindsey Heagy 92b5435149 Merge branch 'dev' into em/dev 2016-02-01 22:12:22 -08:00
Rowan Cockett 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
Lindsey Heagy 37d37369d8 added example to docs 2016-01-28 22:36:39 -08:00
Rowan Cockett 20d5582c0f Merge branch 'master' of https://github.com/simpeg/simpeg into dev 2016-01-28 22:29:59 -08:00
Lindsey Heagy 814bd00346 move examples right after getting started with SimPEG 2016-01-26 22:47:11 -08:00
Lindsey Heagy 98f209d1f0 specify that example is FDEM 2016-01-20 08:04:01 -08:00
Lindsey Heagy 7107cd9d94 plot a harmonic mag dipole 2016-01-19 23:57:41 -08:00
Lindsey Heagy 0b971f4a50 updated examples init to also update docs 2016-01-15 10:46:31 -08:00
Rowan Cockett c6e90230d4 Updates to the correct pointer for the flow module (docs) 2016-01-14 15:57:15 -08:00
Rowan Cockett b63434b89d Updates to the documentation. 2016-01-14 15:56:35 -08:00
Rowan Cockett 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
Rowan Cockett 2c5b19b7a0 Updates to the documentation. 2016-01-10 17:21:01 -08:00
Rowan Cockett 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
Rowan Cockett d93a23306c Bump version: 0.1.3 → 0.1.4 2016-01-10 12:47:43 -08:00
Rowan Cockett 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
Rowan Cockett b2aab4163b New examples for Mesh 2015-11-26 13:56:04 -07:00
Rowan Cockett 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
Rowan Cockett 56d5019b94 Updates to examples and documentation. 2015-11-24 22:09:50 -08:00
Rowan Cockett 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
Rowan Cockett 465087beba SimPEG.FLOW 2015-10-30 14:36:51 -07:00
Lindsey Heagy 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
Lindsey Heagy 7cd4ba7d61 updated inversion workflow image, discretization --> mesh and colors are same as in paper 2015-07-21 14:31:22 -07:00
Lindsey Heagy cb73c38e8e cleaned up math in docs 2015-07-06 23:59:21 -05:00