Changeset 11708 for issm/branches/trunk-jpl-damage/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp

Timestamp:

03/14/12 14:15:28 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl through revision 11707 into branches/trunk-jpl-damage

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp (modified) (1 diff)

issm/branches/trunk-jpl-damage/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp

@@ -30 +30 @@
 
 }
-void ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vec gradient){
+void ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vector* gradient){
 
         /*Serialize gradient*/
         double* serial_gradient=NULL;
-        VecToMPISerial(&serial_gradient,gradient);
+        serial_gradient=gradient->ToMPISerial();
 
         ControlInputSetGradientx(elements,nodes,vertices, loads, materials, parameters,serial_gradient);