some clean up
mpi summation of the energy term
factor of 2 in the energy calculation
default values for the nonlinear solvation parameters