Changeset 11708 for issm/branches/trunk-jpl-damage/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.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/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp (modified) (1 diff)

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

@@ -28 +28 @@
 }
 
-void SetControlInputsFromVectorx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vec vector){
+void SetControlInputsFromVectorx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vector* vector){
         
         double* serial_vector=NULL;
 
-        VecToMPISerial(&serial_vector,vector);
+        serial_vector=vector->ToMPISerial();
 
         SetControlInputsFromVectorx(elements,nodes, vertices, loads, materials, parameters,serial_vector);