845c3c10ab
version on travis commit
2016-06-11 07:48:24 -07:00
c4d86b4a29
Merge branch 'dev' into feat/docs-gae-travis-deploy
2016-06-11 07:14:00 -07:00
3fc855f3c9
only push on master
2016-06-10 20:50:41 -07:00
fea508a507
fix path to app.yaml
2016-06-10 19:39:02 -07:00
5ca52cf49f
linting travis deploy of docs
2016-06-10 19:14:24 -07:00
7a06453c42
editing travis deploy
2016-06-10 18:54:31 -07:00
291da78b97
try deploying only from docs branch
2016-06-10 15:16:56 -07:00
504592c8de
travis typo fixes
2016-06-01 08:12:21 -07:00
75647f8fc3
first pass at gae deploy
2016-06-01 00:00:27 -07:00
e3462666bd
working on travis decrypt
2016-05-31 23:27:32 -07:00
fb37bf0fe2
move unpacking of credentials to after success, point credentials to docs folder
2016-05-31 23:15:50 -07:00
b023adbb33
add encrypted credentials for gae site and decrypt on travis
2016-05-31 23:03:55 -07:00
3398d5ab4d
use templates in conf.py, add google analytics to docs
2016-05-31 15:33:19 -07:00
382b31bd12
Merge pull request #310 from simpeg/ref/regularization
...
modularizing regularization
2016-05-31 14:09:54 -07:00
01e19e4227
start of gae site
2016-05-30 22:01:15 -07:00
9fbdaaf0a5
fix typo in examples path
2016-05-30 21:12:31 -07:00
2a159e20b9
update docs for examples to point to the correct path
2016-05-30 20:34:10 -07:00
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
414418a996
Merge branch 'dev' into feat/docs-deploy
...
# Conflicts:
# SimPEG/Mesh/View.py
2016-05-30 15:56:24 -07:00
6cc509020a
Merge pull request #323 from simpeg/feat/plotImage-curvilinear
...
plotImage for curvilinear mesh
2016-05-30 08:27:56 -07:00
40f0874dfb
Doc testing, I think that is most of them!
2016-05-29 22:18:22 -07:00
231e6dbc93
Suppress image warning.
2016-05-29 19:22:15 -07:00
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
bc073e49b5
Updates to docs errors.
2016-05-29 18:57:38 -07:00
a131383dae
Correct solver location.
2016-05-29 18:35:41 -07:00
ad4a0240d1
Remove Vertical1DMap from tests.
2016-05-29 18:34:17 -07:00
74f5395573
Surject1D updates.
2016-05-29 18:25:42 -07:00
6f7a0b1279
Rename Vertical1DMap to SurjectVertical1D due to depreciation.
2016-05-29 18:14:42 -07:00
e2bb9c8d8e
rename flow example.
2016-05-29 18:12:52 -07:00
de693adaa7
Minor updates to get it 'working'
...
There still seems to be a problem with this example:
- The line search breaks.
- The plots are not informative.
- There are a lot of errors in the structured array codes.
2016-05-29 18:04:09 -07:00
fc07993006
Spacings in functions.
2016-05-29 18:03:03 -07:00
12a12c7b5a
updates to FDEM docs.
2016-05-29 17:51:41 -07:00
0b4215f33e
Add DC and IP docs.
2016-05-29 17:45:49 -07:00
5e2a8232a3
Minor updates to titles in examples.
2016-05-29 17:21:37 -07:00
feba384911
Add solver parameter to the Casing example.
2016-05-29 17:08:11 -07:00
4844b7230a
TOC updates for docs index.
2016-05-29 17:05:42 -07:00
f2e13182bf
Merge branch 'dev' into feat/plotImage-curvilinear
...
# Conflicts:
# SimPEG/Examples/__init__.py
2016-05-29 16:43:40 -07:00
09cd9c7fa3
Merge branch 'dev' into ref/regularization
2016-05-29 16:26:58 -07:00
62eb4541cb
update example name --> based on mesh
2016-05-29 15:48:15 -07:00
09eb2106ec
Merge pull request #307 from simpeg/ref/dev
...
Ref/dev
2016-05-29 14:50:43 -07:00
f8b86abd5a
Merge branch 'ref/dev' into ref/regularization
2016-05-29 14:10:46 -07:00
e476bf0059
Cleanup Sparse Reg and Directives
2016-05-29 14:09:29 -07:00
825511e9d3
Add a curvilinear plotImage function, update example.
2016-05-29 13:17:22 -07:00
3b4bec9c0b
Refactor IRLS iterations, full solves from l2->lp
...
Adapt Example
2016-05-28 11:27:09 -07:00
022e1f7660
Update IRLS directive to allow multiple GN iterations.
...
Remove modifications to the ProjGN solver.
Update IRLS example.
2016-05-27 13:11:31 -07:00
406703f1c6
Merge branch 'dev' into ref/dev
...
Conflicts:
docs/examples/DC_Forward_PseudoSection.rst
2016-05-27 11:10:39 -07:00
7b72d3a92d
Merge branch 'dev' into ref/dev
...
Conflicts:
SimPEG/DCIP/DCIPUtils.py
2016-05-27 10:01:28 -07:00
cf89f5f6a2
Merge pull request #322 from simpeg/bug/propmap
...
Bug/propmap
2016-05-26 20:52:42 -07:00
aa1086eba3
use fixed prop map in EM
2016-05-26 18:03:09 -07:00
1c53129da6
fix bug in prop map linked derivs
2016-05-26 17:58:30 -07:00
Lindsey Heagy