Changeset 8602

Timestamp:

06/10/11 13:44:57 (14 years ago)

Author:

Mathieu Morlighem

Message:

now, multiple responses is 'almost' feasable (serial)

Location:

issm/trunk/src/m

Files:

• enum/IntMatParamEnum.m (added)
• enum/NumResponsesEnum.m (added)
• enum/StepResponsesEnum.m (added)
• solutions/control_core.m (modified) (2 diffs)
• solutions/objectivefunctionC.m (modified) (2 diffs)

issm/trunk/src/m/solutions/control_core.m

@@ -7 +7 @@
 
         %recover parameters common to all solutions
-        nsteps=femmodel.parameters.NSteps;
         num_controls=femmodel.parameters.NumControls;
+        num_responses=femmodel.parameters.NumResponses;
+        responses=femmodel.parameters.CmResponses;
         control_type=femmodel.parameters.ControlType;
         solution_type=femmodel.parameters.SolutionType;
-        responses=femmodel.parameters.CmResponses;
+        nsteps=femmodel.parameters.NSteps;
         maxiter=femmodel.parameters.MaxIter;
         cm_jump=femmodel.parameters.CmJump;
@@ -41 +42 @@
 
                 issmprintf(VerboseControl(),['control method step ' num2str(n) '/' num2str(femmodel.parameters.NSteps)]);
-                [femmodel.elements,femmodel.loads]=InputUpdateFromConstant(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,responses(n),CmResponseEnum);
+                femmodel.parameters.StepResponses=responses(n,:);
 
                 %In case we are running a steady state control method, compute new temperature field using new parameter distribution: 

issm/trunk/src/m/solutions/objectivefunctionC.m

@@ -1 @@
-function J =objectivefunctionC(search_scalar,femmodel,n);
+function J =objectivefunctionC(search_scalar,femmodel);
 %OBJECTIVEFUNCTIONC - objective function that return a parameter for a certain function
 
 conserve_loads=true;
+J=0;
+
 %recover some parameters
-response=femmodel.parameters.CmResponses(n);
-analysis_type=femmodel.parameters.AnalysisType;
-solution_type=femmodel.parameters.SolutionType;
-isstokes=femmodel.parameters.IsStokes;
+num_responses = femmodel.parameters.NumResponses;
+responses     = femmodel.parameters.StepResponses;
+analysis_type = femmodel.parameters.AnalysisType;
+solution_type = femmodel.parameters.SolutionType;
+isstokes      = femmodel.parameters.IsStokes;
 
 %set current configuration
@@ -33 +36 @@
 
 %Compute misfit for this velocity field
-J=CostFunction(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials, femmodel.parameters,response);
+for i=1:num_responses
+        J=J+CostFunction(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials, femmodel.parameters,responses(i));
+end