seogi_macbook
9062f6d326
trying to pass travis
2016-03-04 10:35:20 -08:00
seogi_macbook
db63779b9b
change gen_DCIPsurvey to output survey class
2016-03-03 16:19:53 -08:00
seogi_macbook
d31ef027d7
comment regularizations
2016-03-03 15:14:49 -08:00
seogi_macbook
f73d0a3b4a
Merge branch 'dcip/dev' of https://github.com/simpeg/simpeg into dcip/dev
...
Conflicts:
SimPEG/Regularization.py
2016-03-03 15:12:05 -08:00
seogi_macbook
e4506a8773
blah
2016-03-03 14:54:00 -08:00
seogi_macbook
e4cbc584dc
ss
2016-03-03 14:06:18 -08:00
Lindsey Heagy
2f8b8a36bf
smoothModel --> mrefInSmooth
2016-03-02 09:46:50 -08:00
Lindsey Heagy
834de58284
projectFields --> eval
2016-03-01 18:02:33 -08:00
Lindsey Heagy
cba52c3b81
Merge branch 'dev' into dcip/dev
...
# Conflicts:
# SimPEG/Examples/Inversion_Linear.py
2016-03-01 17:56:10 -08:00
Lindsey Heagy
5e5c7ba0fb
docs for regmesh, cellGrad--> cellDiff, faceDiv--> faceDiff for regmesh
2016-03-01 17:31:37 -08:00
Lindsey
6e0a54b319
Merge pull request #255 from simpeg/em/rx
...
Em/rx
2016-02-27 16:08:16 -08:00
Lindsey Heagy
5c8fba4242
changing btwn e,j and h,b depends on which formulation we are going between and is now in the fields object
2016-02-27 15:44:07 -08:00
D Fournier
6c33455d15
update Directive for sparse norm
2016-02-25 08:56:18 -08:00
D Fournier
7000699e38
Merge branch 'feat/sparse-regularization' of https://github.com/simpeg/simpeg into feat/sparse-regularization
2016-02-24 21:00:02 -08:00
D Fournier
63bf8b9e4d
Add linear survey
2016-02-24 20:59:51 -08:00
Lindsey Heagy
e3af1fd94e
convert indActive to a bool if an integer list is provided
2016-02-24 20:28:09 -08:00
Lindsey Heagy
4e871a43a9
prototype of defining regularization mesh within Regularization.py for constructing operators for regularization that are not true differential operators
2016-02-24 18:03:42 -08:00
D Fournier
020332aec5
DCIP Changes
2016-02-24 15:25:56 -08:00
Lindsey Heagy
ac008e7253
Merge branch 'em/dev' into em/rx
...
# Conflicts:
# SimPEG/EM/FDEM/SurveyFDEM.py
2016-02-22 11:11:10 -08:00
Lindsey Heagy
52cc92f699
Merge branch 'dev' into em/dev
...
# Conflicts:
# SimPEG/EM/FDEM/FDEM.py
2016-02-22 11:07:08 -08:00
Lindsey
8bd4eedb83
Merge pull request #256 from simpeg/ref/rx-eval
...
rx.projectFields --> rx.eval
2016-02-22 11:03:46 -08:00
Lindsey Heagy
bcda60815e
- rx.projectFields --> rx.eval
...
- rx.projectFieldsDeriv --> rx.evalDeriv
2016-02-21 15:31:02 -08:00
Lindsey Heagy
f37235973b
adjoint debugging
2016-02-21 11:33:15 -08:00
Lindsey Heagy
feff936c92
cleanup of tests and debugging derivs
2016-02-21 11:02:29 -08:00
Lindsey Heagy
6aa9b533ba
include mu in testing, cleanup and debugging in dipole sources
2016-02-21 10:36:46 -08:00
Lindsey Heagy
4df932ccfc
notation cleanup
2016-02-21 10:35:27 -08:00
Lindsey Heagy
3e673d34f1
- each of e,b,h,j from every formulation. Currently, b from j is first order
...
- removed CCV primary and secondary (dangerous the way it was previously done)
- NOTE: Source derive may not be properly taken care of yet
2016-02-20 17:05:43 -08:00
Lindsey Heagy
f1527f994b
e,b,h,j from j formulation
2016-02-20 14:30:55 -08:00
Lindsey Heagy
0646a930ab
e,b,h,j from b formulation
2016-02-20 13:27:51 -08:00
Lindsey Heagy
0edbc9f6ca
docs for fields_e
2016-02-20 11:13:09 -08:00
Lindsey Heagy
ce49249664
e,b,h,j with deriv and adjoint from e formulation
2016-02-20 11:05:25 -08:00
Lindsey Heagy
4c3c2c361c
- merge em/dev
...
- start of j data from e
2016-02-20 10:13:37 -08:00
Lindsey
40d39d751a
Merge pull request #244 from simpeg/em/FDEMfieldsDerivs
...
Em/fdem fields derivs
2016-02-20 09:11:49 -08:00
Lindsey Heagy
b5f4d8e999
typo in Regularization.py
2016-02-19 17:43:50 -08:00
Lindsey Heagy
649525fa88
keep track of _v with notation
2016-02-19 17:31:43 -08:00
Lindsey
922bdf93e1
Merge pull request #246 from simpeg/ref/MappingNotation
...
Naming conventions in Maps (re #231 )
2016-02-19 17:25:11 -08:00
D Fournier
cd352dc5f7
Merge branch 'dcip/dev' of https://github.com/simpeg/simpeg into dcip/dev
2016-02-19 16:42:13 -08:00
D Fournier
a7c35abd56
Major re-write for the IO and pseudo-section function.
...
Will need to adapt the example.
2016-02-19 16:41:59 -08:00
Lindsey Heagy
e4a3e0a16d
break out the Pac, Pafx, ... and make part of base regularization
2016-02-19 16:23:26 -08:00
Lindsey Heagy
a5be262171
add future warnings for new map names to ensure backwards compatibility (for a time)
2016-02-17 14:32:49 -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
Rowan Cockett
1c2fecf3a2
Add the IRLS Directive.
2016-02-16 22:07:33 -08:00
Rowan Cockett
9bf4a6228d
Remove the update_IRLS and move to PR #254 .
2016-02-16 22:06:17 -08:00
Rowan Cockett
226a28f611
Remove regularization and diff op changes, and deal with these in a separate PR #254 .
2016-02-16 22:01:50 -08:00
Rowan Cockett
c10777a245
Addition of unitCellGrad. Possibly rename to cellGradStencil?
2016-02-16 22:00:12 -08:00
Rowan Cockett
05a85018de
Create a Simple and a SparseRegularization class.
...
The SparseRegularization class allows implementation of p-q norms.
2016-02-16 21:59:08 -08:00
Rowan Cockett
4c547d22c6
Move the optimization code into PR #253 .
2016-02-16 21:55:21 -08:00
Rowan Cockett
8aa23c31de
Allow moving off bounds in projected gradient.
...
The current implementation does not allow you to move off the
bounds (lower/upper) once you have gotten on them, this allows you
to move off of the bound.
Please note that more testing should be done to ensure that this does
not introduce oscillations into the optimization routine.
2016-02-16 21:53:31 -08:00
Rowan Cockett
fb1973cfe4
Merge pull request #211 from simpeg/mt/dev
...
Merge MT into dev
2016-02-16 17:14:49 -08:00
Lindsey Heagy
4067106956
fixed merge conflict in examples __init__.py
2016-02-16 16:14:41 -08:00