Commit Graph

85 Commits

Author SHA1 Message Date
GudniRos 9a739d8380 Merge branch 'mt/dev' of https://github.com/simpeg/simpeg into mt/dev 2016-03-09 13:27:50 -08:00
GudniRos 664a7bb484 Updated plotting functions for MT 2016-03-09 13:26:50 -08:00
Lindsey Heagy 4067106956 fixed merge conflict in examples __init__.py 2016-02-16 16:14:41 -08:00
Lindsey Heagy 5b78d69c6d use set diff for testing if all examples have been included 2016-02-04 09:11:23 -08:00
Lindsey Heagy b81b5af461 use abspath for travis 2016-02-03 20:23:31 -08:00
Lindsey Heagy 32c936c4e3 add test to ensure examples are up to date 2016-02-03 19:55:42 -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
Rowan Cockett 0704c6dc25 Merge pull request #213 from simpeg/feat/treeMeshCounting
Tree Mesh Updates
2016-01-28 22:36:48 -08:00
Rowan Cockett caba2b6752 Merge pull request #191 from simpeg/ActiveCellReg
Meshless Identity Map, Regularization for Active Cell models
2016-01-28 22:28:08 -08:00
Rowan Cockett 43c49d5f15 Address mesh IO #212 2016-01-28 17:53:10 -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 09161ff68e Hopefully get a better error message on travis. 2016-01-28 13:58:32 -08:00
Lindsey Heagy d50232b385 give Zero a transpose 2016-01-28 13:04:13 -08:00
GudniRos b67bcfad31 Fix bug in test. 2016-01-28 13:04:13 -08:00
GudniRos 096a72fdb4 Tipper derivatives and adjoint working. 2016-01-26 12:07:42 -08:00
GudniRos f3bf17ebe5 Work on MT, fixing bugs 2016-01-25 12:29:03 -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 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 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
GudniRos 4342450360 Updated test_MeshIO to remove the temp files after using them. 2015-12-17 23:02:52 -08:00
GudniRos e42727610a Implemented IO test for octree mesh. 2015-12-14 19:08:35 -08:00
GudniRos 69d109524e Working on reordering of UBC models. 2015-12-12 13:52:26 -08:00
Rowan Cockett c298ebe8d8 Remove the Meshless Identity Map.
- This is now default functionality in the IdentityMap.
2015-12-04 15:42:08 -08:00
Rowan Cockett a7ab0dc1e2 Unit tests for getitem on tree mesh 2015-11-30 18:00:16 -08:00
Lindsey Heagy 83cb5ce46a - Meshlesses Identity Map (takes nP instead of a mesh)
- Tikhonov regularization if active cells are used (don't take derivs across interfaces between active cells and not)
- testing improvements: test 1D, 2D, 3D on a random tensor mesh , also test that for a constant mref, phi_m(ref) = 0
2015-11-28 12:55:24 -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 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
Rowan Cockett 56d5019b94 Updates to examples and documentation. 2015-11-24 22:09:50 -08:00
Rowan Cockett 83e29b74c7 Seed the random flowTests 2015-11-24 19:28:06 -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
Rowan Cockett dcb9b8787d Corsen Trees 2015-11-18 17:15:26 -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 033a64d53f Updates to inheritance and faster innerproducts on treemesh. 2015-11-18 12:57:15 -08:00
Lindsey Heagy 7023e999bc SurveyFDEM --> Survey, FieldsFDEM --> Fields 2015-11-17 22:17: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
Lindsey Heagy e0684a0820 aveN2CC 2015-11-15 21:33:54 -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 9d92f62cfa analytic test update 2015-11-13 13:50:10 -08:00
Lindsey Heagy 52375ecd06 fixed fdem deriv test 2015-11-13 12:32:09 -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 6a30ea1d83 better mesh sizes for testing 2015-11-12 08:20:44 -08:00