Changeset 17811

Timestamp:

04/22/14 11:56:29 (11 years ago)

Author:

schlegel

Message:

BUG: collapse accesses 2d mesh fields that no longer exist

Location:

issm/trunk-jpl/src/m/classes

Files:

• model.m (modified) (1 diff)
• model.py (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/model.m

@@ -247 +247 @@
                         mesh.x=md.mesh.x2d;
                         mesh.y=md.mesh.y2d;
-                        mesh.z=zeros(size(md.mesh.x2d));
                         mesh.numberofvertices=md.mesh.numberofvertices2d;
                         mesh.numberofelements=md.mesh.numberofelements2d;
                         mesh.elements=md.mesh.elements2d;
                         md.mesh=mesh;
-
-                        %Keep a trace of lower and upper nodes
-                        md.mesh.lowervertex=NaN;
-                        md.mesh.uppervertex=NaN;
-                        md.mesh.lowerelements=NaN;
-                        md.mesh.upperelements=NaN;
-
-                        %Remove old mesh 
-                        md.mesh.x2d=NaN;
-                        md.mesh.y2d=NaN;
-                        md.mesh.elements2d=NaN;
-                        md.mesh.numberofelements2d=md.mesh.numberofelements;
-                        md.mesh.numberofvertices2d=md.mesh.numberofvertices;
-                        md.mesh.numberoflayers=0;
 
                 end % }}}

issm/trunk-jpl/src/m/classes/model.py

@@ -803 +803 @@
                 mesh.x=md.mesh.x2d
                 mesh.y=md.mesh.y2d
-                mesh.z=numpy.zeros_like(md.mesh.x2d)
                 mesh.numberofvertices=md.mesh.numberofvertices2d
                 mesh.numberofelements=md.mesh.numberofelements2d
@@ -809 +808 @@
                 md.mesh=mesh
 
-                #Keep a trace of lower and upper nodes
-                md.mesh.lowervertex=numpy.nan
-                md.mesh.uppervertex=numpy.nan
-                md.mesh.lowerelements=numpy.nan
-                md.mesh.upperelements=numpy.nan
-
-                #Remove old mesh 
-                md.mesh.x2d=numpy.nan
-                md.mesh.y2d=numpy.nan
-                md.mesh.elements2d=numpy.nan
-                md.mesh.numberofelements2d=md.mesh.numberofelements
-                md.mesh.numberofvertices2d=md.mesh.numberofvertices
-                md.mesh.numberoflayers=0
-
                 return md