 Rowan Cockett
|
51c112a529
|
Updates to documentation and DC utilities.
|
2016-06-26 16:07:35 -06:00 |
|
|
Rowan Cockett
|
57f8e35db7
|
Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
SimPEG/DCIP/BaseDC.py
SimPEG/DCIP/BaseIP.py
|
2016-06-26 14:08:28 -06:00 |
|
|
sgkang
|
c79bb998cb
|
Merge pull request #348 from simpeg/analytics
fix minor bugs in analytics (just for binder deploy)
|
2016-06-23 14:14:29 -07:00 |
|
|
seogi_macbook
|
0763925743
|
fix minor bugs in analytics
|
2016-06-23 14:12:49 -07:00 |
|
|
sgkang
|
1a0b81a206
|
Merge pull request #341 from simpeg/analytics
Analytics
|
2016-06-23 11:33:33 -07:00 |
|
|
seogi_macbook
|
8b44f8d96b
|
change FDEM_fields.py to FDEMDipolarfield.py
|
2016-06-23 10:14:13 -07:00 |
|
|
seogi_macbook
|
2bfd01ed7c
|
Merge branch 'dev' of https://github.com/simpeg/simpeg into analytics
|
2016-06-23 10:09:56 -07:00 |
|
|
seogi_macbook
|
e1ba80883d
|
Incorporate Lindsey's suggestoins
|
2016-06-23 09:10:50 -07:00 |
|
|
Rowan Cockett
|
a54713f546
|
Change to NotImplementedError.
|
2016-06-22 11:32:54 -06:00 |
|
|
Lindsey Heagy
|
ef382aed85
|
Merge branch 'master' into dev
|
2016-06-21 18:43:28 -06:00 |
|
|
seogi_macbook
|
1b33804e5a
|
Merge branch 'dev' of https://github.com/simpeg/simpeg into analytics
|
2016-06-21 11:15:23 -07:00 |
|
|
seogi_macbook
|
c161c5eab2
|
Merge branch 'master' of https://github.com/simpeg/simpeg into analytics
|
2016-06-21 11:14:56 -07:00 |
|
|
micmitch
|
f0944362c8
|
Silly mistake... needed zero arrays instead of scalars.
|
2016-06-14 15:22:36 -07:00 |
|
|
micmitch
|
e815ddaec7
|
Removed d typos from the end of function names.
|
2016-06-14 15:15:53 -07:00 |
|
|
Lindsey
|
64b0b4561f
|
Merge pull request #337 from simpeg/feat/docs-gae-travis-deploy
Feat/docs gae travis deploy
|
2016-06-13 19:16:22 -06:00 |
|
|
micmitch
|
b9d30af4a8
|
Changed \sigma to \hat{\sigma} = \sigma + i \omega \epsilon in the E field calculations.
|
2016-06-13 17:47:46 -07:00 |
|
|
micmitch
|
093f441331
|
Added functions to split electric field into "galvanic" and "inductive" portions.
|
2016-06-13 17:35:52 -07:00 |
|
|
seogi_macbook
|
5e3c1da8e2
|
add place holder for galvanic and inductive electric fields...
|
2016-06-13 16:41:59 -07:00 |
|
|
seogi_macbook
|
a3a5c86008
|
Fix couple bugs in FDEM analytics
|
2016-06-11 21:58:03 +02:00 |
|
|
Lindsey Heagy
|
7a82f57367
|
- doc the simple regularization, sparse regularization and regularization mesh
- typo fix in MT_3D_Forward example - Solver
- use EM.Static.DC for DC example
|
2016-06-11 08:16:22 -07:00 |
|
|
Lindsey Heagy
|
845c3c10ab
|
version on travis commit
|
2016-06-11 07:48:24 -07:00 |
|
|
Lindsey Heagy
|
c4d86b4a29
|
Merge branch 'dev' into feat/docs-gae-travis-deploy
|
2016-06-11 07:14:00 -07:00 |
|
|
Lindsey Heagy
|
3fc855f3c9
|
only push on master
|
2016-06-10 20:50:41 -07:00 |
|
|
Lindsey Heagy
|
fea508a507
|
fix path to app.yaml
|
2016-06-10 19:39:02 -07:00 |
|
|
Lindsey Heagy
|
5ca52cf49f
|
linting travis deploy of docs
|
2016-06-10 19:14:24 -07:00 |
|
|
Lindsey Heagy
|
7a06453c42
|
editing travis deploy
|
2016-06-10 18:54:31 -07:00 |
|
|
Lindsey Heagy
|
291da78b97
|
try deploying only from docs branch
|
2016-06-10 15:16:56 -07:00 |
|
|
Lindsey Heagy
|
504592c8de
|
travis typo fixes
|
2016-06-01 08:12:21 -07:00 |
|
|
Lindsey Heagy
|
75647f8fc3
|
first pass at gae deploy
|
2016-06-01 00:00:27 -07:00 |
|
|
Lindsey Heagy
|
e3462666bd
|
working on travis decrypt
|
2016-05-31 23:27:32 -07:00 |
|
|
Lindsey Heagy
|
fb37bf0fe2
|
move unpacking of credentials to after success, point credentials to docs folder
|
2016-05-31 23:15:50 -07:00 |
|
|
Lindsey Heagy
|
b023adbb33
|
add encrypted credentials for gae site and decrypt on travis
|
2016-05-31 23:03:55 -07:00 |
|
|
Lindsey Heagy
|
279bd49b4c
|
Bump version: 0.1.10 → 0.1.11
|
2016-05-31 15:38:05 -07:00 |
|
|
Lindsey Heagy
|
3398d5ab4d
|
use templates in conf.py, add google analytics to docs
|
2016-05-31 15:33:19 -07:00 |
|
|
Lindsey
|
3e26bb7de9
|
Merge pull request #277 from simpeg/dev
Dev
|
2016-05-31 15:11:29 -07:00 |
|
|
Rowan Cockett
|
16a016e9ac
|
switch coverage and delete old tests.
|
2016-05-31 14:09:57 -07:00 |
|
|
Lindsey
|
382b31bd12
|
Merge pull request #310 from simpeg/ref/regularization
modularizing regularization
|
2016-05-31 14:09:54 -07:00 |
|
|
Rowan Cockett
|
c9017bd180
|
Delete DCIP folder.
|
2016-05-31 08:42:52 -07:00 |
|
|
Lindsey Heagy
|
01e19e4227
|
start of gae site
|
2016-05-30 22:01:15 -07:00 |
|
|
Lindsey Heagy
|
9fbdaaf0a5
|
fix typo in examples path
|
2016-05-30 21:12:31 -07:00 |
|
|
Lindsey Heagy
|
2a159e20b9
|
update docs for examples to point to the correct path
|
2016-05-30 20:34:10 -07:00 |
|
|
Lindsey Heagy
|
5e8d3fbc78
|
organizing the docs - put the content in a content folder. put the SimPEG core api docs in core_api
|
2016-05-30 17:06:29 -07:00 |
|
|
Lindsey Heagy
|
414418a996
|
Merge branch 'dev' into feat/docs-deploy
# Conflicts:
# SimPEG/Mesh/View.py
|
2016-05-30 15:56:24 -07:00 |
|
|
Lindsey
|
6cc509020a
|
Merge pull request #323 from simpeg/feat/plotImage-curvilinear
plotImage for curvilinear mesh
|
2016-05-30 08:27:56 -07:00 |
|
|
Rowan Cockett
|
40f0874dfb
|
Doc testing, I think that is most of them!
|
2016-05-29 22:18:22 -07:00 |
|
|
Rowan Cockett
|
231e6dbc93
|
Suppress image warning.
|
2016-05-29 19:22:15 -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 |
|
|
Rowan Cockett
|
a131383dae
|
Correct solver location.
|
2016-05-29 18:35:41 -07:00 |
|
|
Rowan Cockett
|
ad4a0240d1
|
Remove Vertical1DMap from tests.
|
2016-05-29 18:34:17 -07:00 |
|