Changeset 2352

Timestamp:

09/29/09 11:34:11 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added some fields to constrain control method results (to be continued)

Location:

issm/trunk/src/m/classes

Files:

• @model/model.m (modified) (1 diff)
• @model/setdefaultparameters.m (modified) (2 diffs)
• public/display/displaycontrol.m (modified) (1 diff)

issm/trunk/src/m/classes/@model/model.m

@@ -190 +190 @@
         md.optscal=[];
         md.cm_noisedampening=0;
+        md.cm_mindampening=[];
+        md.cm_maxdampening=[];
         md.mincontrolconstraint=0;
         md.maxcontrolconstraint=0;

issm/trunk/src/m/classes/@model/setdefaultparameters.m

@@ -175 +175 @@
 md.optscal=50*ones(md.nsteps,1);
 
-%mincontrolconstraint is the minimum acceptable value of the
-%inversed parameter (B>0 for example)
-md.mincontrolconstraint=0;
-
-%maxcontrolconstraint is the maximum acceptable value of the
-%inversed parameter (drag<200 for example)
-md.maxcontrolconstraint=200;
-
 %several misfits can be used:
 %0 = absolute misfit
@@ -189 +181 @@
 md.fit=0*ones(md.nsteps,1);
 
-%cm_jump
+%cm_jump is used to speed up control method. When
+%misfit(1)/misfit(0) < md.cm_jump, we go directly to
+%the next step
 md.cm_jump=.7*ones(md.nsteps,1); %30 per cent decrement.
+
+%cm_mindampening stabilize the inversed parameter above
+%a given scalar with a given penalty. Not applied by default
+md.cm_mindampening=0;
+
+%cm_maxdampening stabilize the inversed parameter below
+%a given scalar with a given penalty. Not applied by default
+md.cm_maxdampening=0;
+
+%mincontrolconstraint is the minimum acceptable value of the
+%inversed parameter (B>0 for example)
+md.mincontrolconstraint=0;
+
+%maxcontrolconstraint is the maximum acceptable value of the
+%inversed parameter (drag<200 for example)
+md.maxcontrolconstraint=200;
 
 %eps_cm is a criteria to stop the control methods.

issm/trunk/src/m/classes/public/display/displaycontrol.m

@@ -19 +19 @@
         fielddisplay(md,'maxiter','maximum iterations during each optimization step');
         fielddisplay(md,'tolx','minimum tolerance which will stop one optimization search');
+        fielddisplay(md,'cm_mindampening','minimum acceptable value (first argument) of the inversed parameter before being penalized (second argument)');
+        fielddisplay(md,'cm_maxdampening','maximum acceptable value (first argument) of the inversed parameter before being penalized (second argument)');
         fielddisplay(md,'cm_noisedampening','noise dampening coefficient');
         fielddisplay(md,'mincontrolconstraint','minimum contraint for the controlled parameters');