Commit Graph

3 Commits

Author SHA1 Message Date
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