Changeset 12560
- Timestamp:
- 06/26/12 11:59:35 (13 years ago)
- Location:
- issm/trunk-jpl/src/c/objects/ElementResults
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.h
r12463 r12560 21 21 bool value; 22 22 int step; 23 Issm Double time;23 IssmPDouble time; 24 24 25 25 public: … … 40 40 /*ElementResult virtual functions definitions: {{{*/ 41 41 ElementResult* SpawnTriaElementResult(int* indices); 42 Issm Double GetTime(void){return time;};42 IssmPDouble GetTime(void){return time;}; 43 43 int GetStep(void){return step;}; 44 44 void ProcessUnits(Parameters* parameters); -
issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.cpp
r12511 r12560 28 28 29 29 enum_type=in_enum_type; 30 value= in_value;30 value=reCast<IssmPDouble>(in_value); 31 31 step=in_step; 32 time= in_time;32 time=reCast<IssmPDouble>(in_time); 33 33 } 34 34 /*}}}*/ -
issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.h
r12494 r12560 1 1 /*! \file DoubleElementResult.h 2 * \brief: header file for Issm Double result object3 * A Issm Double result object is just derived from a DoubleInput object, with additional time and step information.2 * \brief: header file for IssmPDouble result object 3 * A IssmPDouble result object is just derived from a DoubleInput object, with additional time and step information. 4 4 */ 5 5 … … 19 19 private: 20 20 int enum_type; 21 Issm Double value;21 IssmPDouble value; 22 22 int step; 23 Issm Double time;23 IssmPDouble time; 24 24 25 25 public: … … 40 40 /*ElementResult virtual functions definitions: {{{*/ 41 41 ElementResult* SpawnTriaElementResult(int* indices); 42 Issm Double GetTime(void){return time;};42 IssmPDouble GetTime(void){return time;}; 43 43 int GetStep(void){return step;}; 44 44 void ProcessUnits(Parameters* parameters); -
issm/trunk-jpl/src/c/objects/ElementResults/ElementResult.h
r12463 r12560 19 19 20 20 virtual ElementResult* SpawnTriaElementResult(int* indices)=0; 21 virtual Issm Double GetTime(void)=0;21 virtual IssmPDouble GetTime(void)=0; 22 22 virtual int GetStep(void)=0; 23 23 virtual void ProcessUnits(Parameters* parameters)=0; -
issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.cpp
r12511 r12560 30 30 31 31 enum_type=in_enum_type; 32 for(i=0;i<6;i++)values[i]= in_values[i];32 for(i=0;i<6;i++)values[i]=reCast<IssmPDouble>(in_values[i]); 33 33 step=in_step; 34 time= in_time;34 time=reCast<IssmPDouble>(in_time); 35 35 } 36 36 /*}}}*/ … … 95 95 /*output*/ 96 96 TriaP1ElementResult* outresult=NULL; 97 Issm Double newvalues[3];97 IssmPDouble newvalues[3]; 98 98 99 99 /*Loop over the new indices*/ … … 140 140 void PentaP1ElementResult::GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs){ 141 141 142 Issm Double data[6];142 IssmPDouble data[6]; 143 143 144 144 if(numdofs!=6)_error2_("Result " << EnumToStringx(this->enum_type) << " is a PentaP1ElementResult and cannot write vector of " << numdofs << " dofs"); 145 for(int i=0;i<6;i++) data[i]=this->values[i]/(Issm Double)connectivitylist[i];145 for(int i=0;i<6;i++) data[i]=this->values[i]/(IssmPDouble)connectivitylist[i]; 146 146 vector->SetValues(numdofs,doflist,&data[0],ADD_VAL); 147 147 -
issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.h
r12463 r12560 18 18 private: 19 19 int enum_type; 20 Issm Double values[6];20 IssmPDouble values[6]; 21 21 int step; 22 Issm Double time;22 IssmPDouble time; 23 23 24 24 public: … … 39 39 /*ElementResult virtual functions definitions: {{{*/ 40 40 ElementResult* SpawnTriaElementResult(int* indices); 41 Issm Double GetTime(void){return time;};41 IssmPDouble GetTime(void){return time;}; 42 42 int GetStep(void){return step;}; 43 43 void ProcessUnits(Parameters* parameters); -
issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp
r12511 r12560 28 28 29 29 enum_type=in_enum_type; 30 values[0]= in_values[0];31 values[1]= in_values[1];32 values[2]= in_values[2];30 values[0]=reCast<IssmPDouble>(in_values[0]); 31 values[1]=reCast<IssmPDouble>(in_values[1]); 32 values[2]=reCast<IssmPDouble>(in_values[2]); 33 33 step=in_step; 34 time= in_time;34 time=reCast<IssmPDouble>(in_time); 35 35 } 36 36 /*}}}*/ … … 128 128 void TriaP1ElementResult::GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs){ 129 129 130 Issm Double data[3];130 IssmPDouble data[3]; 131 131 132 132 if(numdofs!=3)_error2_("Result " << EnumToStringx(this->enum_type) << " is a TriaP1ElementResult and cannot write vector of " << numdofs << " dofs"); 133 for(int i=0;i<3;i++) data[i]=this->values[i]/(Issm Double)connectivitylist[i];133 for(int i=0;i<3;i++) data[i]=this->values[i]/(IssmPDouble)connectivitylist[i]; 134 134 vector->SetValues(numdofs,doflist,&data[0],ADD_VAL); 135 135 -
issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.h
r12463 r12560 17 17 private: 18 18 int enum_type; 19 Issm Double values[3];19 IssmPDouble values[3]; 20 20 int step; 21 Issm Double time;21 IssmPDouble time; 22 22 23 23 public: … … 38 38 /*ElementResult virtual functions definitions: {{{*/ 39 39 ElementResult* SpawnTriaElementResult(int* indices); 40 Issm Double GetTime(void){return time;};40 IssmPDouble GetTime(void){return time;}; 41 41 int GetStep(void){return step;}; 42 42 void ProcessUnits(Parameters* parameters);
Note:
See TracChangeset
for help on using the changeset viewer.