Changeset 7177
- Timestamp:
- 01/26/11 08:37:58 (14 years ago)
- Location:
- issm/trunk/src/c/modules
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/modules/ControlInputGetGradientx/ControlInputGetGradientx.cpp
r6200 r7177 9 9 #include "../../EnumDefinitions/EnumDefinitions.h" 10 10 11 void ControlInputGetGradientx( Vec* pgradient, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int NameEnum){11 void ControlInputGetGradientx( Vec* pgradient, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int name){ 12 12 13 13 Vec gradient=NULL; … … 16 16 for(int i=0;i<elements->Size();i++){ 17 17 Element* element=(Element*)elements->GetObjectByOffset(i); 18 element->ControlInputGetGradient(gradient, NameEnum);18 element->ControlInputGetGradient(gradient,name); 19 19 } 20 20 -
issm/trunk/src/c/modules/ControlInputGetGradientx/ControlInputGetGradientx.h
r6200 r7177 8 8 #include "../../Container/Container.h" 9 9 10 void ControlInputGetGradientx( Vec* pgradient, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int NameEnum);10 void ControlInputGetGradientx( Vec* pgradient, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int name); 11 11 12 12 #endif -
issm/trunk/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.cpp
r6238 r7177 9 9 #include "../../EnumDefinitions/EnumDefinitions.h" 10 10 11 void ControlInputScaleGradientx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int NameEnum,double scale){11 void ControlInputScaleGradientx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int name,double scale){ 12 12 13 13 for(int i=0;i<elements->Size();i++){ 14 14 Element* element=(Element*)elements->GetObjectByOffset(i); 15 element->ControlInputScaleGradient( NameEnum,scale);15 element->ControlInputScaleGradient(name,scale); 16 16 } 17 17 -
issm/trunk/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.h
r6238 r7177 8 8 #include "../../Container/Container.h" 9 9 10 void ControlInputScaleGradientx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int NameEnum,double scale);10 void ControlInputScaleGradientx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int name,double scale); 11 11 12 12 #endif -
issm/trunk/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp
r6200 r7177 9 9 #include "../../EnumDefinitions/EnumDefinitions.h" 10 10 11 void ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int NameEnum,double* gradient){11 void ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int name,double* gradient){ 12 12 13 13 for(int i=0;i<elements->Size();i++){ 14 14 Element* element=(Element*)elements->GetObjectByOffset(i); 15 element->ControlInputSetGradient(gradient, NameEnum);15 element->ControlInputSetGradient(gradient,name); 16 16 } 17 17 18 18 } 19 void ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int NameEnum,Vec gradient){19 void ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int name,Vec gradient){ 20 20 21 21 /*Serialize gradient*/ … … 23 23 VecToMPISerial(&serial_gradient,gradient); 24 24 25 ControlInputSetGradientx(elements,nodes,vertices, loads, materials, parameters, NameEnum,serial_gradient);25 ControlInputSetGradientx(elements,nodes,vertices, loads, materials, parameters, name,serial_gradient); 26 26 27 27 /*Clean up and return*/ -
issm/trunk/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.h
r6200 r7177 8 8 #include "../../Container/Container.h" 9 9 10 void ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int NameEnum,double* gradient);11 void ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int NameEnum,Vec gradient);10 void ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int name,double* gradient); 11 void ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int name,Vec gradient); 12 12 13 13 #endif -
issm/trunk/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp
r6412 r7177 9 9 #include "../../EnumDefinitions/EnumDefinitions.h" 10 10 11 void GetVectorFromInputsx( Vec* pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int NameEnum, int TypeEnum){11 void GetVectorFromInputsx( Vec* pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int name, int type){ 12 12 13 13 … … 15 15 Vec vector=NULL; 16 16 17 if( TypeEnum==VertexEnum){17 if(type==VertexEnum){ 18 18 19 19 vector=NewVec(vertices->NumberOfVertices()); 20 20 for(i=0;i<elements->Size();i++){ 21 21 Element* element=(Element*)elements->GetObjectByOffset(i); 22 element->GetVectorFromInputs(vector, NameEnum);22 element->GetVectorFromInputs(vector,name); 23 23 } 24 24 } 25 else _error_("%s%s%s"," vector type: ",EnumToString( TypeEnum)," not supported yet!");25 else _error_("%s%s%s"," vector type: ",EnumToString(type)," not supported yet!"); 26 26 27 27 VecAssemblyBegin(vector); … … 33 33 } 34 34 35 void GetVectorFromInputsx( double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int NameEnum, int TypeEnum){35 void GetVectorFromInputsx( double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int name, int type){ 36 36 37 37 /*output: */ … … 41 41 Vec vec_vector=NULL; 42 42 43 GetVectorFromInputsx( &vec_vector, elements,nodes, vertices, loads, materials, parameters, NameEnum, TypeEnum);43 GetVectorFromInputsx( &vec_vector, elements,nodes, vertices, loads, materials, parameters, name, type); 44 44 VecToMPISerial(&vector,vec_vector); 45 45 -
issm/trunk/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.h
r4236 r7177 9 9 10 10 /* local prototypes: */ 11 void GetVectorFromInputsx( Vec* pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int NameEnum,int TypeEnum);12 void GetVectorFromInputsx( double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int NameEnum,int TypeEnum);11 void GetVectorFromInputsx( Vec* pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int name,int type); 12 void GetVectorFromInputsx( double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int name,int type); 13 13 14 14 #endif /* _GETVECTORFROMINPUTSXX_H */ -
issm/trunk/src/c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp
r5311 r7177 9 9 #include "../../EnumDefinitions/EnumDefinitions.h" 10 10 11 void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vec vector, int NameEnum, int TypeEnum){11 void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vec vector, int name, int type){ 12 12 13 13 double* serial_vector=NULL; … … 15 15 VecToMPISerial(&serial_vector,vector); 16 16 17 InputUpdateFromVectorDakotax( elements,nodes, vertices, loads, materials, parameters,serial_vector, NameEnum, TypeEnum);17 InputUpdateFromVectorDakotax( elements,nodes, vertices, loads, materials, parameters,serial_vector,name, type); 18 18 19 19 /*Free ressources:*/ … … 22 22 23 23 24 void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* vector, int NameEnum, int TypeEnum){24 void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* vector, int name, int type){ 25 25 26 26 int i; … … 29 29 for(i=0;i<elements->Size();i++){ 30 30 Element* element=(Element*)elements->GetObjectByOffset(i); 31 element->InputUpdateFromVectorDakota(vector, NameEnum,TypeEnum);31 element->InputUpdateFromVectorDakota(vector,name,type); 32 32 } 33 33 for(i=0;i<nodes->Size();i++){ 34 34 Node* node=(Node*)nodes->GetObjectByOffset(i); 35 node->InputUpdateFromVectorDakota(vector, NameEnum,TypeEnum);35 node->InputUpdateFromVectorDakota(vector,name,type); 36 36 } 37 37 for(i=0;i<loads->Size();i++){ 38 38 Load* load=(Load*)loads->GetObjectByOffset(i); 39 load->InputUpdateFromVectorDakota(vector, NameEnum,TypeEnum);39 load->InputUpdateFromVectorDakota(vector,name,type); 40 40 } 41 41 for(i=0;i<materials->Size();i++){ 42 42 Material* material=(Material*)materials->GetObjectByOffset(i); 43 material->InputUpdateFromVectorDakota(vector, NameEnum,TypeEnum);43 material->InputUpdateFromVectorDakota(vector,name,type); 44 44 } 45 45 } 46 46 47 void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int* vector, int NameEnum, int TypeEnum){47 void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int* vector, int name, int type){ 48 48 49 49 int i; … … 52 52 for(i=0;i<elements->Size();i++){ 53 53 Element* element=(Element*)elements->GetObjectByOffset(i); 54 element->InputUpdateFromVectorDakota(vector, NameEnum,TypeEnum);54 element->InputUpdateFromVectorDakota(vector,name,type); 55 55 } 56 56 for(i=0;i<nodes->Size();i++){ 57 57 Node* node=(Node*)nodes->GetObjectByOffset(i); 58 node->InputUpdateFromVectorDakota(vector, NameEnum,TypeEnum);58 node->InputUpdateFromVectorDakota(vector,name,type); 59 59 } 60 60 for(i=0;i<loads->Size();i++){ 61 61 Load* load=(Load*)loads->GetObjectByOffset(i); 62 load->InputUpdateFromVectorDakota(vector, NameEnum,TypeEnum);62 load->InputUpdateFromVectorDakota(vector,name,type); 63 63 } 64 64 for(i=0;i<materials->Size();i++){ 65 65 Material* material=(Material*)materials->GetObjectByOffset(i); 66 material->InputUpdateFromVectorDakota(vector, NameEnum,TypeEnum);66 material->InputUpdateFromVectorDakota(vector,name,type); 67 67 } 68 68 } 69 69 70 void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,bool* vector, int NameEnum, int TypeEnum){70 void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,bool* vector, int name, int type){ 71 71 72 72 int i; … … 75 75 for(i=0;i<elements->Size();i++){ 76 76 Element* element=(Element*)elements->GetObjectByOffset(i); 77 element->InputUpdateFromVectorDakota(vector, NameEnum,TypeEnum);77 element->InputUpdateFromVectorDakota(vector,name,type); 78 78 } 79 79 for(i=0;i<nodes->Size();i++){ 80 80 Node* node=(Node*)nodes->GetObjectByOffset(i); 81 node->InputUpdateFromVectorDakota(vector, NameEnum,TypeEnum);81 node->InputUpdateFromVectorDakota(vector,name,type); 82 82 } 83 83 for(i=0;i<loads->Size();i++){ 84 84 Load* load=(Load*)loads->GetObjectByOffset(i); 85 load->InputUpdateFromVectorDakota(vector, NameEnum,TypeEnum);85 load->InputUpdateFromVectorDakota(vector,name,type); 86 86 } 87 87 for(i=0;i<materials->Size();i++){ 88 88 Material* material=(Material*)materials->GetObjectByOffset(i); 89 material->InputUpdateFromVectorDakota(vector, NameEnum,TypeEnum);89 material->InputUpdateFromVectorDakota(vector,name,type); 90 90 } 91 91 } -
issm/trunk/src/c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h
r5311 r7177 10 10 11 11 /* local prototypes: */ 12 void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,Vec vector, int NameEnum,int TypeEnum);13 void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,double* vector, int NameEnum,int TypeEnum);14 void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int* vector, int NameEnum,int TypeEnum);15 void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,bool* vector, int NameEnum,int TypeEnum);12 void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,Vec vector, int name,int type); 13 void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,double* vector, int name,int type); 14 void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int* vector, int name,int type); 15 void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,bool* vector, int name,int type); 16 16 17 17 #endif /* _UPDATEINPUTSFROMVECTORDAKOTAXX_H */ -
issm/trunk/src/c/modules/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp
r4573 r7177 9 9 #include "../../EnumDefinitions/EnumDefinitions.h" 10 10 11 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vec vector, int NameEnum, int TypeEnum){11 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vec vector, int name, int type){ 12 12 13 13 double* serial_vector=NULL; … … 15 15 VecToMPISerial(&serial_vector,vector); 16 16 17 InputUpdateFromVectorx( elements,nodes, vertices, loads, materials, parameters,serial_vector, NameEnum, TypeEnum);17 InputUpdateFromVectorx( elements,nodes, vertices, loads, materials, parameters,serial_vector,name, type); 18 18 19 19 /*Free ressources:*/ … … 22 22 23 23 24 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* vector, int NameEnum, int TypeEnum){24 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* vector, int name, int type){ 25 25 26 26 int i; … … 29 29 for(i=0;i<elements->Size();i++){ 30 30 Element* element=(Element*)elements->GetObjectByOffset(i); 31 element->InputUpdateFromVector(vector, NameEnum,TypeEnum);31 element->InputUpdateFromVector(vector,name,type); 32 32 } 33 33 for(i=0;i<nodes->Size();i++){ 34 34 Node* node=(Node*)nodes->GetObjectByOffset(i); 35 node->InputUpdateFromVector(vector, NameEnum,TypeEnum);35 node->InputUpdateFromVector(vector,name,type); 36 36 } 37 37 for(i=0;i<loads->Size();i++){ 38 38 Load* load=(Load*)loads->GetObjectByOffset(i); 39 load->InputUpdateFromVector(vector, NameEnum,TypeEnum);39 load->InputUpdateFromVector(vector,name,type); 40 40 } 41 41 for(i=0;i<materials->Size();i++){ 42 42 Material* material=(Material*)materials->GetObjectByOffset(i); 43 material->InputUpdateFromVector(vector, NameEnum,TypeEnum);43 material->InputUpdateFromVector(vector,name,type); 44 44 } 45 45 } 46 46 47 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int* vector, int NameEnum, int TypeEnum){47 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int* vector, int name, int type){ 48 48 49 49 int i; … … 52 52 for(i=0;i<elements->Size();i++){ 53 53 Element* element=(Element*)elements->GetObjectByOffset(i); 54 element->InputUpdateFromVector(vector, NameEnum,TypeEnum);54 element->InputUpdateFromVector(vector,name,type); 55 55 } 56 56 for(i=0;i<nodes->Size();i++){ 57 57 Node* node=(Node*)nodes->GetObjectByOffset(i); 58 node->InputUpdateFromVector(vector, NameEnum,TypeEnum);58 node->InputUpdateFromVector(vector,name,type); 59 59 } 60 60 for(i=0;i<loads->Size();i++){ 61 61 Load* load=(Load*)loads->GetObjectByOffset(i); 62 load->InputUpdateFromVector(vector, NameEnum,TypeEnum);62 load->InputUpdateFromVector(vector,name,type); 63 63 } 64 64 for(i=0;i<materials->Size();i++){ 65 65 Material* material=(Material*)materials->GetObjectByOffset(i); 66 material->InputUpdateFromVector(vector, NameEnum,TypeEnum);66 material->InputUpdateFromVector(vector,name,type); 67 67 } 68 68 } 69 69 70 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,bool* vector, int NameEnum, int TypeEnum){70 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,bool* vector, int name, int type){ 71 71 72 72 int i; … … 75 75 for(i=0;i<elements->Size();i++){ 76 76 Element* element=(Element*)elements->GetObjectByOffset(i); 77 element->InputUpdateFromVector(vector, NameEnum,TypeEnum);77 element->InputUpdateFromVector(vector,name,type); 78 78 } 79 79 for(i=0;i<nodes->Size();i++){ 80 80 Node* node=(Node*)nodes->GetObjectByOffset(i); 81 node->InputUpdateFromVector(vector, NameEnum,TypeEnum);81 node->InputUpdateFromVector(vector,name,type); 82 82 } 83 83 for(i=0;i<loads->Size();i++){ 84 84 Load* load=(Load*)loads->GetObjectByOffset(i); 85 load->InputUpdateFromVector(vector, NameEnum,TypeEnum);85 load->InputUpdateFromVector(vector,name,type); 86 86 } 87 87 for(i=0;i<materials->Size();i++){ 88 88 Material* material=(Material*)materials->GetObjectByOffset(i); 89 material->InputUpdateFromVector(vector, NameEnum,TypeEnum);89 material->InputUpdateFromVector(vector,name,type); 90 90 } 91 91 } -
issm/trunk/src/c/modules/InputUpdateFromVectorx/InputUpdateFromVectorx.h
r4236 r7177 10 10 11 11 /* local prototypes: */ 12 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,Vec vector, int NameEnum,int TypeEnum);13 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,double* vector, int NameEnum,int TypeEnum);14 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int* vector, int NameEnum,int TypeEnum);15 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,bool* vector, int NameEnum,int TypeEnum);12 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,Vec vector, int name,int type); 13 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,double* vector, int name,int type); 14 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int* vector, int name,int type); 15 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,bool* vector, int name,int type); 16 16 17 17 #endif /* _UPDATEINPUTSFROMVECTORXX_H */
Note:
See TracChangeset
for help on using the changeset viewer.