Changeset 13975 for issm/trunk/src/c/solutions/controltao_core.cpp

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/solutions/controltao_core.cpp (modified) (4 diffs)

issm/trunk/src/c/solutions/controltao_core.cpp

@@ -54 +54 @@
 
         /*Initialize TAO*/
-        TaoCreate(PETSC_COMM_WORLD,&tao);
+        TaoCreate(IssmComm::GetComm(),&tao);
         if(VerboseControl()) _pprintLine_("   Initializing the Toolkit for Advanced Optimization (TAO)");
         TaoSetFromOptions(tao);
@@ -99 +99 @@
         /*Clean up and return*/
         xDelete<int>(control_list);
+        xDelete<double>(user.J);
         xdelete(&X);
         TaoDestroy(&tao);
@@ -141 +142 @@
 
         /*Compute objective function*/
-        CostFunctionx(fcn,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
+        femmodel->CostFunctionx(fcn);
 
         /*Compute gradient*/
@@ -173 +174 @@
         /*Retrieve objective functions independently*/
         for(i=0;i<num_responses;i++){
-                Responsex(&f,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EnumToStringx(responses[i]),false,i);
+                femmodel->Responsex(&f,EnumToStringx(responses[i]),false,i);
                 _pprintString_(" "<<setw(12)<<setprecision(7)<<f);
         }