Some changes to amalgamate methods to be consistent with the new structure of the code.
Some changes to amalgamate methods to be consistent with the new structure of the code.


Former-commit-id: 5de09e3ad92a84ff14891e6752fc3ba7f1e7362d
Former-commit-id: 9215354b3084d712093ce0ecf03e439534b6712b
stadelmanma/OpenPNM,TomTranter/OpenPNM,amdouglas/OpenPNM,amdouglas/OpenPNM,PMEAL/OpenPNM