Changeset 21499

Timestamp:

01/23/17 10:52:17 (8 years ago)

Author:

jbondzio

Message:

BUG: mesh.lat/long got overwritten during model collapse

Location:

issm/trunk-jpl/src/m/classes

Files:

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

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

@@ -308 +308 @@
                         end
 
-                        %lat long
-                        if numel(md.mesh.lat) ==md.mesh.numberofvertices,  md.mesh.lat=project2d(md,md.mesh.lat,1); end
-                        if numel(md.mesh.long)==md.mesh.numberofvertices, md.mesh.long=project2d(md,md.mesh.long,1); end
-
                         %Initialize with the 2d mesh
                         mesh=mesh2d();
@@ -319 +315 @@
                         mesh.numberofelements=md.mesh.numberofelements2d;
                         mesh.elements=md.mesh.elements2d;
+                        if numel(md.mesh.lat) ==md.mesh.numberofvertices,  mesh.lat=project2d(md,md.mesh.lat,1); end
+                        if numel(md.mesh.long)==md.mesh.numberofvertices,       mesh.long=project2d(md,md.mesh.long,1); end
+                        mesh.epsg=md.mesh.epsg;
                         if ~isnan(md.mesh.vertexonboundary), mesh.vertexonboundary=project2d(md,md.mesh.vertexonboundary,1); end
                         if ~isnan(md.mesh.elementconnectivity), mesh.elementconnectivity=project2d(md,md.mesh.elementconnectivity,1); end

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

@@ -757 +757 @@
                 md.mask.ice_levelset=project2d(md,md.mask.ice_levelset,1)
 
-                #lat long
-                if isinstance(md.mesh.lat,np.ndarray):
-                    if md.mesh.lat.size==md.mesh.numberofvertices:  md.mesh.lat=project2d(md,md.mesh.lat,1) 
-                if isinstance(md.mesh.long,np.ndarray):
-                    if md.mesh.long.size==md.mesh.numberofvertices: md.mesh.long=project2d(md,md.mesh.long,1) 
-
                 #Initialize with the 2d mesh
                 mesh=mesh2d()
@@ -772 +766 @@
                 if not np.isnan(md.mesh.vertexonboundary).all(): mesh.vertexonboundary=project2d(md,md.mesh.vertexonboundary,1)
                 if not np.isnan(md.mesh.elementconnectivity).all(): mesh.elementconnectivity=project2d(md,md.mesh.elementconnectivity,1)
+                if isinstance(md.mesh.lat,np.ndarray):
+                        if md.mesh.lat.size==md.mesh.numberofvertices:  mesh.lat=project2d(md,md.mesh.lat,1) 
+                if isinstance(md.mesh.long,np.ndarray):
+                        if md.mesh.long.size==md.mesh.numberofvertices: mesh.long=project2d(md,md.mesh.long,1) 
+                mesh.epsg=md.mesh.epsg
                 md.mesh=mesh