Changeset 8650

Timestamp:

06/16/11 14:47:20 (14 years ago)

Author:

Mathieu Morlighem

Message:

removed cm_noisedmp

Location:

issm/trunk/src/m

Files:

• classes/version/7.6/model.m (modified) (2 diffs)
• classes/version/7.7/model.m (modified) (2 diffs)
• model/display/displaycontrol.m (modified) (1 diff)
• model/ismodelselfconsistent.m (modified) (1 diff)
• model/marshall.m (modified) (1 diff)
• model/parametercontroloptimization.m (modified) (2 diffs)
• model/parameterization/parametercontrolB.m (modified) (3 diffs)
• model/parameterization/parametercontroldrag.m (modified) (3 diffs)

issm/trunk/src/m/classes/version/7.6/model.m

@@ -230 +230 @@
                  optscal=[];
                  eps_cm=0;
-                 cm_noisedmp=0;
                  cm_min=NaN;
                  cm_max=NaN;
@@ -399 +398 @@
                  num_control_type;
                  verbose_binary;
+                 cm_noisedmp;
                  % }}}
          end

issm/trunk/src/m/classes/version/7.7/model.m

@@ -230 +230 @@
                  optscal=[];
                  eps_cm=0;
-                 cm_noisedmp=0;
                  cm_min=NaN;
                  cm_max=NaN;
@@ -399 +398 @@
                  num_control_type;
                  verbose_binary;
+                 cm_noisedmp;
                  % }}}
          end

issm/trunk/src/m/model/display/displaycontrol.m

@@ -20 +20 @@
         fielddisplay(md,'tolx','minimum tolerance which will stop one optimization search');
         fielddisplay(md,'cm_jump','decrease threshold for misfit, default is 30%');
-        fielddisplay(md,'cm_noisedmp','noise dampening coefficient, 0 if not applied');
         fielddisplay(md,'cm_min','absolute minimum acceptable value of the inversed parameter');
         fielddisplay(md,'cm_max','absolute maximum acceptable value of the inversed parameter');

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

@@ -224 +224 @@
                 end
         end
-
-        %parameters
-        fields={'cm_noisedmp'};
-        checknan(md,fields);
 end
 %}}}

issm/trunk/src/m/model/marshall.m

@@ -170 +170 @@
 WriteData(fid,md.tolx,'Scalar','tolx');
 WriteData(fid,md.maxiter,'Mat','maxiter');
-WriteData(fid,md.cm_noisedmp,'Scalar','cm_noisedmp');
 WriteData(fid,md.cm_min,'Mat','cm_min');
 WriteData(fid,md.cm_max,'Mat','cm_max');

issm/trunk/src/m/model/parametercontroloptimization.m

@@ -3 +3 @@
 %
 %   It is possible to specify the number of steps, values for the
-%   minimum and maximum values of the drag, specify a noise dampening, the 
+%   minimum and maximum values of the drag, specify the 
 %   kind of fit to use or the the optscal.
 %   
@@ -29 +29 @@
 md2.cm_min=1;
 md2.eps_cm=NaN;
-md2.cm_noisedmp=0;
 md2.nsteps=getfieldvalue(options,'nsteps',5);
 md2.control_type=getfieldvalue(options,'md2.control_type',DragCoefficientEnum);

issm/trunk/src/m/model/parameterization/parametercontrolB.m

@@ -3 +3 @@
 %
 %   It is possible to specify the number of steps, values for the
-%   minimum and maximum values of B, specify a noise dampening, the 
+%   minimum and maximum values of B, the 
 %   kind of cm_responses to use or the the optscal.
 %   
@@ -11 +11 @@
 %   Example:
 %      md=parametercontrolB(md)
-%      md=parametercontrolB(md,'nsteps',20,'cm_noisedmp',10^-15,'cm_responses',0)
+%      md=parametercontrolB(md,'nsteps',20,'cm_responses',0)
 %      md=parametercontrolB(md,'cm_min',10,'cm_max',10^8,'cm_jump',0.99,'maxiter',20)
 %      md=parametercontrolB(md,eps_cm',10^-4,'optscal',[10^7 10^8])
@@ -58 +58 @@
 else
         md.cm_max=cm_max;
-end
-
-%cm_noisedmp
-cm_noisedmp=getfieldvalue(options,'cm_noisedmp',0);
-if (length(cm_noisedmp)~=1)
-        md.cm_noisedmp=0;
-else
-        md.cm_noisedmp=cm_noisedmp;
 end
 

issm/trunk/src/m/model/parameterization/parametercontroldrag.m

@@ -3 +3 @@
 %
 %   It is possible to specify the number of steps, values for the
-%   minimum and maximum values of the drag, specify a noise dampening, the 
+%   minimum and maximum values of the drag, the 
 %   kind of cm_responses to use or the the optscal.
 %   
@@ -11 +11 @@
 %   Example:
 %      md=parametercontroldrag(md)
-%      md=parametercontroldrag(md,'nsteps',20,'cm_noisedmp',10^-8,'cm_responses',0)
+%      md=parametercontroldrag(md,'nsteps',20,'cm_responses',0)
 %      md=parametercontroldrag(md,'cm_min',1,'cm_max',150,'cm_jump',0.99,'maxiter',20)
 %      md=parametercontroldrag(md,eps_cm',10^-4,'optscal',[10^7 10^8])
@@ -57 +57 @@
 else
         md.cm_max=cm_max;
-end
-
-%cm_noisedmp
-cm_noisedmp=getfieldvalue(options,'cm_noisedmp',0);
-if (length(cm_noisedmp)~=1)
-        md.cm_noisedmp=0;
-else
-        md.cm_noisedmp=cm_noisedmp;
 end