partial merge of 3PDM and 4PDM code; seem OK at least for serial and in-core run modes
Merge branch 'master' of https://github.com/sanshar/Block