Commit Graph
99 Commits
Author SHA1 Message Date
Rowan Cockett 3deca9ed77 Merge pull request #351 from simpeg/example/mesh2mesh
Mesh2Mesh and Combo Map examples.
2016-06-26 21:22:28 -06:00
Rowan Cockett ba173674ec Mesh2Mesh and Combo Map examples.
Also fixed plotting codes to show the plots by default.
2016-06-26 17:07:07 -06:00
Rowan Cockett 303da372aa Merged branch master into dev 2016-06-26 16:31:24 -06:00
Rowan Cockett 6d6e7fc8bd Merge pull request #350 from simpeg/fix/docs-images
Update index.rst
2016-06-26 16:30:29 -06:00
Rowan Cockett 8ed3ec18fa Update README.rst 2016-06-26 16:29:20 -06:00
Rowan Cockett 3960cfc313 Update index.rst 2016-06-26 16:17:30 -06:00
Rowan Cockett 2eba0b841f Merge pull request #338 from simpeg/dev
Dev
2016-06-26 14:01:03 -06:00
Rowan Cockett 2bd5829b42 Add gitter chat 2016-04-06 13:15:03 -07:00
Rowan Cockett 8d6bd65923 Better list comprehension. 2016-04-05 14:26:45 -07:00
Rowan Cockett fb1973cfe4 Merge pull request #211 from simpeg/mt/dev
Merge MT into dev
2016-02-16 17:14:49 -08:00
Rowan Cockett 269269daf7 Merge pull request #6 from simpeg/Dom_dev
Examples and IP
2016-02-04 09:17:40 -08:00
Rowan Cockett 5dab7ac1a8 Merge pull request #216 from simpeg/bug/215
Closes #215
2016-01-28 23:32:54 -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 d7be0ada31 Update README.rst
Fix the branch that SimPEG travis is pointing
2016-01-28 12:52:21 -08:00
Rowan Cockett 7b94021f7e Add emails to travis failures. 2016-01-28 11:41:37 -08:00
Rowan Cockett e8a6a028c2 Merge pull request #208 from simpeg/docs
move examples right after getting started with SimPEG
2016-01-28 11:36:50 -08:00
Rowan Cockett 28b8a69d7b Merge pull request #203 from simpeg/em/dev
Em/dev
2016-01-14 21:21:07 -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 cdf0ebf8d0 Merge pull request #197 from simpeg/dev
Dev
2016-01-10 18:47:52 -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 1ba96ba8d0 Merge pull request #194 from simpeg/dev
Example, Pip, Zero, Identity, Faster Builds
2016-01-10 14:02:01 -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 6747882e52 Merge pull request #192 from simpeg/feat/examples
SimPEG examples
2016-01-03 14:02:38 -08:00
Rowan Cockett 8b53fd5965 Merge pull request #189 from simpeg/generalize-mappair
Generalize mapPair
2015-12-04 15:44:00 -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 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 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
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 92cd1fa15a Merge pull request #171 from simpeg/em/namespace
Em/namespace
2015-11-18 11:47:15 -08:00
Rowan Cockett 21a3353aa7 Merge pull request #124 from simpeg/em/dev
Em/dev
2015-11-04 11:38:48 -08:00
Rowan Cockett 1aade8155d Merge pull request #122 from simpeg/flow
SimPEG.FLOW
2015-11-04 08:57:43 -08:00
Rowan Cockett 536b9abb86 Merge pull request #121 from simpeg/travis
Rearrange Tests
2015-10-30 14:08:39 -07:00
Rowan Cockett f9b77a9128 Merge pull request #120 from simpeg/zero
Zero and Identity - Useful for writing derivatives.
2015-10-30 14:01:58 -07:00
Rowan Cockett fc3590ec9d Merge pull request #118 from simpeg/bsmithyman-cythondep
Add Cython dependency
2015-10-30 14:01:44 -07:00
Rowan Cockett 198dd165fc Merge pull request #107 from simpeg/FullMap
FullMap takes a scalar and fills the whole model space with it
2015-06-29 12:45:49 -07:00
Rowan Cockett 29476eca77 Merge pull request #103 from simpeg/FieldDerivs
Field Updates.
2015-06-01 22:32:17 -07:00
Rowan Cockett 6c2baf0744 Merge pull request #102 from simpeg/FieldsSrcList
Fields src list
2015-06-01 22:25:27 -07:00
Rowan Cockett d07bb6722b Merge pull request #101 from simpeg/PropMap
Property Maps
2015-06-01 15:31:51 -07:00
Rowan Cockett 401336f412 Merge pull request #100 from simpeg/Fields
Fields Performance Update
2015-05-29 12:04:46 -07:00
Rowan Cockett 1455901474 Merge pull request #4 from simpeg/Tx2Src
Tx2 src
2015-05-15 13:07:25 -07:00
Rowan Cockett fdd3a43d18 Update LICENSE 2015-05-15 12:48:47 -07:00
Rowan Cockett 0a4b7d14ac Merge pull request #94 from simpeg/bug/FieldsObject
Bug/fields object
2015-05-15 12:30:08 -07:00
Rowan Cockett 59c2216ec0 Merge pull request #2 from simpeg/SrcChanges
remove SrcType, put rx list first in inputs for src
2015-05-15 12:28:52 -07:00
Rowan Cockett 37dacec8ff Merge pull request #91 from simpeg/removeSrcType
removed SrcType
2015-05-15 12:28:31 -07:00
Rowan Cockett fbcd3e3691 Merge pull request #89 from simpeg/Tx2Src
Tx2 src
2015-05-01 11:15:01 -07:00
Rowan Cockett 905e877e6b Merge pull request #88 from simpeg/feat/CylMeshInterpolation
cyl mesh interpolation
2015-03-19 21:02:29 -07:00
Rowan Cockett ab0049180d Merge pull request #11 from simpeg/addingMu
Adding mu
2015-02-24 17:44:08 -05:00
Rowan Cockett 852a7295ef Update .travis.yml 2015-02-13 14:58:58 -08:00
Rowan Cockett d507a330bd Merge pull request #3 from simpeg/develop
Develop
2015-02-12 11:49:21 -08:00
Rowan Cockett 9485c4c549 Delete __init__.pyc 2015-02-12 11:48:47 -08:00
Rowan Cockett c421d3bf5d Delete MT1Dsolutions.pyc 2015-02-12 11:48:38 -08:00
Rowan Cockett d3baf03c47 Delete MT1Danalytic.pyc 2015-02-12 11:48:22 -08:00
Rowan Cockett 5b5f83c58e Delete Base.pyc 2015-02-12 11:48:04 -08:00
Rowan Cockett 0e9a07c018 Delete __init__.pyc 2015-02-12 11:47:45 -08:00
Rowan Cockett 48ada2d63c Merge pull request #2 from simpeg/moveAnalytics
Move analytics
2015-02-12 11:40:30 -08:00
Rowan Cockett 7f817c96ad Merge pull request #1 from simpeg/delete-pyc
Delete pyc files
2015-02-12 11:37:09 -08:00
Rowan Cockett 46d4e1bc01 Delete __init__.pyc 2015-02-12 11:31:34 -08:00
Rowan Cockett 5646e8868d Merge pull request #85 from simpeg/vtkIO
vtkIO
2015-02-05 15:33:56 -08:00
Rowan Cockett 3fd07e814e Merge pull request #84 from simpeg/Anisotropy
Anisotropy
2015-02-05 14:29:50 -08:00
Rowan Cockett ca4fd2adf8 Update LICENSE 2015-01-29 13:41:49 -08:00
Rowan Cockett 2cd9c4db5a Merge pull request #83 from simpeg/feat/cylMeshView
CylView and minor tensor mesh update
2015-01-29 10:56:32 -08:00
Rowan Cockett 619c2a2cae Update README.rst 2014-08-19 19:58:35 -07:00
Rowan Cockett 89becc1b43 Update README.rst 2014-07-03 15:38:28 -07:00
Rowan Cockett 596395ac32 Update and rename README.md to README.rst 2014-07-03 15:26:06 -07:00
Rowan Cockett 8c1b6ec5da Update README.md 2014-07-03 14:58:19 -07:00
Rowan Cockett 10cf6817a3 Merge pull request #7 from simpeg/innerProductUpdates
Inner product updates
2014-07-03 12:23:59 -07:00
Rowan Cockett d2f6a646f6 Merge pull request #75 from simpeg/innerProducts
Inner products derivative
2014-07-03 11:22:24 -07:00
rowanc1 4bd4c3cd81 bug fix, we were sourcing the wrong file. 2013-11-23 00:45:19 +00:00
rowanc1 6c029e5e2c Added matplotlib into the startup. SimPEG needs it. 2013-11-22 01:26:22 +00:00
rowanc1 66050f474f Changed to generic bitbucket git repo. 2013-11-22 01:17:06 +00:00
rowanc1 d46a2aaf87 Merged in GCEtools (pull request #29)
Merge GCE tools.
2013-11-21 17:13:02 -08:00
rowanc1 545b1637d8 Merged in updateFramework (pull request #28)
BFGS, Iterative Solvers, and Updates to framework.
2013-11-21 12:08:31 -08:00
rowanc1 f87899465d Merged in boundaryConditions (pull request #25)
Cell Gradient and Boundary Conditions
2013-11-21 10:42:43 -08:00
rowanc1 86982e86da Merged in modelBuilder (pull request #26)
Create a random model
2013-11-21 10:42:00 -08:00
rowanc1 7e96a7a4ca Merged in counters (pull request #27)
Simple profiling through decorator functions.
2013-11-21 10:41:16 -08:00
rowanc1 c107376c31 Merged in visulization (pull request #24)
Work 3D visualization of SimPEG models with VTK
2013-11-18 12:05:08 -08:00
rowanc1 082583fe51 Merged in Averaging (pull request #22)
Averaging Testing and Fixes.
2013-11-12 14:00:56 -08:00
rowanc1 34be3f5b5b Merged in BoundConstraint (pull request #21)
Optimization Framework and Bug Fixes.
2013-11-12 11:39:07 -08:00
rowanc1 6ce07e9619 Merged in FortranSolvers (pull request #20)
Implemented Fortran for Forwards and Backwards solves.
2013-11-12 11:21:11 -08:00
rowanc1 059ccd40b3 Merged in TestDocumentation (pull request #19)
Updates to Testing Documentation.
2013-11-05 16:13:29 -08:00
rowanc1 0f4a585867 Merged in Interpolation_TensorMesh (pull request #18)
Interpolation For Tensor Mesh.
2013-11-05 10:38:12 -08:00
rowanc1 119a1bac81 Merged in inversionFramework (pull request #17)
Initial implementation of the inversion framework.
2013-11-04 16:24:46 -08:00
rowanc1 de2668d7d8 Merged in meshFolder (pull request #15)
Moved mesh to own folder.  Added 1D cyl mesh.
2013-10-18 17:44:33 -07:00
rowanc1 96ce005c59 Merged in getMassModification (pull request #14)
Modification to Mass Matrix generation.
2013-10-18 17:05:28 -07:00
rowanc1 83291451d3 Merged in inverseProblem (pull request #13)
Documentation, Utilities, Testing, DC Problem
2013-10-16 09:20:04 -07:00
rowanc1 6cb42ad20e LogicallyOrthogonalMesh.py edited online with Bitbucket 2013-10-01 00:23:18 +00:00
rowanc1 eb7d99837c Merged in docs (pull request #12)
Documentation updates
2013-09-30 17:19:19 -07:00
rowanc1 e3d113db8b Merged in docs (pull request #11)
Documentation for SimPEG
2013-09-30 10:21:20 -07:00
rowanc1 3b920c7701 Merged in MIT_license (pull request #8)
MIT License
2013-08-30 22:29:21 -07:00
rowanc1 82e8df226c Merged in condModels (pull request #10)
Cond Models
2013-08-30 22:25:11 -07:00
rowanc1 859319d300 Merged in LOM (pull request #7)
Logically Orthogonal Mesh
2013-08-09 16:48:08 -07:00
rowanc1 ba69148d83 Merged in printTensorMesh (pull request #6)
Print Tensor mesh
2013-08-02 12:03:16 -07:00
rowanc1 58fdc7a7e5 Merged in diffOperators (pull request #5)
Reshaping function in base mesh
2013-07-24 14:14:49 -07:00
rowanc1 d4df6b4ce0 Merged in ReOrg (pull request #1)
Code re-organization
2013-07-09 22:02:34 -07:00