Changeset 5359

Timestamp:

08/18/10 10:14:17 (15 years ago)

Author:

Mathieu Morlighem

Message:

Control_type is now an enum and moved RheologyB2d to RheologyBbar

Location:

issm/trunk/src/m/classes/public

Files:

• display/displaycontrol.m (modified) (1 diff)
• graddetection.m (modified) (1 diff)
• ismodelselfconsistent.m (modified) (1 diff)
• marshall.m (modified) (1 diff)
• parametercontroloptimization.m (modified) (1 diff)
• parameterization/parametercontrolB.m (modified) (1 diff)
• parameterization/parametercontroldrag.m (modified) (1 diff)
• tres.m (modified) (1 diff)

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

@@ -11 +11 @@
 disp(sprintf('   Control solution parameters:\n'));
 if md.control_analysis,
-        fielddisplay(md,'control_type','parameter where inverse control is carried out; ex: ''drag_coefficient'', or ''rheology_B'')');
+        fielddisplay(md,'control_type','parameter where inverse control is carried out; ex: DragCoefficientEnum, or RheologyBbarEnum)');
         fielddisplay(md,'weights','weights applied to the misfit of each node');
         fielddisplay(md,'nsteps','number of optimization searches');
         fielddisplay(md,'eps_cm','misfit convergence criterion. Default is 1%, NaN if not applied');
         fielddisplay(md,'optscal','scaling factor on gradient direction during optimization, for each optimization step');
-        fielddisplay(md,'fit','''absolute: 0'', ''relative: 1'', or ''logarithmic: 2''. for each optimization steps');
+        fielddisplay(md,'cmResponses','for each optimization steps: SurfaceVelAbsMisfitEnum, ...');
         fielddisplay(md,'maxiter','maximum iterations during each optimization step');
         fielddisplay(md,'tolx','minimum tolerance which will stop one optimization search');

issm/trunk/src/m/classes/public/graddetection.m

@@ -14 +14 @@
 
 %plug optimized parameter in model. 
-md2.(md2.results.DiagnosticAnalysis.control_type)=parameter1;
+md2.(EnumToModelField(md2.results.DiagnosticAnalysis.control_type))=parameter1;
 
 %put nsteps to 1: 

issm/trunk/src/m/classes/public/ismodelselfconsistent.m

@@ -343 +343 @@
 
         %CONTROL TYPE
-        if ~ischar(md.control_type),
-                error('model not consistent: control_type should be a string');
-        end
-        if ~(strcmpi(md.control_type,'rheology_B') | strcmpi(md.control_type,'drag_coefficient') | strcmpi(md.control_type,'dhdt')),
-                error('model not consistent: control_type should be rheology_B or drag_coefficient');
-        end
+        if ~isnumeric(md.control_type),
+                error('model not consistent: control_type should be an enum');
+        end
+        checkvalues(md,{'control_type'},[DhDtEnum DragCoefficientEnum RheologyBbarEnum]);
 
         %LENGTH CONTROL FIELDS

issm/trunk/src/m/classes/public/marshall.m

@@ -100 +100 @@
 %Control methods
 WriteData(fid,md.control_analysis,'Integer','control_analysis');
-WriteData(fid,md.control_type,'String','control_type');
+WriteData(fid,md.control_type,'Integer','control_type');
 
 %Write solution parameters

issm/trunk/src/m/classes/public/parametercontroloptimization.m

@@ -33 +33 @@
 md2.cm_mindmp_slope=0;
 md2.nsteps=getfieldvalue(options,'nsteps',5);
-md2.control_type=getfieldvalue(options,'md2.control_type','drag');
+md2.control_type=getfieldvalue(options,'md2.control_type',DragCoefficientEnum);
 md2.maxiter=10*ones(md2.nsteps,1);
 md2.cm_jump=0.99*ones(md2.nsteps,1);

issm/trunk/src/m/classes/public/parameterization/parametercontrolB.m

@@ -22 +22 @@
 
 %control type
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum;
 
 %weights

issm/trunk/src/m/classes/public/parameterization/parametercontroldrag.m

@@ -22 +22 @@
 
 %control type
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum;
 
 %weights

issm/trunk/src/m/classes/public/tres.m

@@ -40 +40 @@
         end
         if md.control_analysis==1,
-                md.(md.control_type)=PatchToVec(md.results.DiagnosticSolution.(md.results.DiagnosticSolution.ControlType));
+                if (md.control_type==DragCoefficientEnum)
+                        md.drag_coefficient=PatchToVec(md.results.DiagnosticSolution.(md.results.DiagnosticSolution.ControlType));
+                elseif (md.control_type==RheologyBbarEnum)
+                        md.rheology_B=PatchToVec(md.results.DiagnosticSolution.(md.results.DiagnosticSolution.ControlType));
+                elseif (md.control_type==DhDtEnum)
+                        md.dhdt=PatchToVec(md.results.DiagnosticSolution.(md.results.DiagnosticSolution.ControlType));
+                else
+                        error('control type not implemented yet')
+                end
         end
 elseif strcmpi(string,'dakota'),