Changeset 1899

Timestamp:

08/25/09 16:37:05 (16 years ago)

Author:

seroussi

Message:

added field control_analysis

Location:

issm/trunk/src/m/classes

Files:

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

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

@@ -174 +174 @@
 
         %Control
+        md.control_analysis=0;
         md.control_type='';
         md.nsteps=0;

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

@@ -10 +10 @@
 
 disp(sprintf('   Control solution parameters:\n'));
-
-fielddisplay(md,'control_type','parameter where inverse control is carried out; ex: ''drag'', or ''B'')');
-fielddisplay(md,'nsteps','number of optimization searches');
-fielddisplay(md,'optscal','scaling factor on gradient direction during optimization, for each optimization step');
-fielddisplay(md,'fit','''absolute: 0'', ''relative: 1'', or ''logarithmic: 2''. default is ''absolute: 0'', for each optimization steps');
-fielddisplay(md,'maxiter','maximum iterations during each optimization step');
-fielddisplay(md,'tolx','minimum tolerance which will stop one optimization search');
-fielddisplay(md,'mincontrolconstraint','minimum contraint for the controlled parameters');
-fielddisplay(md,'maxcontrolconstraint','maximum contraint for the controlled parameters');
-fielddisplay(md,'meanvel','velocity scaling factor when evaluating relative or logarithmic misfit');
-fielddisplay(md,'epsvel','for relative fit, avoids misfit becoming infinity, for logarithmic fit, threshold for velocity');
-fielddisplay(md,'plot','visualization of the results of each iteration yes -> 1 no -> 0. Default is 1');
+if md.control_analysis,
+        fielddisplay(md,'control_type','parameter where inverse control is carried out; ex: ''drag'', or ''B'')');
+        fielddisplay(md,'nsteps','number of optimization searches');
+        fielddisplay(md,'optscal','scaling factor on gradient direction during optimization, for each optimization step');
+        fielddisplay(md,'fit','''absolute: 0'', ''relative: 1'', or ''logarithmic: 2''. default is ''absolute: 0'', for each optimization steps');
+        fielddisplay(md,'maxiter','maximum iterations during each optimization step');
+        fielddisplay(md,'tolx','minimum tolerance which will stop one optimization search');
+        fielddisplay(md,'mincontrolconstraint','minimum contraint for the controlled parameters');
+        fielddisplay(md,'maxcontrolconstraint','maximum contraint for the controlled parameters');
+        fielddisplay(md,'meanvel','velocity scaling factor when evaluating relative or logarithmic misfit');
+        fielddisplay(md,'epsvel','for relative fit, avoids misfit becoming infinity, for logarithmic fit, threshold for velocity');
+        fielddisplay(md,'plot','visualization of the results of each iteration yes -> 1 no -> 0. Default is 1');
+else
+        disp(sprintf('         %s','no scheduled control. activate by doing md.control_analysis=1'));
+end