Changeset 4070
- Timestamp:
- 06/21/10 11:23:49 (15 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/Makefile.am
r4067 r4070 412 412 ./modules/InputAXPYx/InputAXPYx.h\ 413 413 ./modules/InputAXPYx/InputAXPYx.cpp\ 414 ./modules/ ControlConstrainInputx/ControlConstrainInputx.h\415 ./modules/ ControlConstrainInputx/ControlConstrainInputx.cpp\414 ./modules/InputControlConstrainx/InputControlConstrainx.h\ 415 ./modules/InputControlConstrainx/InputControlConstrainx.cpp\ 416 416 ./modules/SurfaceAreax/SurfaceAreax.h\ 417 417 ./modules/SurfaceAreax/SurfaceAreax.cpp\ … … 933 933 ./modules/InputAXPYx/InputAXPYx.h\ 934 934 ./modules/InputAXPYx/InputAXPYx.cpp\ 935 ./modules/ ControlConstrainInputx/ControlConstrainInputx.h\936 ./modules/ ControlConstrainInputx/ControlConstrainInputx.cpp\935 ./modules/InputControlConstrainx/InputControlConstrainx.h\ 936 ./modules/InputControlConstrainx/InputControlConstrainx.cpp\ 937 937 ./modules/SurfaceAreax/SurfaceAreax.h\ 938 938 ./modules/SurfaceAreax/SurfaceAreax.cpp\ -
issm/trunk/src/c/modules/InputControlConstrainx/InputControlConstrainx.cpp
r4069 r4070 1 /*!\file ControlConstrainInputx1 /*!\file InputControlConstrainx 2 2 * \brief: Y=Y+aX operation on inputs. 3 3 */ 4 4 5 #include "./ ControlConstrainInputx.h"5 #include "./InputControlConstrainx.h" 6 6 #include "../../shared/shared.h" 7 7 #include "../../include/include.h" … … 9 9 #include "../../EnumDefinitions/EnumDefinitions.h" 10 10 11 void ControlConstrainInputx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int control_type,double cm_min, double cm_max){11 void InputControlConstrainx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int control_type,double cm_min, double cm_max){ 12 12 13 13 /*intermediary:*/ … … 23 23 for(i=0;i<elements->Size();i++){ 24 24 Element* element=(Element*)elements->GetObjectByOffset(i); 25 element-> ControlConstrainInput(control_type,cm_min,cm_max);25 element->InputControlConstrain(control_type,cm_min,cm_max); 26 26 } 27 27 } -
issm/trunk/src/c/modules/InputControlConstrainx/InputControlConstrainx.h
r4069 r4070 1 /*!\file: ControlConstrainInputx.h1 /*!\file: InputControlConstrainx.h 2 2 * \brief header file for field extrusion 3 3 */ … … 9 9 10 10 /* local prototypes: */ 11 void ControlConstrainInputx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int control_type,double cm_min, double cm_max);11 void InputControlConstrainx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int control_type,double cm_min, double cm_max); 12 12 13 13 #endif /* _ControlConstrainINPUTX_H */ -
issm/trunk/src/c/modules/modules.h
r4065 r4070 47 47 #include "./SurfaceAreax/SurfaceAreax.h" 48 48 #include "./CostFunctionx/CostFunctionx.h" 49 #include "./ ControlConstrainInputx/ControlConstrainInputx.h"49 #include "./InputControlConstrainx/InputControlConstrainx.h" 50 50 #include "./FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h" 51 51 #include "./FieldDepthAveragex/FieldDepthAveragex.h" -
issm/trunk/src/c/objects/Elements/Beam.cpp
r4067 r4070 1027 1027 } 1028 1028 /*}}}*/ 1029 /*FUNCTION Beam:: ControlConstrainInput(int control_type, double cm_min, double cm_max){{{1*/1030 void Beam:: ControlConstrainInput(int control_type, double cm_min, double cm_max){1029 /*FUNCTION Beam::InputControlConstrain(int control_type, double cm_min, double cm_max){{{1*/ 1030 void Beam::InputControlConstrain(int control_type, double cm_min, double cm_max){ 1031 1031 1032 1032 Input* input=NULL; -
issm/trunk/src/c/objects/Elements/Beam.h
r4067 r4070 97 97 void ScaleInput(int enum_type,double scale_factor); 98 98 void InputAXPY(int YEnum, double scalar, int XEnum); 99 void ControlConstrainInput(int control_type,double cm_min, double cm_max);99 void InputControlConstrain(int control_type,double cm_min, double cm_max); 100 100 void InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums); 101 101 -
issm/trunk/src/c/objects/Elements/Element.h
r4067 r4070 68 68 virtual void GetVectorFromInputs(Vec vector,int NameEnum)=0; 69 69 virtual void InputAXPY(int YEnum, double scalar, int XEnum)=0; 70 virtual void ControlConstrainInput(int control_type,double cm_min, double cm_max)=0;70 virtual void InputControlConstrain(int control_type,double cm_min, double cm_max)=0; 71 71 virtual void InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums)=0; 72 72 -
issm/trunk/src/c/objects/Elements/Penta.cpp
r4067 r4070 5280 5280 } 5281 5281 /*}}}*/ 5282 /*FUNCTION Penta:: ControlConstrainInput(int control_type, double cm_min, double cm_max){{{1*/5283 void Penta:: ControlConstrainInput(int control_type, double cm_min, double cm_max){5282 /*FUNCTION Penta::InputControlConstrain(int control_type, double cm_min, double cm_max){{{1*/ 5283 void Penta::InputControlConstrain(int control_type, double cm_min, double cm_max){ 5284 5284 5285 5285 Input* input=NULL; -
issm/trunk/src/c/objects/Elements/Penta.h
r4067 r4070 164 164 void ScaleInput(int enum_type,double scale_factor); 165 165 void InputAXPY(int YEnum, double scalar, int XEnum); 166 void ControlConstrainInput(int control_type,double cm_min, double cm_max);166 void InputControlConstrain(int control_type,double cm_min, double cm_max); 167 167 void InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums); 168 168 void GetVectorFromInputs(Vec vector,int NameEnum); -
issm/trunk/src/c/objects/Elements/Sing.cpp
r4067 r4070 726 726 } 727 727 /*}}}*/ 728 /*FUNCTION Sing:: ControlConstrainInput(int control_type, double cm_min, double cm_max){{{1*/729 void Sing:: ControlConstrainInput(int control_type, double cm_min, double cm_max){728 /*FUNCTION Sing::InputControlConstrain(int control_type, double cm_min, double cm_max){{{1*/ 729 void Sing::InputControlConstrain(int control_type, double cm_min, double cm_max){ 730 730 731 731 Input* input=NULL; -
issm/trunk/src/c/objects/Elements/Sing.h
r4067 r4070 97 97 void InputAXPY(int YEnum, double scalar, int XEnum); 98 98 void InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums); 99 void ControlConstrainInput(int control_type,double cm_min, double cm_max);99 void InputControlConstrain(int control_type,double cm_min, double cm_max); 100 100 101 101 -
issm/trunk/src/c/objects/Elements/Tria.cpp
r4067 r4070 5459 5459 } 5460 5460 /*}}}*/ 5461 /*FUNCTION Tria:: ControlConstrainInput(int control_type, double cm_min, double cm_max){{{1*/5462 void Tria:: ControlConstrainInput(int control_type, double cm_min, double cm_max){5461 /*FUNCTION Tria::InputControlConstrain(int control_type, double cm_min, double cm_max){{{1*/ 5462 void Tria::InputControlConstrain(int control_type, double cm_min, double cm_max){ 5463 5463 5464 5464 Input* input=NULL; -
issm/trunk/src/c/objects/Elements/Tria.h
r4067 r4070 143 143 void InputAXPY(int YEnum, double scalar, int XEnum); 144 144 void InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums); 145 void ControlConstrainInput(int control_type,double cm_min, double cm_max);145 void InputControlConstrain(int control_type,double cm_min, double cm_max); 146 146 void GetVectorFromInputs(Vec vector,int NameEnum); 147 147 -
issm/trunk/src/c/solutions/control_core.cpp
r4067 r4070 92 92 93 93 _printf_("%s"," constraining the new distribution..."); 94 ControlConstrainInputx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,cm_min,cm_max);94 InputControlConstrainx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,cm_min,cm_max); 95 95 96 96 _printf_("%s"," save new parameter..."); -
issm/trunk/src/c/solutions/objectivefunctionC.cpp
r4067 r4070 60 60 61 61 /*Constrain:*/ 62 ControlConstrainInputx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,cm_min,cm_max);62 InputControlConstrainx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,cm_min,cm_max); 63 63 64 64 /*Run diagnostic with updated inputs: */
Note:
See TracChangeset
for help on using the changeset viewer.