Changeset 4804

Timestamp:

07/26/10 09:46:03 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed CM B

Location:

issm/trunk/src

Files:

• c/objects/Elements/Penta.cpp (modified) (1 diff)
• c/objects/Elements/Tria.cpp (modified) (1 diff)
• m/solutions/control_core.m (modified) (1 diff)
• m/solutions/objectivefunctionC.m (modified) (1 diff)
• mex/InputAXPY/InputAXPY.cpp (modified) (1 diff)
• mex/InputAXPY/InputAXPY.h (modified) (1 diff)

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -1055 +1055 @@
         /*Scale: */
         yinput->AXPY(xinput,scalar);
+
+        /*Move input to Material if required (needed if control method) TO BE IMPROVED*/
+        if (YEnum==RheologyBEnum){
+                this->matice->inputs->AddInput((Input*)yinput->copy());
+        }
 }
 /*}}}*/

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -1434 +1434 @@
         /*Scale: */
         yinput->AXPY(xinput,scalar);
+
+        /*Move input to Material if required (needed if control method) TO BE IMPROVED*/
+        if (YEnum==RheologyBEnum){
+                this->matice->inputs->AddInput((Input*)yinput->copy());
+        }
+
 }
 /*}}}*/

issm/trunk/src/m/solutions/control_core.m

@@ -57 +57 @@
                 scalar=search_scalar*optscal(n);
                 femmodel.elements=InputDuplicate(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,ControlParameterEnum,control_type);
-                femmodel.elements=InputAXPY(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type,scalar,GradientEnum);
+                [femmodel.elements femmodel.materials]=InputAXPY(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type,scalar,GradientEnum);
 
                 displaystring('\n%s',['      constraning the new distribution...']);

issm/trunk/src/m/solutions/objectivefunctionC.m

@@ -25 +25 @@
 %Use search scalar to shoot parameter in the gradient direction:
 scalar=search_scalar*optscal;
-femmodel.elements=InputAXPY(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type,scalar,GradientEnum);
+[femmodel.elements femmodel.materials]=InputAXPY(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type,scalar,GradientEnum);
 
 %Constrain:

issm/trunk/src/mex/InputAXPY/InputAXPY.cpp

@@ -45 +45 @@
         /*write output : */
         WriteData(ELEMENTSOUT,elements);
+        WriteData(MATERIALSOUT,materials);
 
         /*Free ressources: */

issm/trunk/src/mex/InputAXPY/InputAXPY.h

@@ -29 +29 @@
 /* serial output macros: */
 #define ELEMENTSOUT (mxArray**)&plhs[0]
+#define MATERIALSOUT (mxArray**)&plhs[1]
 
 /* serial arg counts: */
 #undef NLHS
-#define NLHS  1
+#define NLHS  2
 #undef NRHS
 #define NRHS  9