Changeset 21822

Timestamp:

07/19/17 13:50:16 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed leak in amr

Location:

issm/trunk-jpl/src/c/classes

Files:

• AmrBamg.cpp (modified) (1 diff)
• FemModel.cpp (modified) (3 diffs)

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

@@ -32 +32 @@
         this->options->gradation         = 1.5;
         this->options->Hessiantype       = 0;
-        this->options->MaxCornerAngle    = 10;
+        this->options->MaxCornerAngle    = 1.e-12;
         this->options->maxnbv            = 1e6;
         this->options->maxsubdiv         = 10;

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

@@ -4309 +4309 @@
         /*Get vector to create metric*/
         int numberofvertices = this->vertices->NumberOfVertices();
-        Vector<IssmDouble> *vector = new Vector<IssmDouble>(numberofvertices);
+        Vector<IssmDouble> *vector = NULL;
         GetVectorFromInputsx(&vector,this,this->amrbamg->fieldenum,VertexSIdEnum);
         vector->Assemble();
@@ -4319 +4319 @@
                 if(newnumberofvertices<=0 || newnumberofelements<=0) _error_("Error in the refinement process.");
         }
-        else{
+
+        xDelete<IssmDouble>(vector_serial);
+
+        /*Send new mesh to others CPU*/
+        ISSM_MPI_Bcast(&newnumberofvertices,1,ISSM_MPI_INT,0,IssmComm::GetComm());
+        ISSM_MPI_Bcast(&newnumberofelements,1,ISSM_MPI_INT,0,IssmComm::GetComm());
+        if(my_rank){
                 newx=xNew<IssmDouble>(newnumberofvertices);
                 newy=xNew<IssmDouble>(newnumberofvertices);
@@ -4325 +4331 @@
                 newelementslist=xNew<int>(newnumberofelements*this->GetElementsWidth());
         }
-        xDelete<IssmDouble>(vector_serial);
-
-        /*Send new mesh to others CPU*/
-        ISSM_MPI_Bcast(&newnumberofvertices,1,ISSM_MPI_INT,0,IssmComm::GetComm());
-        ISSM_MPI_Bcast(&newnumberofelements,1,ISSM_MPI_INT,0,IssmComm::GetComm());
         ISSM_MPI_Bcast(newx,newnumberofvertices,ISSM_MPI_DOUBLE,0,IssmComm::GetComm()); 
         ISSM_MPI_Bcast(newy,newnumberofvertices,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());