Changeset 10990
- Timestamp:
- 11/30/11 15:21:10 (13 years ago)
- Location:
- issm/trunk-jpl/src/c
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/Container/Elements.cpp
r10989 r10990 204 204 for(int j=0;j<this->Size();j++){ 205 205 Element* element=(Element*)this->GetObjectByOffset(j); 206 element->GetVectorFromResults(vector,i );206 element->GetVectorFromResults(vector,i,resultssize[i]); 207 207 } 208 208 VecAssemblyBegin(vector); -
issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.cpp
r10298 r10990 198 198 xfree((void**)&doublevalues); 199 199 } /*}}}*/ 200 /*FUNCTION BoolElementResult::GetElementVectorFromResults{{{1*/ 201 void BoolElementResult::GetElementVectorFromResults(Vec vector,int dof){ 202 203 VecSetValue(vector,dof,(double)value,INSERT_VALUES); 204 } /*}}}*/ -
issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.h
r10989 r10990 54 54 int InstanceEnum(); 55 55 void GetVectorFromResults(Vec vector,int* doflist,int numdofs); 56 void GetElementVectorFromResults(Vec vector,int dof); 56 57 /*}}}*/ 57 58 }; -
issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.h
r10989 r10990 54 54 int InstanceEnum(); 55 55 void GetVectorFromResults(Vec vector,int* doflist,int numdofs){_error_("not implemented");}; 56 void GetElementVectorFromResults(Vec vector,int dof){_error_("not implemented");}; 56 57 /*}}}*/ 57 58 }; -
issm/trunk-jpl/src/c/objects/ElementResults/ElementResult.h
r10989 r10990 26 26 virtual int InstanceEnum()=0; 27 27 virtual void GetVectorFromResults(Vec vector,int* doflist,int numdof)=0; 28 virtual void GetElementVectorFromResults(Vec vector,int dof)=0; 28 29 29 30 }; -
issm/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.cpp
r9883 r10990 201 201 202 202 } /*}}}*/ 203 /*FUNCTION PentaVertexElementResult::GetElementVectorFromResults{{{1*/ 204 void PentaVertexElementResult::GetElementVectorFromResults(Vec vector,int dof){ 205 206 _error_("Result %s is a PentaVertexElementResult and should not write vector of size numberofelemenrs",EnumToStringx(enum_type)); 207 } /*}}}*/ -
issm/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.h
r10989 r10990 53 53 int InstanceEnum(); 54 54 void GetVectorFromResults(Vec vector,int* doflist,int numdofs); 55 void GetElementVectorFromResults(Vec vector,int dof); 55 56 /*}}}*/ 56 57 -
issm/trunk-jpl/src/c/objects/ElementResults/TriaVertexElementResult.cpp
r9883 r10990 190 190 191 191 } /*}}}*/ 192 /*FUNCTION TriaVertexElementResult::GetElementVectorFromResults{{{1*/ 193 void TriaVertexElementResult::GetElementVectorFromResults(Vec vector,int dof){ 194 195 _error_("Result %s is a TriaVertexElementResult and should not write vector of size numberofelemenrs",EnumToStringx(enum_type)); 196 } /*}}}*/ -
issm/trunk-jpl/src/c/objects/ElementResults/TriaVertexElementResult.h
r10989 r10990 52 52 int InstanceEnum(); 53 53 void GetVectorFromResults(Vec vector,int* doflist,int numdofs); 54 void GetElementVectorFromResults(Vec vector,int dof); 54 55 /*}}}*/ 55 56 -
issm/trunk-jpl/src/c/objects/Elements/Element.h
r10989 r10990 59 59 virtual void InputScale(int enum_type,double scale_factor)=0; 60 60 virtual void GetVectorFromInputs(Vec vector, int name_enum)=0; 61 virtual void GetVectorFromResults(Vec vector,int id )=0;61 virtual void GetVectorFromResults(Vec vector,int id,int interp)=0; 62 62 virtual void InputArtificialNoise(int enum_type,double min,double max)=0; 63 63 virtual bool InputConvergence(double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums)=0; -
issm/trunk-jpl/src/c/objects/Elements/Penta.cpp
r10989 r10990 1139 1139 /*}}}*/ 1140 1140 /*FUNCTION Penta::GetVectorFromResults{{{1*/ 1141 void Penta::GetVectorFromResults(Vec vector,int offset){ 1142 1141 void Penta::GetVectorFromResults(Vec vector,int offset,int interp){ 1142 1143 /*Prepare index list*/ 1143 1144 int doflist1[NUMVERTICES]; 1144 1145 /*Prepare index list*/1146 1145 this->GetSidList(&doflist1[0]); 1147 1146 1148 1147 /*Get result*/ 1149 1148 ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(offset); 1150 elementresult->GetVectorFromResults(vector,&doflist1[0],NUMVERTICES); 1149 if(interp==P1Enum){ 1150 elementresult->GetVectorFromResults(vector,&doflist1[0],NUMVERTICES); 1151 } 1152 else if(interp==P0Enum){ 1153 elementresult->GetElementVectorFromResults(vector,sid); 1154 } 1155 else{ 1156 printf("Interpolation %s not supported\n",EnumToStringx(interp)); 1157 } 1151 1158 } 1152 1159 /*}}}*/ -
issm/trunk-jpl/src/c/objects/Elements/Penta.h
r10989 r10990 92 92 double GetZcoord(GaussPenta* gauss); 93 93 void GetVectorFromInputs(Vec vector,int name_enum); 94 void GetVectorFromResults(Vec vector,int offset );94 void GetVectorFromResults(Vec vector,int offset,int interp); 95 95 96 96 int Sid(); -
issm/trunk-jpl/src/c/objects/Elements/Tria.cpp
r10989 r10990 1240 1240 1241 1241 /*Get out if this is not an element input*/ 1242 if 1242 if(!IsInput(input_enum)) return; 1243 1243 1244 1244 /*Prepare index list*/ … … 1254 1254 /*}}}*/ 1255 1255 /*FUNCTION Tria::GetVectorFromResults{{{1*/ 1256 void Tria::GetVectorFromResults(Vec vector,int offset){ 1257 1256 void Tria::GetVectorFromResults(Vec vector,int offset,int interp){ 1257 1258 /*Prepare index list*/ 1258 1259 int doflist1[NUMVERTICES]; 1259 1260 /*Prepare index list*/1261 1260 this->GetSidList(&doflist1[0]); 1262 1261 1263 1262 /*Get result*/ 1264 1263 ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(offset); 1265 elementresult->GetVectorFromResults(vector,&doflist1[0],NUMVERTICES); 1264 if(interp==P1Enum){ 1265 elementresult->GetVectorFromResults(vector,&doflist1[0],NUMVERTICES); 1266 } 1267 else if(interp==P0Enum){ 1268 elementresult->GetElementVectorFromResults(vector,sid); 1269 } 1270 else{ 1271 printf("Interpolation %s not supported\n",EnumToStringx(interp)); 1272 } 1266 1273 } 1267 1274 /*}}}*/ -
issm/trunk-jpl/src/c/objects/Elements/Tria.h
r10989 r10990 92 92 void GetSolutionFromInputs(Vec solution); 93 93 void GetVectorFromInputs(Vec vector, int name_enum); 94 void GetVectorFromResults(Vec vector,int offset );94 void GetVectorFromResults(Vec vector,int offset,int interp); 95 95 void InputArtificialNoise(int enum_type,double min, double max); 96 96 bool InputConvergence(double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums);
Note:
See TracChangeset
for help on using the changeset viewer.