Changeset 11292
- Timestamp:
- 02/01/12 13:54:31 (13 years ago)
- Location:
- issm/trunk-jpl/src/c
- Files:
-
- 11 edited
- 4 moved
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/Container/DataSet.cpp
r11291 r11292 258 258 dataset->AddObject(datasetinputinput);} 259 259 break; 260 case Tria VertexElementResultEnum:{261 Tria VertexElementResult* triavertexelementresult=NULL;262 triavertexelementresult=new Tria VertexElementResult();260 case TriaP1ElementResultEnum:{ 261 TriaP1ElementResult* triavertexelementresult=NULL; 262 triavertexelementresult=new TriaP1ElementResult(); 263 263 triavertexelementresult->Demarshall(&marshalled_dataset); 264 264 dataset->AddObject(triavertexelementresult);} 265 265 break; 266 266 #ifdef _HAVE_THREED_ 267 case Penta VertexElementResultEnum:{268 Penta VertexElementResult* pentavertexelementresult=NULL;269 pentavertexelementresult=new Penta VertexElementResult();267 case PentaP1ElementResultEnum:{ 268 PentaP1ElementResult* pentavertexelementresult=NULL; 269 pentavertexelementresult=new PentaP1ElementResult(); 270 270 pentavertexelementresult->Demarshall(&marshalled_dataset); 271 271 dataset->AddObject(pentavertexelementresult);} -
issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h
r11291 r11292 393 393 PatchNodesEnum, 394 394 PatchVerticesEnum, 395 Penta VertexElementResultEnum,395 PentaP1ElementResultEnum, 396 396 PetscVecExternalResultEnum, 397 397 StringExternalResultEnum, 398 398 TimeEnum, 399 Tria VertexElementResultEnum,399 TriaP1ElementResultEnum, 400 400 WaterColumnOldEnum, 401 401 /*}}}*/ -
issm/trunk-jpl/src/c/Makefile.am
r11291 r11292 61 61 ./objects/ElementResults/DoubleElementResult.h\ 62 62 ./objects/ElementResults/DoubleElementResult.cpp\ 63 ./objects/ElementResults/Tria VertexElementResult.h\64 ./objects/ElementResults/Tria VertexElementResult.cpp\63 ./objects/ElementResults/TriaP1ElementResult.h\ 64 ./objects/ElementResults/TriaP1ElementResult.cpp\ 65 65 ./objects/ElementResults/BoolElementResult.h\ 66 66 ./objects/ElementResults/BoolElementResult.cpp\ … … 559 559 threed_sources = ./objects/Gauss/GaussPenta.h\ 560 560 ./objects/Gauss/GaussPenta.cpp\ 561 ./objects/ElementResults/Penta VertexElementResult.h\562 ./objects/ElementResults/Penta VertexElementResult.cpp\561 ./objects/ElementResults/PentaP1ElementResult.h\ 562 ./objects/ElementResults/PentaP1ElementResult.cpp\ 563 563 ./objects/Inputs/PentaP1Input.h\ 564 564 ./objects/Inputs/PentaP1Input.cpp\ -
issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp
r11291 r11292 379 379 case PatchNodesEnum : return "PatchNodes"; 380 380 case PatchVerticesEnum : return "PatchVertices"; 381 case Penta VertexElementResultEnum : return "PentaVertexElementResult";381 case PentaP1ElementResultEnum : return "PentaP1ElementResult"; 382 382 case PetscVecExternalResultEnum : return "PetscVecExternalResult"; 383 383 case StringExternalResultEnum : return "StringExternalResult"; 384 384 case TimeEnum : return "Time"; 385 case Tria VertexElementResultEnum : return "TriaVertexElementResult";385 case TriaP1ElementResultEnum : return "TriaP1ElementResult"; 386 386 case WaterColumnOldEnum : return "WaterColumnOld"; 387 387 case MinVelEnum : return "MinVel"; -
issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp
r11291 r11292 377 377 else if (strcmp(name,"PatchNodes")==0) return PatchNodesEnum; 378 378 else if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum; 379 else if (strcmp(name,"Penta VertexElementResult")==0) return PentaVertexElementResultEnum;379 else if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum; 380 380 else if (strcmp(name,"PetscVecExternalResult")==0) return PetscVecExternalResultEnum; 381 381 else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum; 382 382 else if (strcmp(name,"Time")==0) return TimeEnum; 383 else if (strcmp(name,"Tria VertexElementResult")==0) return TriaVertexElementResultEnum;383 else if (strcmp(name,"TriaP1ElementResult")==0) return TriaP1ElementResultEnum; 384 384 else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum; 385 385 else if (strcmp(name,"MinVel")==0) return MinVelEnum; -
issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.cpp
r11288 r11292 1 /*!\file Penta VertexElementResult.c2 * \brief: implementation of the Penta VertexElementResult object1 /*!\file PentaP1ElementResult.c 2 * \brief: implementation of the PentaP1ElementResult object 3 3 */ 4 4 … … 18 18 #include "../../include/include.h" 19 19 20 /*Penta VertexElementResult constructors and destructor*/21 /*FUNCTION Penta VertexElementResult::PentaVertexElementResult(){{{1*/22 Penta VertexElementResult::PentaVertexElementResult(){20 /*PentaP1ElementResult constructors and destructor*/ 21 /*FUNCTION PentaP1ElementResult::PentaP1ElementResult(){{{1*/ 22 PentaP1ElementResult::PentaP1ElementResult(){ 23 23 return; 24 24 } 25 25 /*}}}*/ 26 /*FUNCTION Penta VertexElementResult::PentaVertexElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{1*/27 Penta VertexElementResult::PentaVertexElementResult(int in_enum_type,double* in_values,int in_step, double in_time){26 /*FUNCTION PentaP1ElementResult::PentaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{1*/ 27 PentaP1ElementResult::PentaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){ 28 28 29 29 int i; … … 35 35 } 36 36 /*}}}*/ 37 /*FUNCTION Penta VertexElementResult::~PentaVertexElementResult(){{{1*/38 Penta VertexElementResult::~PentaVertexElementResult(){37 /*FUNCTION PentaP1ElementResult::~PentaP1ElementResult(){{{1*/ 38 PentaP1ElementResult::~PentaP1ElementResult(){ 39 39 return; 40 40 } … … 42 42 43 43 /*Object virtual functions definitions:*/ 44 /*FUNCTION Penta VertexElementResult::Echo {{{1*/45 void Penta VertexElementResult::Echo(void){44 /*FUNCTION PentaP1ElementResult::Echo {{{1*/ 45 void PentaP1ElementResult::Echo(void){ 46 46 this->DeepEcho(); 47 47 } 48 48 /*}}}*/ 49 /*FUNCTION Penta VertexElementResult::DeepEcho{{{1*/50 void Penta VertexElementResult::DeepEcho(void){51 52 printf("Penta VertexElementResult:\n");49 /*FUNCTION PentaP1ElementResult::DeepEcho{{{1*/ 50 void PentaP1ElementResult::DeepEcho(void){ 51 52 printf("PentaP1ElementResult:\n"); 53 53 printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); 54 54 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]); … … 58 58 } 59 59 /*}}}*/ 60 /*FUNCTION Penta VertexElementResult::Id{{{1*/61 int Penta VertexElementResult::Id(void){ return -1; }62 /*}}}*/ 63 /*FUNCTION Penta VertexElementResult::MyRank{{{1*/64 int Penta VertexElementResult::MyRank(void){60 /*FUNCTION PentaP1ElementResult::Id{{{1*/ 61 int PentaP1ElementResult::Id(void){ return -1; } 62 /*}}}*/ 63 /*FUNCTION PentaP1ElementResult::MyRank{{{1*/ 64 int PentaP1ElementResult::MyRank(void){ 65 65 extern int my_rank; 66 66 return my_rank; … … 68 68 /*}}}*/ 69 69 #ifdef _SERIAL_ 70 /*FUNCTION Penta VertexElementResult::Marshall{{{1*/71 void Penta VertexElementResult::Marshall(char** pmarshalled_dataset){70 /*FUNCTION PentaP1ElementResult::Marshall{{{1*/ 71 void PentaP1ElementResult::Marshall(char** pmarshalled_dataset){ 72 72 73 73 char* marshalled_dataset=NULL; … … 77 77 marshalled_dataset=*pmarshalled_dataset; 78 78 79 /*get enum value of Penta VertexElementResult: */80 enum_value=Penta VertexElementResultEnum;79 /*get enum value of PentaP1ElementResult: */ 80 enum_value=PentaP1ElementResultEnum; 81 81 82 82 /*marshall enum: */ 83 83 memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); 84 84 85 /*marshall Penta VertexElementResult data: */85 /*marshall PentaP1ElementResult data: */ 86 86 memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); 87 87 memcpy(marshalled_dataset,&values,sizeof(values));marshalled_dataset+=sizeof(values); … … 92 92 } 93 93 /*}}}*/ 94 /*FUNCTION Penta VertexElementResult::MarshallSize{{{1*/95 int Penta VertexElementResult::MarshallSize(){94 /*FUNCTION PentaP1ElementResult::MarshallSize{{{1*/ 95 int PentaP1ElementResult::MarshallSize(){ 96 96 97 97 return sizeof(values)+ … … 102 102 } 103 103 /*}}}*/ 104 /*FUNCTION Penta VertexElementResult::Demarshall{{{1*/105 void Penta VertexElementResult::Demarshall(char** pmarshalled_dataset){104 /*FUNCTION PentaP1ElementResult::Demarshall{{{1*/ 105 void PentaP1ElementResult::Demarshall(char** pmarshalled_dataset){ 106 106 107 107 char* marshalled_dataset=NULL; … … 124 124 /*}}}*/ 125 125 #endif 126 /*FUNCTION Penta VertexElementResult::ObjectEnum{{{1*/127 int Penta VertexElementResult::ObjectEnum(void){128 129 return Penta VertexElementResultEnum;130 131 } 132 /*}}}*/ 133 /*FUNCTION Penta VertexElementResult::copy{{{1*/134 Object* Penta VertexElementResult::copy() {135 136 return new Penta VertexElementResult(this->enum_type,this->values,this->step,this->time);126 /*FUNCTION PentaP1ElementResult::ObjectEnum{{{1*/ 127 int PentaP1ElementResult::ObjectEnum(void){ 128 129 return PentaP1ElementResultEnum; 130 131 } 132 /*}}}*/ 133 /*FUNCTION PentaP1ElementResult::copy{{{1*/ 134 Object* PentaP1ElementResult::copy() { 135 136 return new PentaP1ElementResult(this->enum_type,this->values,this->step,this->time); 137 137 138 138 } … … 140 140 141 141 /*ElementResult management*/ 142 /*FUNCTION Penta VertexElementResult::InstanceEnum{{{1*/143 int Penta VertexElementResult::InstanceEnum(void){142 /*FUNCTION PentaP1ElementResult::InstanceEnum{{{1*/ 143 int PentaP1ElementResult::InstanceEnum(void){ 144 144 145 145 return this->enum_type; … … 147 147 } 148 148 /*}}}*/ 149 /*FUNCTION Penta VertexElementResult::SpawnTriaElementResult{{{1*/150 ElementResult* Penta VertexElementResult::SpawnTriaElementResult(int* indices){149 /*FUNCTION PentaP1ElementResult::SpawnTriaElementResult{{{1*/ 150 ElementResult* PentaP1ElementResult::SpawnTriaElementResult(int* indices){ 151 151 152 152 /*output*/ 153 Tria VertexElementResult* outresult=NULL;153 TriaP1ElementResult* outresult=NULL; 154 154 double newvalues[3]; 155 155 … … 165 165 166 166 /*Create new Tria result*/ 167 outresult=new Tria VertexElementResult(this->enum_type,&newvalues[0],this->step,this->time);167 outresult=new TriaP1ElementResult(this->enum_type,&newvalues[0],this->step,this->time); 168 168 169 169 /*Assign output*/ … … 172 172 } 173 173 /*}}}*/ 174 /*FUNCTION Penta VertexElementResult::ProcessUnits{{{1*/175 void Penta VertexElementResult::ProcessUnits(Parameters* parameters){174 /*FUNCTION PentaP1ElementResult::ProcessUnits{{{1*/ 175 void PentaP1ElementResult::ProcessUnits(Parameters* parameters){ 176 176 177 177 UnitConversion(this->values,6,IuToExtEnum,this->enum_type); … … 179 179 } 180 180 /*}}}*/ 181 /*FUNCTION Penta VertexElementResult::NumberOfNodalValues{{{1*/182 int Penta VertexElementResult::NumberOfNodalValues(void){181 /*FUNCTION PentaP1ElementResult::NumberOfNodalValues{{{1*/ 182 int PentaP1ElementResult::NumberOfNodalValues(void){ 183 183 return 6; 184 184 } 185 185 /*}}}*/ 186 /*FUNCTION Penta VertexElementResult::PatchFill{{{1*/187 void Penta VertexElementResult::PatchFill(int row, Patch* patch){186 /*FUNCTION PentaP1ElementResult::PatchFill{{{1*/ 187 void PentaP1ElementResult::PatchFill(int row, Patch* patch){ 188 188 189 189 /*Here, we fill the result information into the patch object. First, let's remember what is in a row … … 194 194 } 195 195 /*}}}*/ 196 /*FUNCTION Penta VertexElementResult::GetVectorFromResults{{{1*/197 void Penta VertexElementResult::GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs){196 /*FUNCTION PentaP1ElementResult::GetVectorFromResults{{{1*/ 197 void PentaP1ElementResult::GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs){ 198 198 199 199 double data[6]; 200 200 201 if(numdofs!=6)_error_("Result %s is a Penta VertexElementResult and cannot write vector of %i dofs",numdofs);201 if(numdofs!=6)_error_("Result %s is a PentaP1ElementResult and cannot write vector of %i dofs",numdofs); 202 202 for(int i=0;i<6;i++) data[i]=this->values[i]/(double)connectivitylist[i]; 203 203 VecSetValues(vector,numdofs,doflist,(const double*)&data,ADD_VALUES); 204 204 205 205 } /*}}}*/ 206 /*FUNCTION Penta VertexElementResult::GetElementVectorFromResults{{{1*/207 void Penta VertexElementResult::GetElementVectorFromResults(Vec vector,int dof){208 209 _error_("Result %s is a Penta VertexElementResult and should not write vector of size numberofelemenrs",EnumToStringx(enum_type));206 /*FUNCTION PentaP1ElementResult::GetElementVectorFromResults{{{1*/ 207 void PentaP1ElementResult::GetElementVectorFromResults(Vec vector,int dof){ 208 209 _error_("Result %s is a PentaP1ElementResult and should not write vector of size numberofelemenrs",EnumToStringx(enum_type)); 210 210 } /*}}}*/ -
issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.h
r11291 r11292 1 /*! \file Penta VertexElementResult.h2 * \brief: header file for penta vertex result object.1 /*! \file PentaP1ElementResult.h 2 * \brief: header file for PentaP1ElementResult object 3 3 * this object is just a PentaP1Input with additional time and step info. 4 4 */ 5 5 6 6 7 #ifndef _PENTA VERTEXELEMENTRESULT_H_8 #define _PENTA VERTEXELEMENTRESULT_H_7 #ifndef _PENTAP1ELEMENTRESULT_H_ 8 #define _PENTAP1ELEMENTRESULT_H_ 9 9 10 10 /*Headers:*/ … … 14 14 /*}}}*/ 15 15 16 class Penta VertexElementResult: public ElementResult{16 class PentaP1ElementResult: public ElementResult{ 17 17 18 18 private: … … 24 24 public: 25 25 26 /*Penta VertexElementResult constructors, destructors: {{{1*/27 Penta VertexElementResult();28 Penta VertexElementResult(int enum_type,double* values,int step, double time);29 ~Penta VertexElementResult();26 /*PentaP1ElementResult constructors, destructors: {{{1*/ 27 PentaP1ElementResult(); 28 PentaP1ElementResult(int enum_type,double* values,int step, double time); 29 ~PentaP1ElementResult(); 30 30 /*}}}*/ 31 31 /*Object virtual functions definitions:{{{1 */ … … 50 50 void PatchFill(int row, Patch* patch); 51 51 /*}}}*/ 52 /*Penta VertexElementResult management: {{{1*/52 /*PentaP1ElementResult management: {{{1*/ 53 53 int InstanceEnum(); 54 54 void GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs); … … 57 57 58 58 }; 59 #endif /* _PENTA VERTEXELEMENTRESULT_H */59 #endif /* _PENTAP1ELEMENTRESULT_H */ -
issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp
r11288 r11292 1 /*!\file Tria VertexElementResult.c2 * \brief: implementation of the Tria VertexElementResult object1 /*!\file TriaP1ElementResult.c 2 * \brief: implementation of the TriaP1ElementResult object 3 3 */ 4 4 … … 18 18 #include "../../include/include.h" 19 19 20 /*Tria VertexElementResult constructors and destructor*/21 /*FUNCTION Tria VertexElementResult::TriaVertexElementResult(){{{1*/22 Tria VertexElementResult::TriaVertexElementResult(){20 /*TriaP1ElementResult constructors and destructor*/ 21 /*FUNCTION TriaP1ElementResult::TriaP1ElementResult(){{{1*/ 22 TriaP1ElementResult::TriaP1ElementResult(){ 23 23 return; 24 24 } 25 25 /*}}}*/ 26 /*FUNCTION Tria VertexElementResult::TriaVertexElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{1*/27 Tria VertexElementResult::TriaVertexElementResult(int in_enum_type,double* in_values,int in_step, double in_time){26 /*FUNCTION TriaP1ElementResult::TriaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{1*/ 27 TriaP1ElementResult::TriaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){ 28 28 29 29 enum_type=in_enum_type; … … 35 35 } 36 36 /*}}}*/ 37 /*FUNCTION Tria VertexElementResult::~TriaVertexElementResult(){{{1*/38 Tria VertexElementResult::~TriaVertexElementResult(){37 /*FUNCTION TriaP1ElementResult::~TriaP1ElementResult(){{{1*/ 38 TriaP1ElementResult::~TriaP1ElementResult(){ 39 39 return; 40 40 } … … 42 42 43 43 /*Object virtual functions definitions:*/ 44 /*FUNCTION Tria VertexElementResult::Echo {{{1*/45 void Tria VertexElementResult::Echo(void){44 /*FUNCTION TriaP1ElementResult::Echo {{{1*/ 45 void TriaP1ElementResult::Echo(void){ 46 46 this->DeepEcho(); 47 47 } 48 48 /*}}}*/ 49 /*FUNCTION Tria VertexElementResult::DeepEcho{{{1*/50 void Tria VertexElementResult::DeepEcho(void){49 /*FUNCTION TriaP1ElementResult::DeepEcho{{{1*/ 50 void TriaP1ElementResult::DeepEcho(void){ 51 51 52 printf("Tria VertexElementResult:\n");52 printf("TriaP1ElementResult:\n"); 53 53 printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); 54 54 printf(" values: [%g %g %g]\n",this->values[0],this->values[1],this->values[2]); … … 57 57 } 58 58 /*}}}*/ 59 /*FUNCTION Tria VertexElementResult::Id{{{1*/60 int Tria VertexElementResult::Id(void){ return -1; }59 /*FUNCTION TriaP1ElementResult::Id{{{1*/ 60 int TriaP1ElementResult::Id(void){ return -1; } 61 61 /*}}}*/ 62 /*FUNCTION Tria VertexElementResult::MyRank{{{1*/63 int Tria VertexElementResult::MyRank(void){62 /*FUNCTION TriaP1ElementResult::MyRank{{{1*/ 63 int TriaP1ElementResult::MyRank(void){ 64 64 extern int my_rank; 65 65 return my_rank; … … 67 67 /*}}}*/ 68 68 #ifdef _SERIAL_ 69 /*FUNCTION Tria VertexElementResult::Marshall{{{1*/70 void Tria VertexElementResult::Marshall(char** pmarshalled_dataset){69 /*FUNCTION TriaP1ElementResult::Marshall{{{1*/ 70 void TriaP1ElementResult::Marshall(char** pmarshalled_dataset){ 71 71 72 72 char* marshalled_dataset=NULL; … … 77 77 marshalled_dataset=*pmarshalled_dataset; 78 78 79 /*get enum value of Tria VertexElementResult: */80 enum_value=Tria VertexElementResultEnum;79 /*get enum value of TriaP1ElementResult: */ 80 enum_value=TriaP1ElementResultEnum; 81 81 82 82 /*marshall enum: */ 83 83 memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); 84 84 85 /*marshall Tria VertexElementResult data: */85 /*marshall TriaP1ElementResult data: */ 86 86 memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); 87 87 memcpy(marshalled_dataset,&values,sizeof(values));marshalled_dataset+=sizeof(values); … … 92 92 } 93 93 /*}}}*/ 94 /*FUNCTION Tria VertexElementResult::MarshallSize{{{1*/95 int Tria VertexElementResult::MarshallSize(){94 /*FUNCTION TriaP1ElementResult::MarshallSize{{{1*/ 95 int TriaP1ElementResult::MarshallSize(){ 96 96 97 97 return sizeof(values) … … 102 102 } 103 103 /*}}}*/ 104 /*FUNCTION Tria VertexElementResult::Demarshall{{{1*/105 void Tria VertexElementResult::Demarshall(char** pmarshalled_dataset){104 /*FUNCTION TriaP1ElementResult::Demarshall{{{1*/ 105 void TriaP1ElementResult::Demarshall(char** pmarshalled_dataset){ 106 106 107 107 char* marshalled_dataset=NULL; … … 124 124 /*}}}*/ 125 125 #endif 126 /*FUNCTION Tria VertexElementResult::ObjectEnum{{{1*/127 int Tria VertexElementResult::ObjectEnum(void){126 /*FUNCTION TriaP1ElementResult::ObjectEnum{{{1*/ 127 int TriaP1ElementResult::ObjectEnum(void){ 128 128 129 return Tria VertexElementResultEnum;129 return TriaP1ElementResultEnum; 130 130 131 131 } 132 132 /*}}}*/ 133 /*FUNCTION Tria VertexElementResult::copy{{{1*/134 Object* Tria VertexElementResult::copy() {133 /*FUNCTION TriaP1ElementResult::copy{{{1*/ 134 Object* TriaP1ElementResult::copy() { 135 135 136 return new Tria VertexElementResult(this->enum_type,this->values,this->step,this->time);136 return new TriaP1ElementResult(this->enum_type,this->values,this->step,this->time); 137 137 138 138 } … … 140 140 141 141 /*ElementResult management*/ 142 /*FUNCTION Tria VertexElementResult::InstanceEnum{{{1*/143 int Tria VertexElementResult::InstanceEnum(void){142 /*FUNCTION TriaP1ElementResult::InstanceEnum{{{1*/ 143 int TriaP1ElementResult::InstanceEnum(void){ 144 144 145 145 return this->enum_type; … … 147 147 } 148 148 /*}}}*/ 149 /*FUNCTION Tria VertexElementResult::SpawnTriaElementResult{{{1*/150 ElementResult* Tria VertexElementResult::SpawnTriaElementResult(int* indices){149 /*FUNCTION TriaP1ElementResult::SpawnTriaElementResult{{{1*/ 150 ElementResult* TriaP1ElementResult::SpawnTriaElementResult(int* indices){ 151 151 152 152 /*output*/ 153 Tria VertexElementResult* outresult=NULL;153 TriaP1ElementResult* outresult=NULL; 154 154 155 155 /*Create new Tria result (copy of current result)*/ 156 outresult=new Tria VertexElementResult(this->enum_type,&this->values[0],this->step,this->time);156 outresult=new TriaP1ElementResult(this->enum_type,&this->values[0],this->step,this->time); 157 157 158 158 /*Assign output*/ … … 161 161 } 162 162 /*}}}*/ 163 /*FUNCTION Tria VertexElementResult::ProcessUnits{{{1*/164 void Tria VertexElementResult::ProcessUnits(Parameters* parameters){163 /*FUNCTION TriaP1ElementResult::ProcessUnits{{{1*/ 164 void TriaP1ElementResult::ProcessUnits(Parameters* parameters){ 165 165 166 166 UnitConversion(this->values,3,IuToExtEnum,this->enum_type); … … 168 168 } 169 169 /*}}}*/ 170 /*FUNCTION Tria VertexElementResult::NumberOfNodalValues{{{1*/171 int Tria VertexElementResult::NumberOfNodalValues(void){170 /*FUNCTION TriaP1ElementResult::NumberOfNodalValues{{{1*/ 171 int TriaP1ElementResult::NumberOfNodalValues(void){ 172 172 return 3; 173 173 } 174 174 /*}}}*/ 175 /*FUNCTION Tria VertexElementResult::PatchFill{{{1*/176 void Tria VertexElementResult::PatchFill(int row, Patch* patch){175 /*FUNCTION TriaP1ElementResult::PatchFill{{{1*/ 176 void TriaP1ElementResult::PatchFill(int row, Patch* patch){ 177 177 178 178 /*Here, we fill the result information into the patch object. First, let's remember what is in a row … … 183 183 } 184 184 /*}}}*/ 185 /*FUNCTION Tria VertexElementResult::GetVectorFromResults{{{1*/186 void Tria VertexElementResult::GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs){185 /*FUNCTION TriaP1ElementResult::GetVectorFromResults{{{1*/ 186 void TriaP1ElementResult::GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs){ 187 187 188 188 double data[3]; 189 189 190 if(numdofs!=3)_error_("Result %s is a Tria VertexElementResult and cannot write vector of %i dofs",numdofs);190 if(numdofs!=3)_error_("Result %s is a TriaP1ElementResult and cannot write vector of %i dofs",numdofs); 191 191 for(int i=0;i<3;i++) data[i]=this->values[i]/(double)connectivitylist[i]; 192 192 VecSetValues(vector,numdofs,doflist,(const double*)&data,ADD_VALUES); 193 193 194 194 } /*}}}*/ 195 /*FUNCTION Tria VertexElementResult::GetElementVectorFromResults{{{1*/196 void Tria VertexElementResult::GetElementVectorFromResults(Vec vector,int dof){195 /*FUNCTION TriaP1ElementResult::GetElementVectorFromResults{{{1*/ 196 void TriaP1ElementResult::GetElementVectorFromResults(Vec vector,int dof){ 197 197 198 _error_("Result %s is a Tria VertexElementResult and should not write vector of size numberofelemenrs",EnumToStringx(enum_type));198 _error_("Result %s is a TriaP1ElementResult and should not write vector of size numberofelemenrs",EnumToStringx(enum_type)); 199 199 } /*}}}*/ -
issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.h
r11288 r11292 1 /*! \file Tria VertexElementResult.h2 * \brief: header file for triavertexresult object1 /*! \file TriaP1ElementResult.h 2 * \brief: header file for TriaP1ElementResult object 3 3 */ 4 4 5 5 6 #ifndef _TRIA VERTEXELEMENTRESULT_H_7 #define _TRIA VERTEXELEMENTRESULT_H_6 #ifndef _TRIAP1ELEMENTRESULT_H_ 7 #define _TRIAP1ELEMENTRESULT_H_ 8 8 9 9 /*Headers:*/ … … 13 13 /*}}}*/ 14 14 15 class Tria VertexElementResult: public ElementResult{15 class TriaP1ElementResult: public ElementResult{ 16 16 17 17 private: … … 23 23 public: 24 24 25 /*Tria VertexElementResult constructors, destructors: {{{1*/26 Tria VertexElementResult();27 Tria VertexElementResult(int enum_type,double* values,int step,double time);28 ~Tria VertexElementResult();25 /*TriaP1ElementResult constructors, destructors: {{{1*/ 26 TriaP1ElementResult(); 27 TriaP1ElementResult(int enum_type,double* values,int step,double time); 28 ~TriaP1ElementResult(); 29 29 /*}}}*/ 30 30 /*Object virtual functions definitions:{{{1 */ … … 49 49 void PatchFill(int row, Patch* patch); 50 50 /*}}}*/ 51 /*Tria VertexElementResult management: {{{1*/51 /*TriaP1ElementResult management: {{{1*/ 52 52 int InstanceEnum(); 53 53 void GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs); … … 56 56 57 57 }; 58 #endif /* _TRIA VERTEXELEMENTRESULT_H */58 #endif /* _TRIAP1ELEMENTRESULT_H */ -
issm/trunk-jpl/src/c/objects/Elements/Penta.cpp
r11291 r11292 2157 2157 resultstimes[i]=elementresult->GetTime(); 2158 2158 resultssteps[i]=elementresult->GetStep(); 2159 if(elementresult->ObjectEnum()==Penta VertexElementResultEnum){2159 if(elementresult->ObjectEnum()==PentaP1ElementResultEnum){ 2160 2160 resultssizes[i]=P1Enum; 2161 2161 } -
issm/trunk-jpl/src/c/objects/Elements/Tria.cpp
r11291 r11292 1985 1985 resultstimes[i]=elementresult->GetTime(); 1986 1986 resultssteps[i]=elementresult->GetStep(); 1987 if(elementresult->ObjectEnum()==Tria VertexElementResultEnum){1987 if(elementresult->ObjectEnum()==TriaP1ElementResultEnum){ 1988 1988 resultssizes[i]=P1Enum; 1989 1989 } -
issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp
r11291 r11292 172 172 ElementResult* PentaP1Input::SpawnResult(int step, double time){ 173 173 174 return new Penta VertexElementResult(this->enum_type,this->values,step,time);174 return new PentaP1ElementResult(this->enum_type,this->values,step,time); 175 175 176 176 } -
issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.h
r11291 r11292 1 1 /*! \file PentaP1Input.h 2 * \brief: header file for triavertexinput object2 * \brief: header file for PentaP1Input object 3 3 */ 4 4 5 5 6 #ifndef _PENTA VERTEXINPUT_H_7 #define _PENTA VERTEXINPUT_H_6 #ifndef _PENTAP1INPUT_H_ 7 #define _PENTAP1INPUT_H_ 8 8 9 9 /*Headers:*/ … … 87 87 88 88 }; 89 #endif /* _PENTA VERTEXINPUT_H */89 #endif /* _PENTAP1INPUT_H */ -
issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp
r11291 r11292 161 161 ElementResult* TriaP1Input::SpawnResult(int step, double time){ 162 162 163 return new Tria VertexElementResult(this->enum_type,this->values,step,time);163 return new TriaP1ElementResult(this->enum_type,this->values,step,time); 164 164 165 165 } -
issm/trunk-jpl/src/c/objects/objects.h
r11291 r11292 97 97 #include "./ElementResults/ElementResult.h" 98 98 #include "./ElementResults/DoubleElementResult.h" 99 #include "./ElementResults/Tria VertexElementResult.h"100 #include "./ElementResults/Penta VertexElementResult.h"99 #include "./ElementResults/TriaP1ElementResult.h" 100 #include "./ElementResults/PentaP1ElementResult.h" 101 101 #include "./ElementResults/BoolElementResult.h" 102 102
Note:
See TracChangeset
for help on using the changeset viewer.