Changeset 4848 for issm/trunk

Timestamp:

07/28/10 15:56:13 (15 years ago)

Author:

seroussi

Message:

name in md.control_type

Location:

issm/trunk/src/m/classes/public

Files:

• display/displaycontrol.m (modified) (1 diff)
• ismodelselfconsistent.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'', or ''B'')');
+        fielddisplay(md,'control_type','parameter where inverse control is carried out; ex: ''drag_coefficient'', or ''rheology_B'')');
         fielddisplay(md,'weights','weights applied to the misfit of each node');
         fielddisplay(md,'nsteps','number of optimization searches');

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

@@ -347 +347 @@
         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')),
+                error('model not consistent: control_type should be rheology_B or drag_coefficient');
         end