wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-07-16 11:21:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,547 Commits 28 Branches 6 Tags
67d3cb4d9b07dd767536022719790b07d29ad02a
Commit Graph
1547 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 860bd5638a Add VTK to the travis dependencies. 
I am not adding this to the requirements.txt file.
 2016-01-28 14:19:29 -08:00
Rowan Cockett 09161ff68e Hopefully get a better error message on travis. 2016-01-28 13:58:32 -08:00
Rowan Cockett 28b8a69d7b Merge pull request #203 from simpeg/em/dev 
Em/dev
 2016-01-14 21:21:07 -08:00
Lindsey 570dfb7aba Merge pull request #200 from simpeg/em/cleansolver 
add Ainv.clean() to fdem fields, jvec, jtvec
 2016-01-14 16:16:06 -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 e15913cf84 Import all code utils into the utils namespace. 2016-01-14 15:12:34 -08:00
Rowan Cockett 01b1122fcf Add default interpolation location (CC). 2016-01-14 15:12:09 -08:00
Lindsey Heagy 1700f4f9c0 add Ainv.clean() to fdem fields, jvec, jtvec 2016-01-14 14:00:55 -08:00
Rowan Cockett 17348e14e4 Merge pull request #198 from simpeg/bug/solver 
Solver Bugs
 2016-01-10 19:20:57 -08:00
Rowan Cockett dedabcc15f Allow solver kwargs to go to the class directly. 2016-01-10 18:36:57 -08:00
Rowan Cockett ff0c81b96e Merge pull request #196 from simpeg/feat/docs 
Feat/docs
 2016-01-10 18:33:54 -08:00
Rowan Cockett 2c5b19b7a0 Updates to the documentation. 2016-01-10 17:21:01 -08:00
Rowan Cockett 8a61259cab Remove out of date GCE folder. 2016-01-10 15:17:13 -08:00
Rowan Cockett f482f9d877 Rearrange tests in order of speed for travis. 2016-01-10 15:16:46 -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
v0.1.9 		2016-01-10 13:38:06 -08:00
Rowan Cockett 8da717521c Update scripts for pip 2016-01-10 13:01:00 -08:00
Rowan Cockett d93a23306c Bump version: 0.1.3 → 0.1.4 v0.1.4 2016-01-10 12:47:43 -08:00
Rowan Cockett d38424a10f Merge pull request #193 from simpeg/feat/pymatsolver 
Speed up the tests with pymatsolver.
 2016-01-03 19:26:22 -08:00
Rowan Cockett 00a29d27aa Decrease the number of iterations on the EM derivatives. 
This is to increase the speed at which travis runs tests.
 2016-01-03 19:11:45 -08:00
Rowan Cockett 9ebd0fcedc Use pymatsolver in TravisCI 2016-01-03 19:02:06 -08:00
Rowan Cockett 6747882e52 Merge pull request #192 from simpeg/feat/examples 
SimPEG examples
 2016-01-03 14:02:38 -08:00
Rowan Cockett dd5f5df69e my_function.__name__ must be set to 'test_' for nosetests 2016-01-03 12:48:01 -08:00
Rowan Cockett d64fd4ae35 List examples in the init file. 2016-01-02 18:29:04 -08:00
Rowan Cockett a18d48348d Merge fast tests on travis. 2016-01-02 18:20:58 -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
GudniRos 4342450360 Updated test_MeshIO to remove the temp files after using them. 2015-12-17 23:02:52 -08:00
GudniRos 79f7ca7a1e Adden dpred to be written in the saveDict directive 2015-12-15 19:35:18 -08:00
GudniRos e42727610a Implemented IO test for octree mesh. 2015-12-14 19:08:35 -08:00
GudniRos 84eb69f626 UBC ocTree read and write working. 2015-12-14 01:46:01 -08:00
GudniRos 69d109524e Working on reordering of UBC models. 2015-12-12 13:52:26 -08:00
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 fe94bd3edf Merge pull request #187 from simpeg/bug/importTreeMesh 
Addresses #183: Import errors for tree mesh
 2015-11-26 19:41:21 -07: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 06c66f6392 Addresses #183: Import errors for tree mesh 2015-11-25 13:27:35 -08:00
Rowan Cockett bcfe904015 remove test from the name in examples. 2015-11-25 08:26:27 -08:00
Rowan Cockett 7c0be4ec50 Merge pull request #181 from simpeg/em/dev 
Em/dev
 2015-11-25 08:23:05 -08:00