Changeset 23315

Timestamp:

09/18/18 18:50:58 (7 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing CoDiPack

File:

• issm/trunk-jpl/src/c/cores/controladm1qn3_core.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/cores/controladm1qn3_core.cpp

@@ -210 +210 @@
         double  *XL = NULL;
         double  *XU = NULL;
-        GetPassiveVectorFromControlInputsx(&XL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"lowerbound");
-        GetPassiveVectorFromControlInputsx(&XU,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"upperbound");
+        GetPassiveVectorFromControlInputsx(&XL,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"lowerbound");
+        GetPassiveVectorFromControlInputsx(&XU,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"upperbound");
 
         int N_add = 0;
@@ -521 +521 @@
 
         /*Get initial guess*/
-        Vector<double> *Xpetsc = NULL;
-
-        GetPassiveVectorFromControlInputsx(&Xpetsc,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"value");
-        X = Xpetsc->ToMPISerial();
-        Xpetsc->GetSize(&intn);
-        delete Xpetsc;
+        GetPassiveVectorFromControlInputsx(&X,&intn,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"value");
         //_assert_(intn==numberofvertices*num_controls);
 
@@ -606 +601 @@
                 aX[i] = reCast<IssmDouble>(X[i]); 
                 aG[i] = reCast<IssmDouble>(G[i]);
-                }
+        }
 
         ControlInputSetGradientx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,aG);