Rowan Cockett
40f0874dfb
Doc testing, I think that is most of them!
2016-05-29 22:18:22 -07:00
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
bc073e49b5
Updates to docs errors.
2016-05-29 18:57:38 -07:00
D Fournier
7b72d3a92d
Merge branch 'dev' into ref/dev
...
Conflicts:
SimPEG/DCIP/DCIPUtils.py
2016-05-27 10:01:28 -07:00
Lindsey Heagy
ba8f270b3a
start of surface2ind_topo
2016-05-01 13:17:16 -07:00
Rowan Cockett
00db6746d4
Add a warnign about mesh attributes
2016-04-29 11:50:56 -07:00
Rowan Cockett
028a16a45a
Syntax bug.
2016-04-29 11:44:42 -07:00
Rowan Cockett
c83b460672
Surface to Indices (GoCAD and VTK)
2016-04-29 11:43:31 -07:00
Rowan Cockett
3e4f47711c
remove mutable arguments.
2016-04-07 16:35:47 -07:00
Lindsey Heagy
b5b70390cb
Merge branch 'dev' into docs
2016-03-06 21:50:27 -08:00
Rowan Cockett
16239aa414
Merge branch 'dev' of https://github.com/simpeg/simpeg into dcip/dev
...
# Conflicts:
# SimPEG/Examples/__init__.py
2016-02-16 22:14:22 -08: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
Rowan Cockett
2e78e09bd0
Merge branch 'Dom_Dev' of https://github.com/simpeg/simpeg into dcip/dev
2016-02-05 13:51:53 -08:00
Lindsey Heagy
2fb8de708a
use Zero in sdiag instead of returing h to avoid confusion
2016-02-04 18:49:42 -08:00
Lindsey Heagy
92b5435149
Merge branch 'dev' into em/dev
2016-02-01 22:12:22 -08:00
D Fournier
b16b1b7526
Add ModelBuilder sphere model.
...
Add example for DC pseudo section -> Requires a pull request in SimpegDC for dependancies.
2016-02-01 21:02:11 -08:00
Lindsey Heagy
841ba61006
clean up the html build
2016-01-31 13:22:36 -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
Lindsey Heagy
d50232b385
give Zero a transpose
2016-01-28 13:04:13 -08:00
Rowan Cockett
e15913cf84
Import all code utils into the utils namespace.
2016-01-14 15:12:34 -08:00
Rowan Cockett
dedabcc15f
Allow solver kwargs to go to the class directly.
2016-01-10 18:36:57 -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
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
1a40e35c26
Fixed import bugs.
2015-12-09 14:40:32 -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
7c0be4ec50
Merge pull request #181 from simpeg/em/dev
...
Em/dev
2015-11-25 08:23:05 -08:00
Rowan Cockett
ca3b44bacc
Merge pull request #176 from simpeg/dev
...
Layered Model
2015-11-24 18:48:32 -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
f3fb1e6481
added an __iadd__, __isub__ to zero class
2015-11-24 10:05:28 -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
1718e3506d
Interpolation
2015-11-17 19:47:10 -08:00
Rowan Cockett
37a68dd5b7
Cython dep. the setup.py
2015-11-10 17:25:18 -08:00
Brendan Smithyman
ff68400320
Be compatible with outside metaclasses, for now
...
Making this change would allow use of metaclasses in a more straightforward way for code that inherits from both SimPEG classes and external classes. In the future, this may need to be addressed in more detail.
2015-11-10 12:26:55 -05:00
Rowan Cockett
b2381796f7
Fix numbering
2015-11-07 17:51:02 -08:00
Lindsey Heagy
7b0bea4e1d
make sure subtraction of x0 is a matrix with length of number of points, add test for giving an array XYZ
2015-11-05 16:22:31 -08:00
Lindsey Heagy
96b855d71d
use np.cross
2015-11-05 16:10:43 -08:00
Lindsey Heagy
025b2db70e
coordinate rotations
2015-11-04 21:37:27 -08:00
Rowan Cockett
0885b72577
Zero and Identity - Useful for writing derivatives.
...
These should work with sparse matrices and numpy arrays.
```python
z = Zero()
z*A == 0
o = Identity()
o*A == A
```
2015-10-30 12:21:30 -07:00
Rowan Cockett
7f74f7ee82
Remove SimPEGLinearOperator as Scipy 16 has implemented this feature.
2015-09-14 15:14:33 -07:00
Lindsey
41e9d175f2
added model builder to create layered model. untested and no error checking yet
2015-08-04 16:41:17 -07:00
Lindsey Heagy
b5336c1ca1
Fixed typo in Model builder, getIndecesBlock --> get IndicesBlock, added addBlock function
2015-07-06 14:57:19 -05:00
Lindsey Heagy
0b8f80f41e
fixed typo in ModelBuilder
2015-06-30 15:15:29 -07:00
Rowan Cockett
8475eadcce
updates to propMap location and testing
2015-06-01 09:55:14 -07:00
Rowan Cockett
fbda6ab53b
updates to init of propMap
2015-06-01 09:34:16 -07:00
Rowan Cockett
a953a52ccc
initial commit of PropMap
2015-05-31 10:43:23 -07:00
Lindsey Heagy
e9fea3bad2
lrm --> curv
2015-05-14 23:43:32 -07:00