Added routines for taking into account an externally defined nonhomogeneous efield.
Solved merge conflicts.