Changeset 12477 for issm/trunk-jpl/src/c/solutions/control_core.cpp

Timestamp:

06/20/12 12:31:14 (13 years ago)

Author:

utke

Message:

type renames

File:

• issm/trunk-jpl/src/c/solutions/control_core.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/solutions/control_core.cpp

@@ -20 +20 @@
         int     num_controls,num_responses;
         int     nsteps;
-        double  tol_cm;
+        IssmDouble  tol_cm;
         bool    cm_gradient;
         int     dim;
@@ -28 +28 @@
 
         int*    control_type = NULL;
-        double* responses=NULL;
+        IssmDouble* responses=NULL;
         int*    step_responses=NULL;
-        double* maxiter=NULL;
-        double* cm_jump=NULL;
+        IssmDouble* maxiter=NULL;
+        IssmDouble* cm_jump=NULL;
                 
         /*intermediary: */
-        double  search_scalar=1;
+        IssmDouble  search_scalar=1;
         OptArgs optargs;
         OptPars optpars;
@@ -43 +43 @@
 
         /*output: */
-        double* J=NULL;
+        IssmDouble* J=NULL;
 
         /*Recover parameters used throughout the solution*/
@@ -70 +70 @@
 
         /*Initialize responses: */
-        J=xNew<double>(nsteps);
+        J=xNew<IssmDouble>(nsteps);
         step_responses=xNew<int>(num_responses);
                 
@@ -122 +122 @@
         xDelete<int>(control_type);
         xDelete<int>(step_responses);
-        xDelete<double>(maxiter);
-        xDelete<double>(responses);
-        xDelete<double>(cm_jump);
-        xDelete<double>(J);
+        xDelete<IssmDouble>(maxiter);
+        xDelete<IssmDouble>(responses);
+        xDelete<IssmDouble>(cm_jump);
+        xDelete<IssmDouble>(J);
 }