Changeset 21832

Timestamp:

07/20/17 20:04:30 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed destructor of FemModel with amr

File:

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

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

@@ -82 +82 @@
    /*AMR stuff*/
         this->parameters->FindParam(&amr_frequency,TransientAmrFrequencyEnum);
+        #ifdef _HAVE_NEOPZ_
+        this->amr = NULL;
+        #endif
+        #ifdef _HAVE_BAMG_
+        this->amrbamg = NULL;
+        #endif
         if(amr_frequency){
                 this->parameters->FindParam(&amrtype,AmrTypeEnum);
@@ -121 +127 @@
         this->InitFromFiles(rootpath,inputfilename,outputfilename,toolkitsfilename,lockfilename,restartfilename, solution_type,traceon,X);
         profiler->Tag(FINISHINIT);
+
+        #ifdef _HAVE_NEOPZ_
+        this->amr = NULL;
+        #endif
+        #ifdef _HAVE_BAMG_
+        this->amrbamg = NULL;
+        #endif
         
         /*Save communicator in the parameters dataset: */
@@ -288 +301 @@
                 ConfigureObjectsx(output->elements,output->loads,output->nodes,output->vertices,output->materials,output->parameters);
         }
+
+        /*AMR, no copy for now*/
+        #ifdef _HAVE_NEOPZ_
+        this->amr = NULL;
+        #endif
+        #ifdef _HAVE_BAMG_
+        this->amrbamg = NULL;
+        #endif
 
         /*Reset current configuration: */