Commit Graph

11 Commits

Author SHA1 Message Date
Lindsey 6a83af7334 merged master to get namespace changes, resolved merge conflicts, use zero, identity for derivs, defaults for primary fields and sources 2015-11-23 17:41:32 -08:00
Lindsey Heagy 7023e999bc SurveyFDEM --> Survey, FieldsFDEM --> Fields 2015-11-17 22:17:38 -08:00
Lindsey Heagy 2fbe0af108 BaseSrcFDEM --> BaseSrc 2015-11-17 21:47:38 -08:00
Lindsey Heagy c041ad3de6 EM.FDEM.RxFDEM --> EM.FDEM.Rx 2015-11-17 08:29:27 -08:00
Lindsey Heagy 19bcdbfbf5 EM.FDEM.SrcFDEM_XXX --> EM.FDEM.Src.XXX 2015-11-13 10:39:08 -08:00
Lindsey Heagy 3b62957d08 re-named SrcUtils to AnalyticUtils, cleaned up namespace for imports to close #159 2015-11-13 08:44:34 -08:00
Lindsey Heagy 639a6e7a06 Adjoint for all 4 formulations with Zero Identity 2015-11-08 14:09:18 -08:00
Lindsey Heagy 0af1f59891 h,j jvec now with Zero and identity classes 2015-11-06 10:58:23 -08:00
Lindsey Heagy d102ec9c00 Zero, Identity for E formulation 2015-11-06 10:00:30 -08:00
Rowan Cockett 4db756b060 simpegEM --> SimPEG.EM 2015-11-04 10:13:24 -08: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