Lindsey Heagy 52cc92f699 Merge branch 'dev' into em/dev ...

# Conflicts:
#	SimPEG/EM/FDEM/FDEM.py

2016-02-22 11:07:08 -08:00

..

__init__.py

SurveyFDEM --> Survey, FieldsFDEM --> Fields

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

FDEM.py

Merge branch 'dev' into em/dev

2016-02-22 11:07:08 -08:00

FieldsFDEM.py

keep track of _v with notation

2016-02-19 17:31:43 -08:00

SrcFDEM.py

Integration in sources and documentation.

2016-02-15 10:56:09 -08:00

SurveyFDEM.py

- rx.projectFields --> rx.eval

2016-02-21 15:31:02 -08:00