414418a996
Merge branch 'dev' into feat/docs-deploy
...
# Conflicts:
# SimPEG/Mesh/View.py
2016-05-30 15:56:24 -07:00
40f0874dfb
Doc testing, I think that is most of them!
2016-05-29 22:18:22 -07:00
18f98b2ecd
Merge branch 'docs' of https://github.com/simpeg/simpeg into feat/docs-deploy
...
# Conflicts:
# SimPEG/Utils/meshutils.py
# docs/api_Utils.rst
# docs/conf.py
# docs/flow/index.rst
2016-05-29 19:18:36 -07:00
f2e13182bf
Merge branch 'dev' into feat/plotImage-curvilinear
...
# Conflicts:
# SimPEG/Examples/__init__.py
2016-05-29 16:43:40 -07:00
825511e9d3
Add a curvilinear plotImage function, update example.
2016-05-29 13:17:22 -07:00
d5219be3d8
Merge branch 'dev' into dcip/dev
...
# Conflicts:
# SimPEG/DCIP/DCIPUtils.py
2016-05-17 23:26:17 -07:00
8278230476
Use LocTypeTo to allow interpolation to different grid locations
2016-05-08 10:35:27 -07:00
069127333d
allow interpolation to different cartsian grid locations
2016-05-05 16:41:21 -07:00
ace9cad016
Merge pull request #303 from simpeg/dcip/ref
...
Dcip/ref
2016-04-29 10:49:50 -07:00
f944f9b76b
1. Add distributed source for nodal discretization
...
2. Add Analytic tests
3. Fix simple bug in PlotSlice for nodal variable
4. Add more analytic function (sphere)
2016-04-25 10:58:54 -07:00
79183ae9fb
fIX MESH io
2016-04-22 16:05:43 -07:00
28005dde45
change minor bug for meshIO
2016-04-15 17:17:18 -07:00
35bac38c8b
working on mixed BC
2016-04-14 22:41:47 -07:00
bd318f0092
Merge pull request #294 from simpeg/patch/mutable-arguments
...
remove mutable arguments.
2016-04-08 17:12:20 -07:00
3e4f47711c
remove mutable arguments.
2016-04-07 16:35:47 -07:00
09f3f7b55b
Merge branch 'dev' into dcip/dev
2016-04-06 09:03:37 -07:00
a31319b46e
Merge branch 'master' of https://github.com/simpeg/simpeg into dcip/dev
2016-04-05 21:49:38 -07:00
021e7c794c
Merge branch 'master' into docs
...
# Conflicts:
# SimPEG/Mesh/TensorMesh.py
2016-03-29 22:53:16 -07:00
46a8707b64
Merge pull request #257 from simpeg/em/dev
...
Em/dev
2016-03-08 16:36:30 -08:00
d9b3c038c4
Merge branch 'dev' into feat/sparse-regularization
...
# Conflicts:
# SimPEG/Regularization.py
# SimPEG/Survey.py
2016-03-06 23:01:59 -08:00
b5b70390cb
Merge branch 'dev' into docs
2016-03-06 21:50:27 -08:00
4e871a43a9
prototype of defining regularization mesh within Regularization.py for constructing operators for regularization that are not true differential operators
2016-02-24 18:03:42 -08:00
226a28f611
Remove regularization and diff op changes, and deal with these in a separate PR #254 .
2016-02-16 22:01:50 -08:00
c10777a245
Addition of unitCellGrad. Possibly rename to cellGradStencil?
2016-02-16 22:00:12 -08:00
312b5d79c5
resolved merge conflicts in TensorMesh
2016-02-09 08:53:01 -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
73edef5eb7
the forward for all fields and fluxes can be computed from any formulation (todo: derive)
2016-02-04 19:34:16 -08:00
cbe8758465
corrected scipy.sparse.csr_matrix, move size descriptions to :return: instead of :type:
2016-02-01 08:22:00 -08:00
6b359f49b5
docs clean-up (using autoclass is more stable than automodule)
2016-01-31 15:21:46 -08:00
841ba61006
clean up the html build
2016-01-31 13:22:36 -08:00
2e3a6ddd96
Merge branch 'dev' into Dom_Dev
2016-01-31 10:33:44 -08:00
54ec7187cb
Add unitCellGrad to DiffOperators
...
Implement SparseRegularization and test on mag problem... works!
2016-01-29 00:50:59 -08:00
43c49d5f15
Address mesh IO #212
2016-01-28 17:53:10 -08:00
1bcb572c45
Remove ifmain from TreeMesh
2016-01-28 14:29:45 -08:00
67d3cb4d9b
Merge branch 'dev' of https://github.com/simpeg/simpeg into feat/treeMeshCounting
...
Conflicts:
.travis.yml
SimPEG/Utils/__init__.py
2016-01-28 14:26:21 -08:00
01b1122fcf
Add default interpolation location (CC).
2016-01-14 15:12:09 -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
6747882e52
Merge pull request #192 from simpeg/feat/examples
...
SimPEG examples
2016-01-03 14:02:38 -08:00
e678affe41
Changed ave[F/E]2CC to be a csr not a css, which doesn't support indexing.
2015-12-09 15:33:05 -08:00
7da637e883
documentation on Cell.nodes
2015-11-30 18:05:02 -08:00
e30a7bcafc
documentation updates
2015-11-30 17:52:38 -08:00
c4d34c4e0d
Initial counting of nodes.
...
- Some of the nodes in the cell may be hanging.
2015-11-30 17:46:57 -08: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
06c66f6392
Addresses #183 : Import errors for tree mesh
2015-11-25 13:27:35 -08:00
56d5019b94
Updates to examples and documentation.
2015-11-24 22:09:50 -08:00
1a43600781
Updates to MeshSlice view.
2015-11-20 15:08:37 -08:00
c775917bb3
Refactoring
2015-11-18 17:21:34 -08:00
ccc3e4fe8f
docstrs
2015-11-18 17:18:55 -08:00
f928ab8019
Refactoring.
2015-11-18 17:16:32 -08:00
dcb9b8787d
Corsen Trees
2015-11-18 17:15:26 -08:00
Lindsey Heagy