Fixed ResolveShared

Examples/AdaptiveMesh/amesh.cpp

@@ -294,7 +294,7 @@ namespace INMOST
 	AdaptiveMesh::AdaptiveMesh() : Mesh()
 	{
 		//create a tag that stores maximal refinement level of each element
-		level = CreateTag("REFINEMENT_LEVEL",DATA_INTEGER,CELL|FACE|EDGE|NODE|ESET,NONE,1);
+		level = CreateTag("REFINEMENT_LEVEL",DATA_INTEGER,CELL|FACE|EDGE|ESET,NONE,1);
 		tag_status = CreateTag("TAG_STATUS",DATA_INTEGER,CELL|FACE|EDGE|NODE,NONE,1);
 		tag_an = CreateTag("TAG_AN",DATA_INTEGER,CELL|FACE|EDGE|NODE,NONE,1);
 		ref_tag = CreateTag("REF",DATA_REFERENCE,CELL|FACE|EDGE|NODE,NONE);
@@ -376,6 +376,7 @@ namespace INMOST
 			scheduled = Integrate(scheduled);
 			if( scheduled ) schedule_counter++;
 		}
+		ExchangeData(indicator,CELL | FACE | EDGE,0);
 		//6.Refine
 		BeginModification();
 		while(schedule_counter)
@@ -396,7 +397,7 @@ namespace INMOST
 					//create middle node
 					Node n = CreateNode(xyz);
 					//set increased level for new node
-					level[n] = level[e.getBeg()] = level[e.getEnd()] = level[e]+1;
+					//level[n] = level[e.getBeg()] = level[e.getEnd()] = level[e]+1;
 					//for each face provide link to a new hanging node
 					for(ElementArray<Face>::size_type kt = 0; kt < edge_faces.size(); ++kt)
 						hanging_nodes[edge_faces[kt]].push_back(n);
@@ -427,7 +428,7 @@ namespace INMOST
 					//create middle node
 					Node n = CreateNode(xyz);
 					//set increased level for the new node
-					level[n] = level[f]+1;
+					//level[n] = level[f]+1;
 					//for each cell provide link to new hanging node
 					for(ElementArray<Face>::size_type kt = 0; kt < face_cells.size(); ++kt)
 						hanging_nodes[face_cells[kt]].push_back(n);
@@ -471,7 +472,7 @@ namespace INMOST
 					//create middle node
 					Node n = CreateNode(xyz);
 					//set increased level for the new node
-					level[n] = level[c]+1;
+					//level[n] = level[c]+1;
 					//retrive all edges of current face to mark them
 					ElementArray<Edge> cell_edges = c.getEdges();
 					//mark all edges so that we can retive them later
@@ -594,7 +595,7 @@ namespace INMOST
 		//11. Restore parallel connectivity, global ids
         ResolveShared(true);
         //if (call_counter == 0)
-		ResolveModification();
+	//	ResolveModification(false,1);
 		//12. Let the user update their data
 		//todo: call back function for New() cells
 		//13. Delete old elements of the mesh
@@ -602,7 +603,8 @@ namespace INMOST
 		//14. Done
         //cout << rank << ": Before end " << endl;
 		EndModification();
-		ExchangeData(hanging_nodes,CELL | FACE,0);
+		CheckCentroids();
+		//ExchangeData(hanging_nodes,CELL | FACE,0);
         //cout << rank << ": After end " << endl;
 		//reorder element's data to free up space
 		ReorderEmpty(CELL|FACE|EDGE|NODE);
@@ -648,11 +650,13 @@ namespace INMOST
 					indicator[e] = INT_MAX;
 					for(ElementArray<Element>::size_type kt = 0; kt < adj.size(); ++kt)
 						if( level[e] == level[adj[kt]]) indicator[e] = std::min(indicator[e],indicator[adj[kt]]);
-					assert(indicator[e] != INT_MAX);
+					//if (indicator[e] == INT_MAX) cout << ro() << rank << ": " << ElementTypeName(e.GetElementType()) << e.GlobalID() << endl;
+					//assert(indicator[e] != INT_MAX);
 				}
 			}
 			//2.Communicate indicator on faces and edges
 			ReduceData(indicator,FACE|EDGE,0,ReduceMin);
