Save non-local GF only on demand

by setting the new flag 'saveNonLocal'