Changeset 4804
- Timestamp:
- 07/26/10 09:46:03 (15 years ago)
- Location:
- issm/trunk/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/objects/Elements/Penta.cpp
r4797 r4804 1055 1055 /*Scale: */ 1056 1056 yinput->AXPY(xinput,scalar); 1057 1058 /*Move input to Material if required (needed if control method) TO BE IMPROVED*/ 1059 if (YEnum==RheologyBEnum){ 1060 this->matice->inputs->AddInput((Input*)yinput->copy()); 1061 } 1057 1062 } 1058 1063 /*}}}*/ -
issm/trunk/src/c/objects/Elements/Tria.cpp
r4780 r4804 1434 1434 /*Scale: */ 1435 1435 yinput->AXPY(xinput,scalar); 1436 1437 /*Move input to Material if required (needed if control method) TO BE IMPROVED*/ 1438 if (YEnum==RheologyBEnum){ 1439 this->matice->inputs->AddInput((Input*)yinput->copy()); 1440 } 1441 1436 1442 } 1437 1443 /*}}}*/ -
issm/trunk/src/m/solutions/control_core.m
r4565 r4804 57 57 scalar=search_scalar*optscal(n); 58 58 femmodel.elements=InputDuplicate(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,ControlParameterEnum,control_type); 59 femmodel.elements=InputAXPY(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type,scalar,GradientEnum);59 [femmodel.elements femmodel.materials]=InputAXPY(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type,scalar,GradientEnum); 60 60 61 61 displaystring('\n%s',[' constraning the new distribution...']); -
issm/trunk/src/m/solutions/objectivefunctionC.m
r4561 r4804 25 25 %Use search scalar to shoot parameter in the gradient direction: 26 26 scalar=search_scalar*optscal; 27 femmodel.elements=InputAXPY(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type,scalar,GradientEnum);27 [femmodel.elements femmodel.materials]=InputAXPY(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type,scalar,GradientEnum); 28 28 29 29 %Constrain: -
issm/trunk/src/mex/InputAXPY/InputAXPY.cpp
r4573 r4804 45 45 /*write output : */ 46 46 WriteData(ELEMENTSOUT,elements); 47 WriteData(MATERIALSOUT,materials); 47 48 48 49 /*Free ressources: */ -
issm/trunk/src/mex/InputAXPY/InputAXPY.h
r4694 r4804 29 29 /* serial output macros: */ 30 30 #define ELEMENTSOUT (mxArray**)&plhs[0] 31 #define MATERIALSOUT (mxArray**)&plhs[1] 31 32 32 33 /* serial arg counts: */ 33 34 #undef NLHS 34 #define NLHS 135 #define NLHS 2 35 36 #undef NRHS 36 37 #define NRHS 9
Note:
See TracChangeset
for help on using the changeset viewer.