Changeset 22116

Timestamp:

09/20/17 06:29:26 (8 years ago)

Author:

tsantos

Message:

CHG: changed threshold limit for the error estimators (AMR with Bamg)

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (5 diffs)

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

@@ -4601 +4601 @@
         /*Intermediaries*/
         int numberofelements                            = this->elements->NumberOfElements();
-        int numberofvertices                            = this->vertices->NumberOfVertices();
         IssmDouble* error_elements              = NULL;
-        IssmDouble* error_vertices              = NULL;
         IssmDouble *x                                           = NULL;
         IssmDouble *y                                           = NULL;
@@ -4609 +4607 @@
         int *index                                                      = NULL;
         IssmDouble maxerror,threshold,resolution;
+        int vid;
         
         switch(errorestimator_type){
@@ -4629 +4628 @@
         this->GetMesh(this->vertices,this->elements,&x,&y,&z,&index);
 
-        /*Sum the estimators over the vertices*/
-        error_vertices=xNewZeroInit<IssmDouble>(numberofvertices);
-        for(int i=0;i<numberofelements;i++){
-                for(int j=0;j<this->GetElementsWidth();j++){
-                        int vid=index[i*this->GetElementsWidth()+j]-1;//Matlab to C indexing
-                        error_vertices[vid]+=error_elements[i];
-                }
-        }
-
         /*Find the max of the estimators (use error_elements)*/
         maxerror=error_elements[0];
@@ -4643 +4633 @@
         
         /*Fill hmaxvertices*/
-        for(int i=0;i<numberofvertices;i++){
-                if(error_vertices[i]>threshold*maxerror){
-                        if(xIsNan<IssmDouble>(hmaxvertices[i])) hmaxvertices[i]=resolution;
-                        else  hmaxvertices[i]=min(resolution,hmaxvertices[i]);
+        for(int i=0;i<numberofelements;i++){
+                if(error_elements[i]>threshold*maxerror){
+                        /*ok, fill the hmaxvertices using the element vertices*/
+                        for(int j=0;j<this->GetElementsWidth();j++){
+                                vid=index[i*this->GetElementsWidth()+j]-1;//Matlab to C indexing
+                                if(xIsNan<IssmDouble>(hmaxvertices[vid])) hmaxvertices[vid]=resolution;
+                                else hmaxvertices[vid]=min(resolution,hmaxvertices[vid]);
+                        }
                 }
         }
@@ -4656 +4650 @@
         xDelete<int>(index);
    xDelete<IssmDouble>(error_elements);
-   xDelete<IssmDouble>(error_vertices);
 }
 /*}}}*/