Changeset 4195

Timestamp:

06/24/10 14:22:57 (15 years ago)

Author:

Eric.Larour

Message:

Some constructor and destructor problems with external results + patch mpi gather bug fix

Location:

issm/trunk/src/c

Files:

• modules/OutputResultsx/ElementResultsToPatch.cpp (modified) (1 diff)
• objects/ExternalResults/DoubleMatExternalResult.cpp (modified) (2 diffs)
• objects/ExternalResults/DoubleVecExternalResult.cpp (modified) (1 diff)
• objects/ExternalResults/PetscVecExternalResult.cpp (modified) (1 diff)

issm/trunk/src/c/modules/OutputResultsx/ElementResultsToPatch.cpp

@@ -94 +94 @@
         patch->MPI_Gather();
 
-        /*create Result object and add to results dataset: */
+        /*create result object and add to results dataset: */
         results->AddObject(new DoubleMatExternalResult(results->Size()+1,PatchEnum,patch->values,patch->numrows,patch->numcols,1,0));
 

issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp

@@ -35 +35 @@
 
         /*Copy result in values*/
-        if (M*N==0) ISSMERROR("result of enum %s has a size %ix%i and con not be allocated",EnumAsString(in_enum_type),in_M,in_N);
-        values=(double*)xmalloc(M*N*sizeof(double));
-        memcpy(values,in_values,M*N*sizeof(double));
+        if(M*N){
+                values=(double*)xmalloc(M*N*sizeof(double));
+                memcpy(values,in_values,M*N*sizeof(double));
+        }
+        else values=NULL;
 
         step=in_step;
@@ -45 +47 @@
 /*FUNCTION DoubleMatExternalResult::~DoubleMatExternalResult(){{{1*/
 DoubleMatExternalResult::~DoubleMatExternalResult(){
-        xfree((void**)&values);
+
+        xfree((void**)&this->values);
         return;
 }

issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp

@@ -33 +33 @@
         M=in_M;
 
-        values=(double*)xmalloc(M*sizeof(double));
-        memcpy(values,in_values,M*sizeof(double));
+        if(M){
+                values=(double*)xmalloc(M*sizeof(double));
+                memcpy(values,in_values,M*sizeof(double));
+        }
+        else values=NULL;
 
         step=in_step;

issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.cpp

@@ -38 +38 @@
                 VecCopy(in_value,value);
         }
+        else value=NULL;
+
         step=in_step;
         time=in_time;