+			ExchangeData(indicator,FACE|EDGE,0);
 			//3.If there is adjacent finer edge that are not marked for coarsening
 			// then this cell should not be coarsened
 			unscheduled = scheduled = 0;
@@ -734,6 +738,7 @@ namespace INMOST
 			}
 			//c) data reduction to get maximum over mesh partition
 			ReduceData(coarse_indicator,EDGE,0,ReduceMax);
+			ExchangeData(coarse_indicator,EDGE,0);
 			//d) look from cells if any edge is coarsened earlier
 			for(Storage::integer it = 0; it < CellLastLocalID(); ++it) if( isValidCell(it) )
 			{
@@ -752,6 +757,7 @@ namespace INMOST
 					}
 				}
 			}
+			ExchangeData(indicator,CELL|FACE|EDGE,0);
 			//5.Go back to 1 until no new elements scheduled
 			scheduled = Integrate(scheduled);
 			unscheduled = Integrate(unscheduled);
@@ -895,6 +901,20 @@ namespace INMOST
 					assert(visited);
 				}
 			}
+			/*
+			for(Storage::integer it = 0; it < NodeLastLocalID(); ++it) if( isValidNode(it) )
+			{
+				Node e = NodeByLocalID(it);
+				if( !e.Hidden() )
+				{
+					int my_level = -1;
+					ElementArray<Edge> edges = e.getEdges();
+					for(ElementArray<Edge>::iterator kt = edges.begin(); kt != edges.end(); ++kt)
+						my_level = std::max(my_level,level[*kt]);
+					level[e] = my_level;
+				}
+			}
+			*/
 			//jump to later schedule
 			schedule_counter--;
 		}
@@ -902,13 +922,14 @@ namespace INMOST
 		DeleteTag(indicator,FACE|EDGE);
 		//todo:
     	ResolveShared(true);
-		ResolveModification();
+		//ResolveModification(false,1);
 		//todo:
 		//let the user update their data
 		ApplyModification();
 		//done
 		EndModification();
-        ExchangeData(hanging_nodes,CELL | FACE,0);
+		CheckCentroids();
+        //ExchangeData(hanging_nodes,CELL | FACE,0);
 		//cleanup null links to hanging nodes
 		for(ElementType etype = FACE; etype <= CELL; etype = NextElementType(etype))
 		{

Examples/AdaptiveMesh/main.cpp

@@ -57,6 +57,7 @@ int main(int argc, char ** argv)
 						q += (xyz[d]-cnt[d])*(xyz[d]-cnt[d]);
 					q = sqrt(q);
 					if( q < r*(k+1) && q > r*k)
+				//	if( q < 0.4 && q >  0.3)
 					//if( q < 0.02 )
 					{
 						indicator[it->self()] = 1;
@@ -91,6 +92,7 @@ int main(int argc, char ** argv)
 			}
 			while(numref);
 			refcnt = 0;
+			//if (0)
 			do
 			{
 				numref = 0;
@@ -111,7 +113,7 @@ int main(int argc, char ** argv)
 				numref = m.Integrate(numref);
 				if( numref )
 				{
-					std::cout << "k " << k << " crscnt " << refcnt << " " << r*k << " < r < " << r*(k+1) << " numcrs " << numref << " cells " << m.NumberOfCells() <<  std::endl;
+					std::cout << ": k " << k << " crscnt " << refcnt << " " << r*k << " < r < " << r*(k+1) << " numcrs " << numref << " cells " << m.NumberOfCells() <<  std::endl;
 					/*
 					{
 						std::stringstream file;
@@ -119,6 +121,8 @@ int main(int argc, char ** argv)
 						m.Save(file.str());
 					}
 					 */
+					 
+				
 					if( !m.Coarse(indicator) ) break;
 					
 					{
@@ -127,18 +131,39 @@ int main(int argc, char ** argv)
 						m.Save(file.str());
 					}
 					
+					std::cout << " Output " << k << std::endl;
+				m.UpdateStatus();
+				TagInteger isface = m.CreateTag("isface",DATA_INTEGER,CELL|FACE,NONE,1);
+				for(Mesh::iteratorFace it = m.BeginFace(); it != m.EndFace(); ++it) isface[*it] = 1;
+				std::stringstream file;
+				//m.SetFileOption("VTK_OUTPUT_FACES","1");
+				file << "step_" << k << "_" << m.GetProcessorRank() << ".xml";
+				//file << "step_" << k << "_" << refcnt << ".pvtk";
+				m.Save(file.str());
+					
+					if (k == 6 && refcnt==0) exit(-1);
 					
 					
 					//cleanup indicator
 					for(Mesh::iteratorCell it = m.BeginCell(); it != m.EndCell(); ++it) indicator[it->self()] = 0;
 				}
+				
+				{
+				
+			}
 				//return -1;
 				refcnt++;
 			}
 			while(numref);
 			
 			{
+				std::cout << " Output " << k << std::endl;
+				m.UpdateStatus();
+				TagInteger isface = m.CreateTag("isface",DATA_INTEGER,CELL|FACE,NONE,1);
+				for(Mesh::iteratorFace it = m.BeginFace(); it != m.EndFace(); ++it) isface[*it] = 1;
 				std::stringstream file;
+				//m.SetFileOption("VTK_OUTPUT_FACES","1");
+				//file << "step_" << k << "_" << m.GetProcessorRank() << ".xml";
 				file << "step_" << k << ".pvtk";
 				m.Save(file.str());
 			}

Examples/OldDrawGrid/main.cpp

@@ -2113,6 +2113,12 @@ int main(int argc, char ** argv)
 		if( argc > 2 )	mesh->SetFileOption("VTK_GRID_DIMS",argv[2]);
 		mesh->Load(argv[1]);
 	} 
