Changeset 12465
- Timestamp:
- 06/19/12 15:01:19 (13 years ago)
- Location:
- issm/trunk-jpl/src/c/objects/ExternalResults
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.cpp
r12456 r12465 27 27 /*}}}*/ 28 28 /*FUNCTION BoolExternalResult::BoolExternalResult(int enum_type,bool value){{{*/ 29 BoolExternalResult::BoolExternalResult(int in_id, int in_enum_type,bool in_value,int in_step, double in_time){29 BoolExternalResult::BoolExternalResult(int in_id, int in_enum_type,bool in_value,int in_step, IssmPDouble in_time){ 30 30 31 31 id=in_id; … … 90 90 int type; 91 91 int size; 92 double boolean;92 IssmPDouble boolean; 93 93 extern int my_rank; 94 94 char* name = NULL; … … 105 105 106 106 /*Now write time and step: */ 107 fwrite(&time,sizeof( double),1,fid);107 fwrite(&time,sizeof(IssmPDouble),1,fid); 108 108 fwrite(&step,sizeof(int),1,fid); 109 109 110 110 /*Now write bool, after casting it: */ 111 boolean=( double)this->value;111 boolean=(IssmPDouble)this->value; 112 112 113 /*writing a double, type is 1, size is 1: */113 /*writing a IssmPDouble, type is 1, size is 1: */ 114 114 type=1; 115 115 size=1; 116 116 fwrite(&type,sizeof(int),1,fid); 117 117 fwrite(&size,sizeof(int),1,fid); 118 fwrite(&boolean,size*sizeof( double),1,fid);118 fwrite(&boolean,size*sizeof(IssmPDouble),1,fid); 119 119 120 120 } -
issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.h
r12365 r12465 30 30 bool value; 31 31 int step; 32 double time;32 IssmPDouble time; 33 33 34 34 /*BoolExternalResult constructors, destructors: {{{*/ 35 35 BoolExternalResult(); 36 BoolExternalResult(int id, int enum_type,bool value,int step, double time);36 BoolExternalResult(int id, int enum_type,bool value,int step,IssmPDouble time); 37 37 ~BoolExternalResult(); 38 38 /*}}}*/ -
issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.cpp
r12456 r12465 26 26 } 27 27 /*}}}*/ 28 /*FUNCTION DoubleExternalResult::DoubleExternalResult(int enum_type, double value){{{*/29 DoubleExternalResult::DoubleExternalResult(int in_id, int in_enum_type, double in_value,int in_step, double in_time){28 /*FUNCTION DoubleExternalResult::DoubleExternalResult(int enum_type,IssmPDouble value){{{*/ 29 DoubleExternalResult::DoubleExternalResult(int in_id, int in_enum_type,IssmPDouble in_value,int in_step, IssmPDouble in_time){ 30 30 31 31 id=in_id; … … 104 104 105 105 /*Now write time and step: */ 106 fwrite(&time,sizeof( double),1,fid);106 fwrite(&time,sizeof(IssmPDouble),1,fid); 107 107 fwrite(&step,sizeof(int),1,fid); 108 108 109 /*writing a double, type is 1, size is 1: */109 /*writing a IssmPDouble, type is 1, size is 1: */ 110 110 type=1; 111 111 size=1; 112 112 fwrite(&type,sizeof(int),1,fid); 113 113 fwrite(&size,sizeof(int),1,fid); 114 fwrite(&this->value,size*sizeof( double),1,fid);114 fwrite(&this->value,size*sizeof(IssmPDouble),1,fid); 115 115 116 116 } -
issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.h
r12365 r12465 29 29 int id; 30 30 int enum_type; 31 double value;31 IssmPDouble value; 32 32 int step; 33 double time;33 IssmPDouble time; 34 34 35 35 36 36 /*DoubleExternalResult constructors, destructors: {{{*/ 37 37 DoubleExternalResult(); 38 DoubleExternalResult(int id,int enum_type, double value,int step,double time);38 DoubleExternalResult(int id,int enum_type,IssmPDouble value,int step,IssmPDouble time); 39 39 ~DoubleExternalResult(); 40 40 /*}}}*/ -
issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp
r12456 r12465 26 26 } 27 27 /*}}}*/ 28 /*FUNCTION DoubleMatExternalResult::DoubleMatExternalResult(int in_id, int enum_type,IssmDoubleMat values,int M,int N,int in_step, double in_time){{{*/29 DoubleMatExternalResult::DoubleMatExternalResult(int in_id, int in_enum_type, double* in_values, int in_M,int in_N,int in_step,double in_time){28 /*FUNCTION DoubleMatExternalResult::DoubleMatExternalResult(int in_id, int enum_type,IssmDoubleMat values,int M,int N,int in_step,IssmPDouble in_time){{{*/ 29 DoubleMatExternalResult::DoubleMatExternalResult(int in_id, int in_enum_type,IssmPDouble* in_values, int in_M,int in_N,int in_step,IssmPDouble in_time){ 30 30 31 31 id=in_id; … … 36 36 /*Copy result in values*/ 37 37 if(M*N){ 38 values=xNew< double>(M*N);39 memcpy(values,in_values,M*N*sizeof(double));38 values=xNew<IssmPDouble>(M*N); 39 xMemCpy<IssmPDouble>(values,in_values,M*N); 40 40 } 41 41 else values=NULL; … … 48 48 DoubleMatExternalResult::~DoubleMatExternalResult(){ 49 49 50 xDelete< double>(this->values);50 xDelete<IssmPDouble>(this->values); 51 51 return; 52 52 } … … 134 134 135 135 /*Now write time and step: */ 136 fwrite(&time,sizeof( double),1,fid);136 fwrite(&time,sizeof(IssmPDouble),1,fid); 137 137 fwrite(&step,sizeof(int),1,fid); 138 138 139 /*writing a double array, type is 3:*/139 /*writing a IssmPDouble array, type is 3:*/ 140 140 type=3; 141 141 fwrite(&type,sizeof(int),1,fid); … … 144 144 cols=this->N; 145 145 fwrite(&cols,sizeof(int),1,fid); 146 fwrite(this->values,cols*rows*sizeof( double),1,fid);146 fwrite(this->values,cols*rows*sizeof(IssmPDouble),1,fid); 147 147 148 148 } -
issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.h
r12365 r12465 27 27 int id; 28 28 int enum_type; 29 double* values;29 IssmPDouble* values; 30 30 int M; 31 31 int N; 32 32 int step; 33 double time;33 IssmPDouble time; 34 34 35 35 public: 36 36 /*DoubleMatExternalResult constructors, destructors: {{{*/ 37 37 DoubleMatExternalResult(); 38 DoubleMatExternalResult(int id,int enum_type, double* values,int M,int N,int step, double time);38 DoubleMatExternalResult(int id,int enum_type,IssmPDouble* values,int M,int N,int step, IssmPDouble time); 39 39 ~DoubleMatExternalResult(); 40 40 /*}}}*/ -
issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp
r12456 r12465 26 26 } 27 27 /*}}}*/ 28 /*FUNCTION DoubleVecExternalResult::DoubleVecExternalResult(int enum_type,IssmDoubleVec values,int M,int in_step, double in_time){{{*/29 DoubleVecExternalResult::DoubleVecExternalResult(int in_id, int in_enum_type, double* in_values, int in_M,int in_step,double in_time){28 /*FUNCTION DoubleVecExternalResult::DoubleVecExternalResult(int enum_type,IssmDoubleVec values,int M,int in_step,IssmPDouble in_time){{{*/ 29 DoubleVecExternalResult::DoubleVecExternalResult(int in_id, int in_enum_type,IssmPDouble* in_values, int in_M,int in_step,IssmPDouble in_time){ 30 30 31 31 id=in_id; … … 34 34 35 35 if(M){ 36 values=xNew< double>(M);37 memcpy(values,in_values,M*sizeof(double));36 values=xNew<IssmPDouble>(M); 37 xMemCpy<IssmPDouble>(values,in_values,M); 38 38 } 39 39 else values=NULL; … … 45 45 /*FUNCTION DoubleVecExternalResult::~DoubleVecExternalResult(){{{*/ 46 46 DoubleVecExternalResult::~DoubleVecExternalResult(){ 47 xDelete< double>(values);47 xDelete<IssmPDouble>(values); 48 48 return; 49 49 } … … 123 123 124 124 /*Now write time and step: */ 125 fwrite(&time,sizeof( double),1,fid);125 fwrite(&time,sizeof(IssmPDouble),1,fid); 126 126 fwrite(&step,sizeof(int),1,fid); 127 127 128 /*writing a double, type is 1, size is 1: */128 /*writing a IssmPDouble, type is 1, size is 1: */ 129 129 type=1; 130 130 size=this->M; 131 131 fwrite(&type,sizeof(int),1,fid); 132 132 fwrite(&size,sizeof(int),1,fid); 133 fwrite(this->values,size*sizeof( double),1,fid);133 fwrite(this->values,size*sizeof(IssmPDouble),1,fid); 134 134 135 135 } -
issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.h
r12365 r12465 27 27 int id; 28 28 int enum_type; 29 double* values;29 IssmPDouble* values; 30 30 int M; 31 31 int step; 32 double time;32 IssmPDouble time; 33 33 34 34 public: 35 35 /*DoubleVecExternalResult constructors, destructors: {{{*/ 36 36 DoubleVecExternalResult(); 37 DoubleVecExternalResult(int id,int enum_type, double* values,int M,int step, double time);37 DoubleVecExternalResult(int id,int enum_type,IssmPDouble* values,int M,int step, IssmPDouble time); 38 38 ~DoubleVecExternalResult(); 39 39 /*}}}*/ -
issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.cpp
r12456 r12465 26 26 } 27 27 /*}}}*/ 28 /*FUNCTION IntExternalResult::IntExternalResult(int in_id, int in_enum_type,int in_value,int in_step, double in_time){{{*/29 IntExternalResult::IntExternalResult(int in_id, int in_enum_type,int in_value,int in_step, double in_time){28 /*FUNCTION IntExternalResult::IntExternalResult(int in_id, int in_enum_type,int in_value,int in_step, IssmPDouble in_time){{{*/ 29 IntExternalResult::IntExternalResult(int in_id, int in_enum_type,int in_value,int in_step, IssmPDouble in_time){ 30 30 31 31 id=in_id; … … 91 91 int size; 92 92 char *name = NULL; 93 double integer;93 IssmPDouble integer; 94 94 extern int my_rank; 95 95 … … 105 105 106 106 /*Now write time and step: */ 107 fwrite(&time,sizeof( double),1,fid);107 fwrite(&time,sizeof(IssmPDouble),1,fid); 108 108 fwrite(&step,sizeof(int),1,fid); 109 109 110 /*cast to a double: */111 integer=( double)this->value;110 /*cast to a IssmPDouble: */ 111 integer=(IssmPDouble)this->value; 112 112 113 /*writing a double, type is 1, size is 1: */113 /*writing a IssmPDouble, type is 1, size is 1: */ 114 114 type=1; 115 115 size=1; 116 116 fwrite(&type,sizeof(int),1,fid); 117 117 fwrite(&size,sizeof(int),1,fid); 118 fwrite(&integer,size*sizeof( double),1,fid);118 fwrite(&integer,size*sizeof(IssmPDouble),1,fid); 119 119 120 120 } -
issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.h
r12365 r12465 28 28 int value; 29 29 int step; 30 double time;30 IssmPDouble time; 31 31 32 32 33 33 /*IntExternalResult constructors, destructors: {{{*/ 34 34 IntExternalResult(); 35 IntExternalResult(int id,int enum_type,int value,int step, double time);35 IntExternalResult(int id,int enum_type,int value,int step,IssmPDouble time); 36 36 ~IntExternalResult(); 37 37 -
issm/trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.cpp
r12456 r12465 27 27 /*}}}*/ 28 28 /*FUNCTION PetscVecExternalResult::PetscVecExternalResult(int enum_type,IssmPetscVec value){{{*/ 29 PetscVecExternalResult::PetscVecExternalResult(int in_id, int in_enum_type,Vector* in_value,int in_step, double in_time){29 PetscVecExternalResult::PetscVecExternalResult(int in_id, int in_enum_type,Vector* in_value,int in_step, IssmPDouble in_time){ 30 30 31 31 id=in_id; … … 103 103 int size; 104 104 char *name = NULL; 105 double *serialvec = NULL;105 IssmPDouble *serialvec = NULL; 106 106 extern int my_rank; 107 107 … … 121 121 122 122 /*Now write time and step: */ 123 fwrite(&time,sizeof( double),1,fid);123 fwrite(&time,sizeof(IssmPDouble),1,fid); 124 124 fwrite(&step,sizeof(int),1,fid); 125 125 126 /*writing a double, type is 1, size is 1: */126 /*writing a IssmPDouble, type is 1, size is 1: */ 127 127 type=1; 128 128 129 129 fwrite(&type,sizeof(int),1,fid); 130 130 fwrite(&size,sizeof(int),1,fid); 131 fwrite(serialvec,size*sizeof( double),1,fid);131 fwrite(serialvec,size*sizeof(IssmPDouble),1,fid); 132 132 133 133 /*Free ressources:*/ -
issm/trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.h
r12365 r12465 30 30 Vector* value; 31 31 int step; 32 double time;32 IssmPDouble time; 33 33 34 34 public: 35 35 /*PetscVecExternalResult constructors, destructors: {{{*/ 36 36 PetscVecExternalResult(); 37 PetscVecExternalResult(int id,int enum_type,Vector* value, int step, double time);37 PetscVecExternalResult(int id,int enum_type,Vector* value, int step, IssmPDouble time); 38 38 ~PetscVecExternalResult(); 39 39 /*}}}*/ -
issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.cpp
r12456 r12465 27 27 /*}}}*/ 28 28 /*FUNCTION StringExternalResult::StringExternalResult(int enum_type,IssmString value){{{*/ 29 StringExternalResult::StringExternalResult(int in_id, int in_enum_type,char* in_value,int in_step, double in_time){29 StringExternalResult::StringExternalResult(int in_id, int in_enum_type,char* in_value,int in_step, IssmPDouble in_time){ 30 30 31 31 id=in_id; 32 32 enum_type=in_enum_type; 33 33 value=xNew<char>(strlen(in_value)+1); 34 memcpy(value,in_value,(strlen(in_value)+1)*sizeof(char)); 35 34 xMemCpy<char>(value,in_value,(strlen(in_value)+1)); 36 35 step=in_step; 37 36 time=in_time; … … 106 105 107 106 /*Now write time and step: */ 108 fwrite(&time,sizeof( double),1,fid);107 fwrite(&time,sizeof(IssmPDouble),1,fid); 109 108 fwrite(&step,sizeof(int),1,fid); 110 109 -
issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.h
r12365 r12465 30 30 char* value; 31 31 int step; 32 double time;32 IssmPDouble time; 33 33 34 34 public: 35 35 /*StringExternalResult constructors, destructors: {{{*/ 36 36 StringExternalResult(); 37 StringExternalResult(int id,int enum_type,char* value,int step, double time);37 StringExternalResult(int id,int enum_type,char* value,int step, IssmPDouble time); 38 38 ~StringExternalResult(); 39 39 /*}}}*/
Note:
See TracChangeset
for help on using the changeset viewer.