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

Timestamp:

10/08/10 16:49:12 (14 years ago)

Author:

Mathieu Morlighem

Message:

Prepared ISSM for multivariable CM, Added modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp

File:

• issm/trunk/src/c/solutions/control_core.cpp (modified) (4 diffs)

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

@@ -18 +18 @@
         /*parameters: */
         int     verbose=0;
-        int     control_type;
+        int     num_controls;
         int     nsteps;
         double  eps_cm;
@@ -28 +28 @@
         bool    qmu_analysis=false;
 
+        int*    control_type = NULL;
         double* responses=NULL;
         double* optscal=NULL;
@@ -48 +49 @@
         /*Recover parameters used throughout the solution:{{{1*/
         femmodel->parameters->FindParam(&nsteps,NStepsEnum);
-        femmodel->parameters->FindParam(&control_type,ControlTypeEnum);
+        femmodel->parameters->FindParam(&num_controls,NumControlsEnum);
+        femmodel->parameters->FindParam(&control_type,NULL,ControlTypeEnum);
         femmodel->parameters->FindParam(&responses,NULL,CmResponsesEnum);
         femmodel->parameters->FindParam(&optscal,NULL,OptScalEnum);
@@ -122 +124 @@
         /*some results not computed by steadystate_core or diagnostic_core: */
         if(!qmu_analysis){ //do not save this if we are running the control core from a qmu run!
-                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type); //the parameter itself!
+                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));
-                femmodel->results->AddObject(new StringExternalResult(femmodel->results->Size()+1,ControlTypeEnum,EnumToString(control_type),1,0));
+                //femmodel->results->AddObject(new StringExternalResult(femmodel->results->Size()+1,ControlTypeEnum,EnumToString(control_type),1,0));
         }
 
         cleanup_and_return:
         /*Free ressources: */
+        xfree((void**)&control_type);
         xfree((void**)&responses);
         xfree((void**)&optscal);