+	
+	TagInteger global_id = mesh->GetTag("GLOBAL_ID");
+	for(Mesh::iteratorElement e = mesh->BeginElement(FACE); e != mesh->EndElement(); ++e)
+	{
+		if( global_id[*e] == 201 || global_id[*e] == 203 || global_id[*e] == 208 ) std::cout << e->LocalID() << " " << global_id[*e] << std::endl;
+	}
 	/*
 	catch(...)
 	{

Source/Headers/inmost_common.h

@@ -54,7 +54,7 @@
 // output xml files for debugging of parallel algorithms
 // search for style.xsl within examples for comfortable
 // view of generated xml files
-//#define USE_PARALLEL_WRITE_TIME
+#define USE_PARALLEL_WRITE_TIME
 
 // this will revert Mesh::PrepareReceiveInner to always
 // use MPI point to point functionality disregarding problem type

Source/Headers/inmost_mesh.h

@@ -3163,11 +3163,12 @@ namespace INMOST
 		/// newly created elements, provide them valid global identificators, resolve owners of
 		/// the elements potentially optimized using information from BridgeTag and LayersTag
 		/// May use ResolveShared function as basis but instead the whole mesh run the same algorithm for subset.
-		void                              ResolveModification(int metric=0); //resolve parallel state of newly created elements, restore ghost layers; not implemented, resuse ResolveShared code
+		void                              ResolveModification(bool only_new, int metric=0); //resolve parallel state of newly created elements, restore ghost layers; not implemented, resuse ResolveShared code
 		void                              EndModification    ();    //delete hidden elements
 		enumerator                        getNext            (const HandleType * arr, enumerator size, enumerator k, MarkerType marker) const;
 		enumerator                        Count              (const HandleType * arr, enumerator size, MarkerType marker) const;
         void                              FindMinDijkstra    (Cell c, double& dist, int& owner);
+        void CheckCentroids();
 		//implemented in mesh.cpp
 	private:
 		Tag                   tag_topologyerror;

Source/Mesh/modify.cpp

@@ -1658,7 +1658,8 @@ namespace INMOST
                         assert(oc.GetHandle() != *it);
                         if (tag_mark[oc] == 1) continue;
 
-                        if (GetMarker(oc.GetHandle(),NewMarker()) == false) 
+                        //if (GetMarker(oc.GetHandle(),NewMarker()) == false) 
+			if (oc.GetStatus() == Element::Owned)
                         {
                             dist = tag_dist[*it] + 1;
                             owner = oc.IntegerDF(tag_owner);
@@ -1686,15 +1687,23 @@ namespace INMOST
     }
 
 
-	void Mesh::ResolveModification(int metric)
+	
+
+	void Mesh::ResolveModification(bool only_new, int metric)
 	{
         int rank = GetProcessorRank();
         int size = GetProcessorsNumber();
         if (size == 1) return;
 	    
         Tag tag = CreateTag("TEMP_DISTANSE",DATA_REAL,CELL,CELL,2);
+        TagInteger tag_d = CreateTag("DIJ",DATA_INTEGER,CELL,NONE,1);
+        TagInteger tag_ow = CreateTag("DIJ_OW",DATA_INTEGER,CELL,NONE,1);
+        TagReal tag_dis = CreateTag("DIJ_DIS",DATA_REAL,CELL,NONE,1);
         stringstream ss;
-		for(Mesh::iteratorCell it = BeginCell(); it != EndCell(); it++) if (GetMarker(*it,NewMarker()))
+		for(Mesh::iteratorCell it = BeginCell(); it != EndCell(); it++) 
+			//if (GetMarker(*it,NewMarker()))
+			if (!only_new || it->nbAdjElements(NODE | EDGE | FACE | CELL, NewMarker()) != 0)
+
         {
             if (it->GetStatus() == Element::Owned) continue;
             double min_distance = 0;
@@ -1718,7 +1727,10 @@ namespace INMOST
             }
             else  
             {
+		    tag_d[*it] = 1;
                 FindMinDijkstra(it->getAsCell(), min_distance, owner);
+		tag_ow[*it] = owner;
+		tag_dis[*it] = min_distance;
             }
             it->RealArray(tag)[0] = owner;
             it->RealArray(tag)[1] = min_distance;
@@ -1727,22 +1739,23 @@ namespace INMOST
         ReduceData(tag, CELL, 0, OperationMinDistance);
         ExchangeData(tag, CELL, 0);
 
-		for(Mesh::iteratorCell it = BeginCell(); it != EndCell(); it++) if (GetMarker(*it,NewMarker()) && (it->GetStatus() == Element::Ghost || it->GetStatus() == Element::Shared) )
-        {
-            if (it->GetStatus() == Element::Owned) continue;
-            int new_owner = (int)it->RealArray(tag)[0];
+	for(Mesh::iteratorCell it = BeginCell(); it != EndCell(); it++) //if (GetMarker(*it,NewMarker()) && (it->GetStatus() == Element::Ghost || it->GetStatus() == Element::Shared) )
+			if ( !only_new || it->nbAdjElements(NODE | EDGE | FACE | CELL, NewMarker()) != 0)
+	{
+		if (it->GetStatus() == Element::Owned) continue;
+		int new_owner = (int)it->RealArray(tag)[0];
 
-            it->IntegerDF(tag_owner) = new_owner;
+		it->IntegerDF(tag_owner) = new_owner;
 
-            if (rank == new_owner)
-            {
-                it->SetStatus(Element::Shared);
-            }
-            else
-            {
-                it->SetStatus(Element::Ghost);
-            }
-        }
+		if (rank == new_owner)
+		{
+			it->SetStatus(Element::Shared);
+		}
+		else
+		{
+			it->SetStatus(Element::Ghost);
+		}
+	}
 
 		RecomputeParallelStorage(CELL | EDGE | FACE | NODE);
         DeleteTag(tag);

Source/Mesh/parallel.cpp

@@ -750,14 +750,21 @@ namespace INMOST
 	
 	void determine_my_procs_low(Mesh * m, HandleType h, dynarray<Storage::integer,64> & result, dynarray<Storage::integer,64> & intersection)
 	{
+		MarkerType hm = m->HideMarker();
 		Element::adj_type const & subelements = m->LowConn(h);
 		Element::adj_type::const_iterator i = subelements.begin();
-		Storage::integer_array p = m->IntegerArrayDV(*i,m->ProcessorsTag());
 		result.clear();
-		result.insert(result.end(),p.begin(),p.end());
-		i++;
 		while(i != subelements.end())
 		{
+			if( hm && m->GetMarker(*i,hm) ) {i++; continue;}
+			Storage::integer_array p = m->IntegerArrayDV(*i,m->ProcessorsTag());
+			result.insert(result.end(),p.begin(),p.end());
+			i++;
+			break;
+		}
+		while(i != subelements.end())
+		{
+			if( hm && m->GetMarker(*i,hm) ) {i++; continue;}
 			Storage::integer_array q = m->IntegerArrayDV(*i,m->ProcessorsTag());
 			intersection.resize(std::max(static_cast<unsigned>(result.size()),static_cast<unsigned>(q.size())));
 			dynarray<Storage::integer,64>::iterator qt = std::set_intersection(result.begin(),result.end(),q.begin(),q.end(),intersection.begin());
@@ -769,12 +776,14 @@ namespace INMOST
 	
 	void determine_my_procs_high(Mesh * m, HandleType h, const Tag & procs, dynarray<Storage::integer,64> & result, dynarray<Storage::integer,64> & intersection)
 	{
+		MarkerType hm = m->HideMarker();
 		Element::adj_type const & overelements = m->HighConn(h);
 		if( overelements.empty() ) return;
 		Element::adj_type::const_iterator i = overelements.begin();
 		result.clear();
 		while(i != overelements.end())
 		{
+			if( hm && m->GetMarker(*i,hm) ) {i++; continue;}
 			Storage::integer_array q = m->IntegerArrayDV(*i,procs);
 			intersection.resize(result.size()+q.size());
 			dynarray<Storage::integer,64>::iterator qt = std::set_union(result.begin(),result.end(),q.begin(),q.end(),intersection.begin());
@@ -1047,7 +1056,7 @@ namespace INMOST
 			}
 			else
 			{
-                
+                /*
                 if (only_new)
                 {
 		            for(Mesh::iteratorCell it = BeginCell(); it != EndCell(); it++) if (GetMarker(*it,NewMarker()))
@@ -1059,6 +1068,7 @@ namespace INMOST
                         }
                     }
                 }
+                */
 
 				double time = Timer();
 				Storage::real epsilon = GetEpsilon();
