Changeset 12465 for issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp

Timestamp:

06/19/12 15:01:19 (13 years ago)

Author:

utke

Message:

all type renamed to passive b/c this is suppose to be output only

File:

• issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp (modified) (5 diffs)

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

@@ -26 +26 @@
 }
 /*}}}*/
-/*FUNCTION DoubleMatExternalResult::DoubleMatExternalResult(int in_id, int enum_type,IssmDoubleMat values,int M,int N,int in_step,double in_time){{{*/
-DoubleMatExternalResult::DoubleMatExternalResult(int in_id, int in_enum_type,double* in_values, int in_M,int in_N,int in_step,double in_time){
+/*FUNCTION DoubleMatExternalResult::DoubleMatExternalResult(int in_id, int enum_type,IssmDoubleMat values,int M,int N,int in_step,IssmPDouble in_time){{{*/
+DoubleMatExternalResult::DoubleMatExternalResult(int in_id, int in_enum_type,IssmPDouble* in_values, int in_M,int in_N,int in_step,IssmPDouble in_time){
 
         id=in_id;
@@ -36 +36 @@
         /*Copy result in values*/
         if(M*N){
-                values=xNew<double>(M*N);
-                memcpy(values,in_values,M*N*sizeof(double));
+                values=xNew<IssmPDouble>(M*N);
+                xMemCpy<IssmPDouble>(values,in_values,M*N);
         }
         else values=NULL;
@@ -48 +48 @@
 DoubleMatExternalResult::~DoubleMatExternalResult(){
 
-        xDelete<double>(this->values);
+        xDelete<IssmPDouble>(this->values);
         return;
 }
@@ -134 +134 @@
 
         /*Now write time and step: */
-        fwrite(&time,sizeof(double),1,fid);
+        fwrite(&time,sizeof(IssmPDouble),1,fid);
         fwrite(&step,sizeof(int),1,fid);
 
-        /*writing a double array, type is 3:*/
+        /*writing a IssmPDouble array, type is 3:*/
         type=3;
         fwrite(&type,sizeof(int),1,fid);
@@ -144 +144 @@
         cols=this->N;
         fwrite(&cols,sizeof(int),1,fid);
-        fwrite(this->values,cols*rows*sizeof(double),1,fid);
+        fwrite(this->values,cols*rows*sizeof(IssmPDouble),1,fid);
 
 }