fixed plum pudding models to use DIM as a field rather than a macro to avoid collision
removed other version of pgrownet.cpp to fix merge conflict