@@ -1081,6 +1091,7 @@ namespace INMOST
 				for(integer nit = 0; nit < NodeLastLocalID(); ++nit) if( isValidNode(nit) )
 				{
 					Node it = NodeByLocalID(nit);
+					if (only_new && GetMarker(it->GetHandle(),NewMarker()) == false) continue;
 					Storage::integer_array arr = it->IntegerArrayDV(tag_processors);
 					arr.resize(1);
 					arr[0] = mpirank;
@@ -1100,6 +1111,7 @@ namespace INMOST
 				
 				for(iteratorNode n = BeginNode(); n != EndNode(); n++)
 				{
+					if (only_new && GetMarker(*n,NewMarker()) == false) continue;
 					real_array c = n->Coords();
 					for(real_array::size_type k = 0; k < procs.size(); k++)
 						if( point_in_bbox(c.data(),bboxs.data()+procs[k]*dim*2,dim,GetEpsilon()) )
@@ -1316,7 +1328,12 @@ namespace INMOST
 					REPORT_VAL("time",time);
 					
 					
+					MarkerType new_lc;
+					if( only_new ) new_lc = CreateMarker();
+					TagInteger lc_mrk = CreateTag("LC_MARKER",DATA_INTEGER,CELL|FACE|EDGE,NONE,1);
+					MarkerType hm = HideMarker();
 					
+					for (iteratorElement it = BeginElement(CELL|FACE|EDGE); it != EndElement(); it++) lc_mrk[*it] = 0;
 					
 					for(ElementType current_mask = EDGE; current_mask <= CELL; current_mask = NextElementType(current_mask))
 					{
@@ -1330,6 +1347,32 @@ namespace INMOST
 						Element::Status estat;
 						
 						time = Timer();
+						if(only_new)