Changeset 8590

Timestamp:

06/09/11 13:01:01 (14 years ago)

Author:

Mathieu Morlighem

Message:

preparing multiple onjective functions

File:

• issm/trunk/src/m/model/ismodelselfconsistent.m (modified) (2 diffs)

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -180 +180 @@
         %CONTROL TYPE
         num_controls=numel(md.control_type);
+        num_costfunc=size(md.cm_responses,2);
         checkvalues(md,{'control_type'},[DhDtEnum DragCoefficientEnum RheologyBbarEnum VxEnum VyEnum]);
 
         %LENGTH CONTROL FIELDS
-        fields={'maxiter','cm_responses','cm_jump'};
+        fields={'maxiter','cm_jump'};
         checksize(md,fields,[md.nsteps 1]);
+        fields={'cm_responses'};
+        checksize(md,fields,[md.nsteps num_costfunc]);
         fields={'optscal'};
         checksize(md,fields,[md.nsteps num_controls]);
@@ -191 +194 @@
 
         %RESPONSES
-        checkvalues(md,{'cm_responses'},[SurfaceAbsVelMisfitEnum SurfaceRelVelMisfitEnum SurfaceLogVelMisfitEnum SurfaceLogVxVyMisfitEnum SurfaceAverageVelMisfitEnum ThicknessAbsMisfitEnum]);
+        checkvalues(md,{'cm_responses'},...
+                [SurfaceAbsVelMisfitEnum SurfaceRelVelMisfitEnum SurfaceLogVelMisfitEnum SurfaceLogVxVyMisfitEnum SurfaceAverageVelMisfitEnum...
+                ThicknessAbsMisfitEnum]);
 
         %WEIGHTS
         fields={'weights'};
-        checksize(md,fields,[md.numberofnodes 1]);
+        checksize(md,fields,[md.numberofnodes num_costfunc]);
         checkgreater(md,fields,0);