Changeset 4391

Timestamp:

07/01/10 11:30:53 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed m/utils/Nightly/testsgetfields.m for CM

Location:

issm/trunk/src/m

Files:

• classes/@bamggeom/bamggeom.m (modified) (1 diff)
• classes/@bamgmesh/bamgmesh.m (modified) (1 diff)
• classes/@bamgmesh/subsasgn.m (modified) (2 diffs)
• classes/@bamgmesh/subsref.m (modified) (1 diff)
• utils/Nightly/testsgetfields.m (modified) (1 diff)

issm/trunk/src/m/classes/@bamggeom/bamggeom.m ¶

@@ -1 +1 @@
 function bg = bamggeom(varargin)
-%ICEFRONT - constructor for bamggeom object
+%BAMGGEOM - constructor for bamggeom object
 %
 %   Usage:

issm/trunk/src/m/classes/@bamgmesh/bamgmesh.m ¶

@@ -1 +1 @@
 function bm = bamgmesh(varargin)
-%ICEFRONT - constructor for bamgmesh object
+%BAMGMESH - constructor for bamgmesh object
 %
 %   Usage:

issm/trunk/src/m/classes/@bamgmesh/subsasgn.m ¶

@@ -1 @@
-function icefront = subsasgn(icefront,index,val)
+function bamgmesh = subsasgn(bamgmesh,index,val)
 %SUBSASGN - handles indexed assignments to objects
 %
@@ -6 +6 @@
 %
 %   Usage:
-%      icefront = subsasgn(icefront,index,val)
+%      bamgmesh = subsasgn(bamgmesh,index,val)
 %
 %   See also SUBSREF
 
-icefront=builtin('subsasgn',icefront,index,val);
+bamgmesh=builtin('subsasgn',bamgmesh,index,val);

issm/trunk/src/m/classes/@bamgmesh/subsref.m ¶

@@ -1 @@
-function icefront = subsref(icefront,index)
+function bamgmesh = subsref(bamgmesh,index)
 %SUBSREF - handles indexed references to objects
 %
 %   the first argument is the object and the second one a structure array
 %   Usage:
-%      icefront = subsref(icefront,index)
+%      bamgmesh = subsref(bamgmesh,index)
 % 
 %   See also SUBSASGN
 
-icefront=builtin('subsref',icefront,index);
+bamgmesh=builtin('subsref',bamgmesh,index);

issm/trunk/src/m/utils/Nightly/testsgetfields.m ¶

@@ -26 +26 @@
                 vel=zeros(md.numberofgrids,1);
                 vel(md.results.DiagnosticSolution.Vel.index)=md.results.DiagnosticSolution.Vel.value;
-                j=zeros(md.numberofgrids,1);
-                j(md.results.DiagnosticSolution.J.index)=md.results.DiagnosticSolution.J.value;
+                j=md.results.DiagnosticSolution.J;
                 parameter=zeros(md.numberofgrids,1);
-                parameter(md.results.DiagnosticSolution.parameter.index)=md.results.DiagnosticSolution.parameter.value;
+                if strcmpi(md.control_type,'rheology_B'),
+                        parameter(md.results.DiagnosticSolution.RheologyB.index)=md.results.DiagnosticSolution.RheologyB.value;
+                elseif strcmpi(md.control_type,'drag_coefficient'),
+                        parameter(md.results.DiagnosticSolution.DragCoefficient.index)=md.results.DiagnosticSolution.DragCoefficient.value;
+                else
+                        error('not implemented yet');
+                end
                 field_values={vel,j,parameter};
         elseif qmu,