Changeset 12878 for issm/branches/trunk-jpl-damage/src/c/solutions/controlrestart.cpp

Timestamp:

08/02/12 17:13:12 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 12877

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/solutions/controlrestart.cpp (modified) (2 diffs)

issm/branches/trunk-jpl-damage/src/c/solutions/controlrestart.cpp ¶

@@ -7 +7 @@
 #include "../EnumDefinitions/EnumDefinitions.h"
 
-void controlrestart(FemModel* femmodel,double* J){
+void controlrestart(FemModel* femmodel,IssmDouble* J){
 
         int      num_controls;
@@ -33 +33 @@
 
         /*Clean up and return*/
-        xfree((void**)&control_type);
+        xDelete<int>(control_type);
 }