Changeset 13395 for issm/trunk/src/c/solutions/control_core.cpp

Timestamp:

09/19/12 09:32:34 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13393

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/solutions/control_core.cpp (modified) (4 diffs)

issm/trunk

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

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

@@ -4 +4 @@
 
 #include "../toolkits/toolkits.h"
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../shared/shared.h"
 #include "../io/io.h"
@@ -82 +82 @@
                 /*Display info*/
                 if(VerboseControl()) _pprintLine_("\n" << "   control method step " << n+1 << "/" << nsteps);
-                for(i=0;i<num_responses;i++) step_responses[i]=(int)responses[n*num_responses+i];
+                for(i=0;i<num_responses;i++) step_responses[i]=reCast<int,IssmDouble>(responses[n*num_responses+i]);
                 femmodel->parameters->SetParam(step_responses,1,num_responses,StepResponsesEnum);
                 
@@ -99 +99 @@
 
                 if(VerboseControl()) _pprintLine_("   optimizing along gradient direction");
-                optpars.maxiter=(int)maxiter[n]; optpars.cm_jump=cm_jump[n];
+                optpars.maxiter=reCast<int,IssmDouble>(maxiter[n]); optpars.cm_jump=cm_jump[n];
                 BrentSearch(&search_scalar,J+n,&optpars,&objectivefunction,&optargs);
 
@@ -115 +115 @@
         if(!dakota_analysis){ //do not save this if we are running the control core from a qmu run!
                 for(i=0;i<num_controls;i++) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type[i]);
-                femmodel->results->AddObject(new DoubleVecExternalResult(femmodel->results->Size()+1,JEnum,J,nsteps,1,0));
+
+                #ifdef _HAVE_ADOLC_
+                IssmPDouble* J_passive=xNew<IssmPDouble>(nsteps);
+                for(int i=0;i<nsteps;i++)J_passive[i]=reCast<IssmPDouble>(J[i]);
+                femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,JEnum,J_passive,nsteps,1,1,0));
+                xDelete<IssmPDouble>(J_passive);
+                #else
+                femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,JEnum,J,nsteps,1,1,0));
+                #endif
         }
 

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4