Changeset 21540

Timestamp:

02/09/17 17:55:28 (8 years ago)

Author:

tsantos

Message:

CHG: changes in AMR methods, minor. (NOTE: AMR not working yet)

Location:

issm/trunk-jpl/src/c/classes

Files:

• AdaptiveMeshRefinement.cpp (modified) (6 diffs)
• FemModel.cpp (modified) (5 diffs)
• FemModel.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/AdaptiveMeshRefinement.cpp

@@ -180 +180 @@
     /*Verify the new geometry*/
     this->CheckMesh(nvertices,nelements,nsegments,this->elementswidth,px,py,pz,pelements,psegments);
-     
+
+         _printf_("\trefinement process done!\n\n");
+
     delete nohangingnodesmesh;
 }
@@ -187 +189 @@
     
     /*Refine mesh hmax times*/
-    for(int hlevel=1;hlevel<=this->hmax;hlevel++){
+   _printf_("\n\trefinement process (hmax = " << this->hmax << ")\n");
+        _printf_("\tprogress:  ");
+        for(int hlevel=1;hlevel<=this->hmax;hlevel++){
         
         /*Set elements to be refined using some criteria*/
@@ -195 +199 @@
         /*Refine the mesh*/
         this->RefineMesh(gmesh, ElemVec);
-    }
-    
+                  
+                  _printf_("*  ");
+    }
+    _printf_("\n");
 }
 /*}}}*/
@@ -235 +241 @@
 /*}}}*/
 void AdaptiveMeshRefinement::RefineMeshToAvoidHangingNodes(TPZGeoMesh *gmesh){/*{{{*/
-    
+   
+         _printf_("\trefine to avoid hanging nodes...\n");
     /*Refine elements to avoid hanging nodes: non-uniform refinement*/
          const int NElem = gmesh->NElements();
@@ -389 +396 @@
     
     // itapopo inserir modo de encontrar criterio TESTING!!!! Come to false!
-         if(true) this->TagAllElements(gmesh,ElemVec); //uniform, refine all elements!
+         if(false) this->TagAllElements(gmesh,ElemVec); //uniform, refine all elements!
 
     /* Adaptive refinement. This refines some elements following some criteria*/
-    //this->TagElementsNearGroundingLine(gmesh, GLvec, hlevel, ElemVec);
+    this->TagElementsNearGroundingLine(gmesh, GLvec, hlevel, ElemVec);
 
 }
@@ -410 +417 @@
     
     /* Tag elements near grounding line */
-    double MaxRegion = 20000.; //itapopo
-    double alpha = 1.0;         //itapopo
+    double MaxRegion = 40000.; //itapopo
+    double alpha = log(1.5);         //itapopo
     double MaxDistance = MaxRegion / std::exp(alpha*(hlevel-1));
     

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -2942 +2942 @@
    if(my_rank==0){ 
                 this->amr = new AdaptiveMeshRefinement();
-                int hmax         = 0; //itapopo: it must be defined by interface. Using 2 just to test
+                int hmax         = 3; //itapopo: it must be defined by interface. Using 2 just to test
                 this->amr->SetHMax(hmax); //Set max level of refinement
                 this->amr->CreateInitialMesh(numberofvertices,numberofelements,numberofsegments,elementswidth,x,y,z,elements,NULL);
@@ -3299 +3299 @@
         
         /*Solutions which will be used to refine the elements*/
-        this->GetMaskLevelSet(&masklevelset);//itapopo verificar se já existe um método igual a esse
-        
+        this->GetGroundediceLevelSet(&masklevelset);//itapopo verificar se já existe um método igual a esse
+
         if(my_rank==0){
                 int type_process=1; //1: it refines father mesh. See AdaptiveMeshRefinement.h (.cpp)
@@ -3334 +3334 @@
 }
 /*}}}*/
-void FemModel::GetMaskLevelSet(IssmDouble **pmasklevelset){/*{{{*/
+void FemModel::GetGroundediceLevelSet(IssmDouble **pmasklevelset){/*{{{*/
 
         int elementswidth               = this->GetElementsWidth();//just 2D mesh, tria elements
@@ -3346 +3346 @@
         for(int i=0;i<this->elements->Size();i++){
                 Element* element=xDynamicCast<Element*>(this->elements->GetObjectByOffset(i));
-                element->GetInputListOnVertices(elementlevelset,MaskIceLevelsetEnum);
+                element->GetInputListOnVertices(elementlevelset,MaskGroundediceLevelsetEnum);
                 element->GetVerticesSidList(elem_vertices);
                 vmasklevelset->SetValue(elem_vertices[0],elementlevelset[0],INS_VAL);
@@ -3580 +3580 @@
 
         /*Get x and y of the mesh i-1*/
-        int my_rank                                             = IssmComm::GetRank();
         int numberofvertices                    = this->vertices->NumberOfVertices();
         int numberofelements                    = this->elements->NumberOfElements();

issm/trunk-jpl/src/c/classes/FemModel.h

@@ -152 +152 @@
                 int GetElementsWidth(){return 3;};//just tria elements in this first version
                 void ExecuteRefinement(int &numberofvertices,int &numberofelements,IssmDouble** px,IssmDouble** py,IssmDouble** pz,int** pelementslist);
-                void GetMaskLevelSet(IssmDouble** pmasklevelset);
+                void GetGroundediceLevelSet(IssmDouble** pmasklevelset);
                 void CreateVertices(int newnumberofvertices,int newnumberofelements,int elementswidth,int* newelementslist,int* my_vertices,IssmDouble* newx,IssmDouble* newy,IssmDouble* newz,Vertices* vertices);
                 void CreateElements(int newnumberofelements,int elementswidth,int* newelementslist,bool* my_elements,Elements* elements);