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

..

__init__.py

SurveyFDEM --> Survey, FieldsFDEM --> Fields

2015-11-17 22:17:38 -08:00

FDEM.py

Merge branch 'em/dev' into em/primsec

2016-03-29 22:59:01 -07:00

FieldsFDEM.py

s_m, s_e are vectors (so they should not be capitalized)

2016-03-20 13:04:02 -07:00

SrcFDEM.py

Merge branch 'em/dev' into em/primsec

2016-03-29 22:59:01 -07:00

SurveyFDEM.py

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