Changeset 9393

Timestamp:

08/23/11 14:49:46 (14 years ago)

Author:

Mathieu Morlighem

Message:

Fixing bad size of cm_responses

Location:

issm/trunk/src/c

Files:

• modules/ModelProcessorx/Control/CreateParametersControl.cpp (modified) (1 diff)
• modules/ModelProcessorx/CreateParameters.cpp (modified) (2 diffs)
• objects/IoModel.cpp (modified) (1 diff)
• solutions/control_core.cpp (modified) (3 diffs)

issm/trunk/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp

@@ -44 +44 @@
                 /*Now, recover fit, optscal and maxiter as vectors: */
                 iomodel->FetchData(&control_type,&num_control_type,NULL,ControlTypeEnum);
-                iomodel->FetchData(&cm_responses,&nsteps,&num_control_type,CmResponsesEnum);
-                iomodel->FetchData(&cm_jump,&nsteps,&num_cm_responses,CmJumpEnum);
+                iomodel->FetchData(&cm_responses,&nsteps,&num_cm_responses,CmResponsesEnum);
+                iomodel->FetchData(&cm_jump,&nsteps,NULL,CmJumpEnum);
                 iomodel->FetchData(&optscal,NULL,NULL,OptscalEnum);
                 iomodel->FetchData(&maxiter,NULL,NULL,MaxiterEnum);

issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -14 +14 @@
 void CreateParameters(Parameters** pparameters,IoModel* iomodel,const int solution_type,int analysis_type,int analysis_counter){
         
-        int i;
-        
-        Parameters* parameters = NULL;
-
-        double*     requestedoutputs=NULL;
-        int      numoutputs=0;
+        int         i;
+        int         numoutputs;
+        Parameters *parameters       = NULL;
+        double     *requestedoutputs = NULL;
         
         if(*pparameters)return; //do not create parameters twice!
@@ -30 +28 @@
         parameters->AddObject(new IntParam(AnalysisTypeEnum,analysis_type));
         parameters->AddObject(new IntParam(AnalysisCounterEnum,analysis_counter));
-
-        parameters->AddObject(new DoubleParam(TimeEnum,0.0));  //start at time 0 by default for all solutions.
+        parameters->AddObject(new DoubleParam(TimeEnum,0.0));  //start at time 0 by default for all solutions
 
         /*Requested output?*/

issm/trunk/src/c/objects/IoModel.cpp

@@ -62 +62 @@
         this->loadcounter=0;
         this->constraintcounter=0;
-
 
 }

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

@@ -45 +45 @@
         double* J=NULL;
 
-        /*Recover parameters used throughout the solution:{{{1*/
+        /*Recover parameters used throughout the solution*/
         femmodel->parameters->FindParam(&num_controls,NumControlTypeEnum);
         femmodel->parameters->FindParam(&num_responses,NumCmResponsesEnum);
@@ -60 +60 @@
         femmodel->parameters->FindParam(&isstokes,IsstokesEnum);
         femmodel->parameters->FindParam(&qmu_analysis,QmuAnalysisEnum);
-        /*}}}*/
 
         /*out of solution_type, figure out solution core and adjoint function pointer*/
@@ -87 +86 @@
                 
                 /*In case we are running a steady state control method, compute new temperature field using new parameter distribution: */
-                if (solution_type==SteadystateSolutionEnum) solutioncore(femmodel);
+                if(solution_type==SteadystateSolutionEnum) solutioncore(femmodel);
 
                 _printf_(VerboseControl(),"%s\n","   compute adjoint state:");
                 adjointcore(femmodel);
-        
                 gradient_core(femmodel,n,search_scalar);