Changeset 10276

Timestamp:

10/24/11 15:17:52 (13 years ago)

Author:

Mathieu Morlighem

Message:

recover cost functions and added support for stab =2 in prognostic

Location:

issm/trunk/src/m/classes

Files:

• balancethickness.m (modified) (2 diffs)
• model/model.m (modified) (1 diff)

issm/trunk/src/m/classes/balancethickness.m ¶

@@ -45 +45 @@
                         checkfield(md,'balancethickness.spcthickness','forcing',1);
                         checkfield(md,'balancethickness.thickening_rate','size',[md.mesh.numberofvertices 1],'NaN',1);
-                        checkfield(md,'balancethickness.stabilization','size',[1 1],'values',[0 1 3]);
+                        checkfield(md,'balancethickness.stabilization','size',[1 1],'values',[0 1 2 3]);
                 end % }}}
                 function disp(obj) % {{{
@@ -52 +52 @@
                         fielddisplay(obj,'spcthickness','thickness constraints (NaN means no constraint)');
                         fielddisplay(obj,'thickening_rate','ice thickening rate used in the mass conservation (dh/dt)');
-                        fielddisplay(obj,'stabilization','0->no, 1->artificial_diffusivity, 3->discontinuous Galerkin');
+                        fielddisplay(obj,'stabilization','0: None, 1: SU, 2: MacAyeal''s artificial diffusivity, 3:DG');
 
                 end % }}}

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

@@ -342 +342 @@
                                  if (structmd.control_type==147), md.inversion.control_parameters={'Thickeningrate'}; end
                          end
-                         if isfield(structmd,'cost_functions') & ismember(structmd.cm_responses(end,end),[165:170 383 388 389]),
+                         if isfield(structmd,'cm_responses') & ismember(structmd.cm_responses(end,end),[165:170 383 388 389]),
                                  pos=find(structmd.cm_responses==166); md.inversion.cost_functions(pos)=101;
                                  pos=find(structmd.cm_responses==167); md.inversion.cost_functions(pos)=102;