 Lindsey Heagy
|
f972a50fce
|
Merge branch 'em/dev' into em/primsec
# Conflicts:
# SimPEG/EM/FDEM/FDEM.py
# SimPEG/EM/FDEM/SrcFDEM.py
|
2016-03-29 22:59:01 -07:00 |
|
|
Lindsey Heagy
|
d11f5c736b
|
prim-sec for EB formulation on same meshes
|
2016-03-29 09:59:13 -07:00 |
|
|
Lindsey Heagy
|
c66db805af
|
typo fix
|
2016-03-20 14:44:34 -07:00 |
|
|
Lindsey Heagy
|
055061ac3b
|
abstracted FDEM survey to BaseEMSurvey (with methods eval and eval deriv) as this should be common to FDEM and TDEM problems (only implemented on FDEM problem, TDEM inheritance will be taken care of on the TDEM refactor branch)
|
2016-03-20 12:15:52 -07:00 |
|
|
Rowan Cockett
|
e622dfb5cc
|
Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev
Conflicts:
.coveragerc
.gitignore
.travis.yml
docs/api_Utils.rst
docs/conf.py
docs/index.rst
requirements.txt
setup.py
|
2015-11-04 09:59:11 -08:00 |
|