Commit Graph

1510 Commits

Author SHA1 Message Date
GudniRos ba2ac74740 Fixed code error 2015-12-09 15:53:41 -08:00
GudniRos 4b7f7c3c14 Fixed a spelling error 2015-12-09 15:46:57 -08:00
GudniRos d6585dcfcd Add Saving Directive 2015-12-09 15:43:51 -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
GudniRos 1a40e35c26 Fixed import bugs. 2015-12-09 14:40:32 -08:00
Rowan Cockett 3972178069 Merge branch 'feat/treeMeshCounting' of https://github.com/simpeg/simpeg into feat/treeMeshCounting 2015-12-04 15:22:11 -08:00
GudniRos 25ad1488f5 Added a function to read UBC octree mesh. Updated __init__ to import the new functions. 2015-12-02 19:20:21 -08:00
GudniRos a8551f3e04 Added function to write a UBC octree mesh for TreeMesh object. 2015-12-02 16:07:33 -08:00
GudniRos 589cd655af Updated vtk write classes. 2015-12-02 16:07:33 -08:00
Rowan Cockett 7da637e883 documentation on Cell.nodes 2015-11-30 18:05:02 -08:00
Rowan Cockett a7ab0dc1e2 Unit tests for getitem on tree mesh 2015-11-30 18:00:16 -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 7c0be4ec50 Merge pull request #181 from simpeg/em/dev
Em/dev
2015-11-25 08:23:05 -08:00
Rowan Cockett 109340c645 Merge pull request #178 from simpeg/bug/flowTests
Bug/flow tests
2015-11-24 21:54:48 -08:00
Rowan Cockett 83e29b74c7 Seed the random flowTests 2015-11-24 19:28:06 -08:00
Rowan Cockett c173ccd6b2 Merge pull request #175 from simpeg/em/ZeroIdentity
Em/zero identity
2015-11-24 19:09:08 -08:00
Rowan Cockett ca3b44bacc Merge pull request #176 from simpeg/dev
Layered Model
2015-11-24 18:48:32 -08:00
Rowan Cockett 9fd25b7104 Merge pull request #174 from simpeg/mesh/tree
Mesh/tree
2015-11-24 18:46:36 -08:00
Lindsey 37f56f25f3 cleaned out Zero, Identity import from FDEM.py 2015-11-24 16:15:57 -08:00
Lindsey 5bd9209d6a type cast b in solver so that it is not an object if we add zero 2015-11-24 14:38:58 -08:00
Lindsey Heagy 71a5c8b2c1 fix sizes in Fields object (make an array not a vector) 2015-11-24 11:01:51 -08:00
Lindsey Heagy 9b847c0e32 replaced all numpy (a += b) with (a = a + b) because it plays more nicely with the Zero class 2015-11-24 10:06:15 -08:00
Lindsey Heagy f3fb1e6481 added an __iadd__, __isub__ to zero class 2015-11-24 10:05:28 -08:00
Lindsey 815311bfec cleaned up sources 2015-11-23 18:03:49 -08:00
Lindsey 6a83af7334 merged master to get namespace changes, resolved merge conflicts, use zero, identity for derivs, defaults for primary fields and sources 2015-11-23 17:41:32 -08:00
Lindsey af540478c5 Merge branch 'master' into em/ZeroIdentity 2015-11-23 17:00:39 -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 5678d90ef1 Merge branch 'master' of https://github.com/simpeg/simpeg into mesh/tree 2015-11-18 15:41:57 -08:00
Rowan Cockett 81a36684ca NodalGrad 2015-11-18 15:34:55 -08:00
Rowan Cockett 134c163c01 Merge pull request #165 from simpeg/bsmithyman-patch-1
Be compatible with outside metaclasses, for now
2015-11-18 14:08:55 -08:00
Rowan Cockett 312acd217a Merge pull request #172 from simpeg/em/dev
Em/dev
2015-11-18 14:08:04 -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 92cd1fa15a Merge pull request #171 from simpeg/em/namespace
Em/namespace
2015-11-18 11:47:15 -08:00
Lindsey Heagy 622152c0c8 import simpegEM utils 2015-11-17 22:33:59 -08:00
Lindsey Heagy 699f6452b2 cleaned up imports for source 2015-11-17 22:29:44 -08:00
Lindsey Heagy 7023e999bc SurveyFDEM --> Survey, FieldsFDEM --> Fields 2015-11-17 22:17:38 -08:00
Lindsey Heagy 2fbe0af108 BaseSrcFDEM --> BaseSrc 2015-11-17 21:47:38 -08:00
Lindsey Heagy fe2e29031c updated Rx naming in FDEM analytics test 2015-11-17 21:30:09 -08:00
Rowan Cockett 1718e3506d Interpolation 2015-11-17 19:47:10 -08:00
Rowan Cockett 5afaa54ad9 Remove compiling of C ext with numpy exts.
This should be done at run time.
2015-11-17 18:46:01 -08:00
Rowan Cockett 61460261f0 Updates to setup.py
Add a cleanall, and try to make the cython build things in the correct
place.
2015-11-17 18:44:13 -08:00
Lindsey Heagy c041ad3de6 EM.FDEM.RxFDEM --> EM.FDEM.Rx 2015-11-17 08:29:27 -08:00
Lindsey Heagy e0684a0820 aveN2CC 2015-11-15 21:33:54 -08:00