Changeset 4239
- Timestamp:
- 06/25/10 16:43:28 (15 years ago)
- Location:
- issm/trunk/src/c/objects
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/objects/ElementResults/BeamVertexElementResult.cpp
r4236 r4239 25 25 /*}}}*/ 26 26 /*FUNCTION BeamVertexElementResult::BeamVertexElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{1*/ 27 BeamVertexElementResult::BeamVertexElementResult(int in_enum_type,double* in_values,int in_step, double in_time) :BeamVertexInput(in_enum_type,in_values){27 BeamVertexElementResult::BeamVertexElementResult(int in_enum_type,double* in_values,int in_step, double in_time){ 28 28 29 enum_type=in_enum_type; 30 values[0]=in_values[0]; 31 values[1]=in_values[1]; 29 32 step=in_step; 30 33 time=in_time; … … 49 52 50 53 printf("BeamVertexElementResult:\n"); 51 BeamVertexElementResult::DeepEcho(); 54 printf(" enum: %i (%s)\n",this->enum_type,EnumAsString(this->enum_type)); 55 printf(" values: [%g %g]\n",this->values[0],this->values[1]); 52 56 printf(" step: %i\n",this->step); 53 57 printf(" time: %g\n",this->time); -
issm/trunk/src/c/objects/ElementResults/BeamVertexElementResult.h
r4091 r4239 13 13 /*}}}*/ 14 14 15 class BeamVertexElementResult: public BeamVertexInput,publicElementResult{15 class BeamVertexElementResult: public ElementResult{ 16 16 17 17 private: 18 int enum_type; 19 double values[2]; 18 20 int step; 19 21 double time; … … 44 46 void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} 45 47 void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} 46 void InputUpdateFromSolution(double* solution , int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}48 void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} 47 49 48 50 /*}}}*/ -
issm/trunk/src/c/objects/ElementResults/DoubleElementResult.cpp
r4236 r4239 25 25 /*}}}*/ 26 26 /*FUNCTION DoubleElementResult::DoubleElementResult(int in_enum_type,IssmDouble in_value,int in_step, double in_time){{{1*/ 27 DoubleElementResult::DoubleElementResult(int in_enum_type,IssmDouble in_value,int in_step, double in_time): DoubleInput(in_enum_type,in_value){ 28 27 DoubleElementResult::DoubleElementResult(int in_enum_type,IssmDouble in_value,int in_step, double in_time){ 28 29 enum_type=in_enum_type; 30 value=in_value; 29 31 step=in_step; 30 32 time=in_time; … … 41 43 Object* DoubleElementResult::copy() { 42 44 43 DoubleElementResult* result=new DoubleElementResult(this->enum_type,this->value,this->step,this->time); 44 return (Object*)result; 45 //return new DoubleElementResult(this->enum_type,this->value,this->step,this->time); 45 return new DoubleElementResult(this->enum_type,this->value,this->step,this->time); 46 46 47 47 } … … 51 51 52 52 printf("DoubleElementResult:\n"); 53 DoubleInput::DeepEcho(); 53 printf(" enum: %i (%s)\n",this->enum_type,EnumAsString(this->enum_type)); 54 printf(" value: %g\n",this->value); 54 55 printf(" step: %i\n",this->step); 55 56 printf(" time: %g\n",this->time); -
issm/trunk/src/c/objects/ElementResults/DoubleElementResult.h
r4091 r4239 15 15 /*}}}*/ 16 16 17 class DoubleElementResult: public DoubleInput,publicElementResult{17 class DoubleElementResult: public ElementResult{ 18 18 19 19 private: 20 int enum_type; 21 double value; 20 22 int step; 21 23 double time; … … 25 27 /*constructors, destructors: {{{1*/ 26 28 DoubleElementResult(); 27 DoubleElementResult(int enum_type, IssmDouble value,int step,double time);29 DoubleElementResult(int enum_type,double value,int step,double time); 28 30 ~DoubleElementResult(); 29 31 /*}}}*/ … … 46 48 void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} 47 49 void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} 48 void InputUpdateFromSolution(double* solution , int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}50 void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} 49 51 50 52 /*}}}*/ -
issm/trunk/src/c/objects/ElementResults/ElementResult.h
r4191 r4239 12 12 /*}}}*/ 13 13 14 class ElementResult {14 class ElementResult:public Object{ 15 15 16 16 public: -
issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.cpp
r4236 r4239 25 25 /*}}}*/ 26 26 /*FUNCTION PentaVertexElementResult::PentaVertexElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{1*/ 27 PentaVertexElementResult::PentaVertexElementResult(int in_enum_type,double* in_values,int in_step, double in_time): PentaVertexInput(in_enum_type,in_values){ 28 27 PentaVertexElementResult::PentaVertexElementResult(int in_enum_type,double* in_values,int in_step, double in_time){ 28 29 int i; 30 31 enum_type=in_enum_type; 32 for(i=0;i<6;i++)values[i]=in_values[i]; 29 33 step=in_step; 30 34 time=in_time; … … 49 53 50 54 printf("PentaVertexElementResult:\n"); 51 PentaVertexElementResult::DeepEcho(); 55 printf(" enum: %i (%s)\n",this->enum_type,EnumAsString(this->enum_type)); 56 printf(" values: [%g %g %g %g %g %g]\n",this->values[0],this->values[1],this->values[2],this->values[3],this->values[4],this->values[5]); 52 57 printf(" step: %i\n",this->step); 53 58 printf(" time: %g\n",this->time); -
issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.h
r4091 r4239 14 14 /*}}}*/ 15 15 16 class PentaVertexElementResult: public PentaVertexInput,publicElementResult{16 class PentaVertexElementResult: public ElementResult{ 17 17 18 18 private: 19 int enum_type; 20 double values[6]; 19 21 int step; 20 22 double time; … … 45 47 void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} 46 48 void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} 47 void InputUpdateFromSolution(double* solution , int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}49 void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} 48 50 49 51 /*}}}*/ -
issm/trunk/src/c/objects/ElementResults/SingVertexElementResult.cpp
r4236 r4239 25 25 /*}}}*/ 26 26 /*FUNCTION SingVertexElementResult::SingVertexElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{1*/ 27 SingVertexElementResult::SingVertexElementResult(int in_enum_type,double in_value,int in_step, double in_time) :SingVertexInput(in_enum_type,in_value){27 SingVertexElementResult::SingVertexElementResult(int in_enum_type,double in_value,int in_step, double in_time){ 28 28 29 enum_type=in_enum_type; 30 value=in_value; 29 31 step=in_step; 30 32 time=in_time; … … 49 51 50 52 printf("SingVertexElementResult:\n"); 51 SingVertexElementResult::DeepEcho(); 53 printf(" enum: %i (%s)\n",this->enum_type,EnumAsString(this->enum_type)); 54 printf(" value: %g\n",this->value); 52 55 printf(" step: %i\n",this->step); 53 56 printf(" time: %g\n",this->time); -
issm/trunk/src/c/objects/ElementResults/SingVertexElementResult.h
r4091 r4239 13 13 /*}}}*/ 14 14 15 class SingVertexElementResult: public SingVertexInput,publicElementResult{15 class SingVertexElementResult: public ElementResult{ 16 16 17 17 private: 18 int enum_type; 19 double value; 18 20 int step; 19 21 double time; … … 44 46 void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} 45 47 void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} 46 void InputUpdateFromSolution(double* solution , int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}48 void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} 47 49 48 50 /*}}}*/ -
issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.cpp
r4236 r4239 25 25 /*}}}*/ 26 26 /*FUNCTION TriaVertexElementResult::TriaVertexElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{1*/ 27 TriaVertexElementResult::TriaVertexElementResult(int in_enum_type,double* in_values,int in_step, double in_time):TriaVertexInput(in_enum_type,in_values){ 28 27 TriaVertexElementResult::TriaVertexElementResult(int in_enum_type,double* in_values,int in_step, double in_time){ 28 29 enum_type=in_enum_type; 30 values[0]=in_values[0]; 31 values[1]=in_values[1]; 32 values[2]=in_values[2]; 29 33 step=in_step; 30 34 time=in_time; … … 49 53 50 54 printf("TriaVertexElementResult:\n"); 55 printf(" enum: %i (%s)\n",this->enum_type,EnumAsString(this->enum_type)); 56 printf(" values: [%g %g %g]\n",this->values[0],this->values[1],this->values[2]); 51 57 printf(" step: %i\n",this->step); 52 58 printf(" time: %g\n",this->time); 53 this->TriaVertexInput::DeepEcho();54 55 59 } 56 60 /*}}}*/ … … 104 108 int enum_value=0; 105 109 110 106 111 /*recover marshalled_dataset: */ 107 112 marshalled_dataset=*pmarshalled_dataset; … … 125 130 int TriaVertexElementResult::MarshallSize(){ 126 131 127 return sizeof(values) +132 return sizeof(values) 128 133 +sizeof(enum_type) 129 134 +sizeof(time) -
issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.h
r4091 r4239 13 13 /*}}}*/ 14 14 15 class TriaVertexElementResult: public TriaVertexInput,publicElementResult{15 class TriaVertexElementResult: public ElementResult{ 16 16 17 17 private: 18 int enum_type; 19 double values[3]; 18 20 int step; 19 21 double time; … … 44 46 void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} 45 47 void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} 46 void InputUpdateFromSolution(double* solution , int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}48 void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} 47 49 48 50 /*}}}*/ -
issm/trunk/src/c/objects/Inputs/DoubleInput.h
r4091 r4239 16 16 17 17 public: 18 19 /*just hold 3 values for 3 vertices: */20 18 int enum_type; 21 IssmDouble value;19 double value; 22 20 23 21 /*constructors, destructors: {{{1*/ -
issm/trunk/src/c/objects/Inputs/PentaVertexInput.h
r4091 r4239 15 15 16 16 public: 17 /*just hold 3 values for 3vertices: */17 /*just hold 6 values for 6 vertices: */ 18 18 int enum_type; 19 19 double values[6];
Note:
See TracChangeset
for help on using the changeset viewer.