Changeset 3395

Timestamp:

04/05/10 11:32:55 (15 years ago)

Author:

seroussi

Message:

ElementProperties: fixed problem in Marshall

File:

• issm/trunk/src/c/objects/ElementProperties.cpp (modified) (7 diffs)

issm/trunk/src/c/objects/ElementProperties.cpp

@@ -177 +177 @@
                 memcpy(marshalled_dataset,this->h,this->numnodes*sizeof(double));marshalled_dataset+=this->numnodes*sizeof(double);
         }
-        else memcpy(marshalled_dataset,&nill,sizeof(nill));marshalled_dataset+=sizeof(nill); 
+        else{ memcpy(marshalled_dataset,&nill,sizeof(nill));marshalled_dataset+=sizeof(nill); }
 
         if(this->s){
@@ -183 +183 @@
                 memcpy(marshalled_dataset,this->s,this->numnodes*sizeof(double));marshalled_dataset+=this->numnodes*sizeof(double);
         }
-        else memcpy(marshalled_dataset,&nill,sizeof(nill));marshalled_dataset+=sizeof(nill); 
+        else{ memcpy(marshalled_dataset,&nill,sizeof(nill));marshalled_dataset+=sizeof(nill); }
 
         if(this->b){
@@ -189 +189 @@
                 memcpy(marshalled_dataset,this->b,this->numnodes*sizeof(double));marshalled_dataset+=this->numnodes*sizeof(double);
         }
-        else memcpy(marshalled_dataset,&nill,sizeof(nill));marshalled_dataset+=sizeof(nill); 
+        else{ memcpy(marshalled_dataset,&nill,sizeof(nill));marshalled_dataset+=sizeof(nill); }
 
         if(this->k){
@@ -195 +195 @@
                 memcpy(marshalled_dataset,this->k,this->numnodes*sizeof(double));marshalled_dataset+=this->numnodes*sizeof(double);
         }
-        else memcpy(marshalled_dataset,&nill,sizeof(nill));marshalled_dataset+=sizeof(nill); 
+        else{ memcpy(marshalled_dataset,&nill,sizeof(nill));marshalled_dataset+=sizeof(nill); }
 
         if(this->melting){
@@ -201 +201 @@
                 memcpy(marshalled_dataset,this->melting,this->numnodes*sizeof(double));marshalled_dataset+=this->numnodes*sizeof(double);
         }
-        else memcpy(marshalled_dataset,&nill,sizeof(nill));marshalled_dataset+=sizeof(nill); 
+        else{ memcpy(marshalled_dataset,&nill,sizeof(nill));marshalled_dataset+=sizeof(nill); }
 
         if(this->accumulation){
@@ -207 +207 @@
                 memcpy(marshalled_dataset,this->accumulation,this->numnodes*sizeof(double));marshalled_dataset+=this->numnodes*sizeof(double);
         }
-        else memcpy(marshalled_dataset,&nill,sizeof(nill));marshalled_dataset+=sizeof(nill); 
+        else{ memcpy(marshalled_dataset,&nill,sizeof(nill));marshalled_dataset+=sizeof(nill); }
 
 
@@ -214 +214 @@
                 memcpy(marshalled_dataset,this->geothermalflux,this->numnodes*sizeof(double));marshalled_dataset+=this->numnodes*sizeof(double);
         }
-        else memcpy(marshalled_dataset,&nill,sizeof(nill));marshalled_dataset+=sizeof(nill); 
+        else{ memcpy(marshalled_dataset,&nill,sizeof(nill));marshalled_dataset+=sizeof(nill); }
 
         memcpy(marshalled_dataset,&friction_type,sizeof(friction_type));marshalled_dataset+=sizeof(friction_type);