modified as per Cameron's comment

Author: seegyoung

mds/apfMDS.cc

@@ -649,7 +649,6 @@ class MeshMDS : public Mesh2
       {
         p = getPMent(pmodel, residence, owner);
         PCU_ALWAYS_ASSERT(p);
-        //printf("(%d) setPtnClas e %d (id %d, owner=%d)\n", PCU_Comm_Self(), getMdsIndex(this,e), p->ID, p->owner);
       }
       mds_set_part(mesh, id, (void*)p);
       PCU_ALWAYS_ASSERT(mds_get_part(mesh, id)==(void*)p);

mds/apfPM.cc

@@ -15,8 +15,7 @@
 
 namespace apf {
 
-int pme_id=0;
-
+// the following three functions are for exclusive use by pumi_mesh_loadAll
 // the last arg "owner" is used only if a new pmodel entity is created
 PME* getPMent(PM& ps, apf::Parts const& pids, int owner)
 {
@@ -43,6 +42,7 @@ PME* getPMent(PM& ps, apf::Parts const& pids, int owner)
       return &p;
     }
   }
+  static int pme_id=ps.size();
   PME *pme = new PME(pme_id++, pids, owner);
   ps.insert(*pme);
   ++(pme->refs);
@@ -53,15 +53,11 @@ PME* getPMent(PM& ps, apf::Parts const& pids, int owner)
 void deletePM(PM& ps)
 {  
   APF_ITERATE(PM, ps, it) 
-  {
-    printf("(%d) %s: delete PME %d\n", PCU_Comm_Self(), __func__, it->ID);
     ps.erase(*it);
-  }
 }
 
 void deletePMent(PM& ps, PME* p)
 {
-  printf("(%d) %s: delete PME %d\n", PCU_Comm_Self(), __func__, p->ID);
   ps.erase(*p);
 }
 
@@ -70,7 +66,7 @@ typedef std::map<int,size_t> CountMap;
 
 PME* getPME(PM& ps, apf::Parts const& ids)
 {
-  PME const& cp = *(ps.insert(PME(pme_id++, ids, -1)).first);
+  PME const& cp = *(ps.insert(PME(ps.size(), ids, -1)).first);
   /* always annoyed by this flaw in std::set */
   PME& p = const_cast<PME&>(cp);
   ++(p.refs);

mds/apfPM.h

@@ -24,9 +24,6 @@ struct PME
     if (o>-1) owner = o;
     ids.assign(i.begin(), i.end());
     refs = 0;
-#ifdef DEBUG
-  printf("(%d) create a new PME %d (pids.size=%d, ownder=%d)\n", PCU_Comm_Self(), ID, ids.size(), owner);
-#endif
   }
 
   bool operator<(PME const& other) const
@@ -36,23 +33,22 @@ struct PME
   int owner;
   std::vector<int> ids;
   int refs;
-  int ID;
+  int ID; // debugging purpose
 };
 
 typedef std::set<PME> PM;
 
 void deletePM (PM& ps);
 void deletePMent(PM& ps, PME* p);
-PME* getPMent(PM& ps, apf::Parts const& pids, int);
+PME* getPMent(PM& ps, apf::Parts const& pids, int o = -1);
 
 PME* getPME(PM& ps, Parts const& ids);
 void putPME(PM& ps, PME* p);
 void updateOwners(Mesh* m, PM& ps);
 
 void stitchMesh(Mesh2* m);
 
-void remapPM(PM& pm,
-    int (*map)(int, void*), void* user);
+void remapPM(PM& pm, int (*map)(int, void*), void* user);
 
 }