diff --git a/Mesh/yamakawa.cpp b/Mesh/yamakawa.cpp index 4e6f7f7027d607b54202c41a3bb6be56f4370350..d67a4a129a5680ead6a587c3fc3fd534875c604b 100755 --- a/Mesh/yamakawa.cpp +++ b/Mesh/yamakawa.cpp @@ -344,12 +344,12 @@ void Recombinator::execute(GRegion* gr){ build_vertex_to_elements(gr); potential.clear(); - patern1(gr); - Msg::Info("Hex-merging patern nb. 1..."); - patern2(gr); - Msg::Info("Hex-merging patern nb. 2..."); - patern3(gr); - Msg::Info("Hex-merging patern nb. 3..."); + pattern1(gr); + Msg::Info("Hex-merging pattern nb. 1..."); + pattern2(gr); + Msg::Info("Hex-merging pattern nb. 2..."); + pattern3(gr); + Msg::Info("Hex-merging pattern nb. 3..."); std::sort(potential.begin(),potential.end()); @@ -377,7 +377,7 @@ void Recombinator::init_markings(GRegion* gr){ } } -void Recombinator::patern1(GRegion* gr){ +void Recombinator::pattern1(GRegion* gr){ size_t i; int index; double quality; @@ -449,7 +449,7 @@ void Recombinator::patern1(GRegion* gr){ } } -void Recombinator::patern2(GRegion* gr){ +void Recombinator::pattern2(GRegion* gr){ size_t i; int index1,index2,index3,index4; double quality; @@ -497,7 +497,7 @@ void Recombinator::patern2(GRegion* gr){ } } -void Recombinator::patern3(GRegion* gr){ +void Recombinator::pattern3(GRegion* gr){ size_t i; int index1,index2,index3,index4; bool c1,c2,c3,c4,c5; @@ -2352,8 +2352,8 @@ void Supplementary::execute(GRegion* gr){ printf("connectivity\n"); potential.clear(); - patern(gr); - printf("patern\n"); + pattern(gr); + printf("pattern\n"); hash_tableA.clear(); hash_tableB.clear(); @@ -2424,7 +2424,7 @@ void Supplementary::init_markings(GRegion* gr){ } } -void Supplementary::patern(GRegion* gr){ +void Supplementary::pattern(GRegion* gr){ size_t i; int j,k; double quality; @@ -3876,7 +3876,7 @@ void PostOp::pyramids1(MVertex* a,MVertex* b,MVertex* c,MVertex* d,GRegion* gr){ for(it=bin2.begin();it!=bin2.end();it++){ bin.insert(*it); } - + if(bin.size()==2){ it = bin.begin(); it1 = markings.find(*it); diff --git a/Mesh/yamakawa.h b/Mesh/yamakawa.h index 3738d4d4178f28376b14841963d890bb8154b42d..ed98a41f1d09021fdbe80a278a55c87c2e7f50b7 100755 --- a/Mesh/yamakawa.h +++ b/Mesh/yamakawa.h @@ -111,9 +111,9 @@ class Recombinator{ void execute(GRegion*); void init_markings(GRegion*); - void patern1(GRegion*); - void patern2(GRegion*); - void patern3(GRegion*); + void pattern1(GRegion*); + void pattern2(GRegion*); + void pattern3(GRegion*); void merge(GRegion*); void improved_merge(GRegion*); void rearrange(GRegion*); @@ -218,7 +218,7 @@ class Supplementary{ void execute(GRegion*); void init_markings(GRegion*); - void patern(GRegion*); + void pattern(GRegion*); void merge(GRegion*); void rearrange(GRegion*); void statistics(GRegion*);