Commit Graph

69 Commits

Author SHA1 Message Date
Rowan Cockett 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
Rowan Cockett 3e4f47711c remove mutable arguments. 2016-04-07 16:35:47 -07:00
Lindsey Heagy 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
Lindsey Heagy cbe8758465 corrected scipy.sparse.csr_matrix, move size descriptions to :return: instead of :type: 2016-02-01 08:22:00 -08:00
Rowan Cockett 43c49d5f15 Address mesh IO #212 2016-01-28 17:53:10 -08:00
Rowan Cockett 1bcb572c45 Remove ifmain from TreeMesh 2016-01-28 14:29:45 -08:00
Rowan Cockett 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
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 6747882e52 Merge pull request #192 from simpeg/feat/examples
SimPEG examples
2016-01-03 14:02:38 -08:00
GudniRos 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
Rowan Cockett 7da637e883 documentation on Cell.nodes 2015-11-30 18:05:02 -08:00
Rowan Cockett e30a7bcafc documentation updates 2015-11-30 17:52:38 -08:00
Rowan Cockett c4d34c4e0d Initial counting of nodes.
- Some of the nodes in the cell may be hanging.
2015-11-30 17:46:57 -08: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 06c66f6392 Addresses #183: Import errors for tree mesh 2015-11-25 13:27:35 -08:00
Rowan Cockett 56d5019b94 Updates to examples and documentation. 2015-11-24 22:09:50 -08:00
Rowan Cockett 1a43600781 Updates to MeshSlice view. 2015-11-20 15:08:37 -08:00
Rowan Cockett c775917bb3 Refactoring 2015-11-18 17:21:34 -08:00
Rowan Cockett ccc3e4fe8f docstrs 2015-11-18 17:18:55 -08:00
Rowan Cockett f928ab8019 Refactoring. 2015-11-18 17:16:32 -08:00
Rowan Cockett dcb9b8787d Corsen Trees 2015-11-18 17:15:26 -08:00
Rowan Cockett ca05d0599e Grid x0 locations. 2015-11-18 16:12:59 -08:00
Rowan Cockett 81a36684ca NodalGrad 2015-11-18 15:34:55 -08:00
Rowan Cockett 033a64d53f Updates to inheritance and faster innerproducts on treemesh. 2015-11-18 12:57:15 -08:00
Rowan Cockett c1b5f45ac7 PlotSlice in OcTree 2015-11-18 11:52:05 -08:00
Rowan Cockett 1718e3506d Interpolation 2015-11-17 19:47:10 -08:00
Lindsey Heagy e0684a0820 aveN2CC 2015-11-15 21:33:54 -08:00
Rowan Cockett eafa2bfbe8 Minor performance updates. 2015-11-15 19:08:40 -08:00
Rowan Cockett 87eb02b76b Fancy mesh example 2015-11-15 18:16:07 -08:00
Rowan Cockett 2c00459846 Actually use Lindsey's changes... :) 2015-11-15 17:59:05 -08:00
Rowan Cockett 4ac85e81d6 Updates to merging 2015-11-15 17:51:51 -08:00
Rowan Cockett 5e20960335 50% speed up in refinement 2015-11-15 17:45:37 -08:00
Lindsey Heagy d7bcc0c074 broke up averaging so that we have averaging for components as well 2015-11-15 00:08:26 -08:00
Lindsey Heagy 4fe9475ffc aveE2CCV for 3D 2015-11-13 08:32:01 -08:00
Lindsey Heagy d130b50f7f aveE2CC for 3D 2015-11-12 09:11:39 -08:00
Lindsey Heagy 821932ed82 aveF2CCV in 2 and 3D 2015-11-12 08:19:15 -08:00
Rowan Cockett fd55aa6d67 Delete things when __dirty__ 2015-11-11 13:05:47 -08:00
Lindsey Heagy a53372a859 Averaging from faces to cell centres (2nd order on non-refined mesh, 1st order when we refine... which I think is ok) 2015-11-11 09:32:31 -08:00
Lindsey Heagy 29579c35e0 place holders for averaging 2015-11-10 18:42:09 -08:00
Rowan Cockett 277318240c Delete old implementations 2015-11-10 17:54:35 -08:00
rowanc1 6687a8324f bug fixes in TreeMesh 2014-06-16 14:24:54 -06:00
rowanc1 063c84af91 Documentation, type(x) == np.ndarray --> isinstance(x,np.ndarray), and Model (untested.) 2014-05-17 16:50:51 -07:00
rowanc1 102d5721c5 Solver updates. Remove .solve() replace with a multiplication. 2014-05-16 19:33:29 -07:00
rowanc1 48e506f4bb Clean Plot grid code and add to documentation 2014-03-03 15:50:06 -08:00
rowanc1 530de6cb5c FaceInnerProduct for 1D 2014-02-16 18:31:30 -08:00
rowanc1 7037371311 pointer to x0 2014-02-12 08:55:13 -08:00
rowanc1 7b025ed95a Memory optimizations: use __slots__ to save 1GB of ram on modest sized problem. Get rid of dictionaries (they are expensive here). 2014-02-11 23:31:01 -08:00
rowanc1 a89535781f edgeCurl on ocTree 2014-02-11 19:10:29 -08:00
rowanc1 62f00004eb bug fix. 2014-02-11 15:02:30 -08:00
rowanc1 aa539462a1 Nodal Gradient! 2014-02-11 13:58:31 -08:00