Lindsey Heagy 967dc83fa8 fixed merge conflict with em/dev

2016-01-28 23:14:03 -08:00

..

__init__.py

SurveyFDEM --> Survey, FieldsFDEM --> Fields

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

FDEM.py

fixed merge conflict with em/dev

2016-01-28 23:14:03 -08:00

FieldsFDEM.py

fix sizes in Fields object (make an array not a vector)

2015-11-24 11:01:51 -08:00

SrcFDEM.py

cleaned up sources

2015-11-23 18:03:49 -08:00

SurveyFDEM.py

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