Changeset 14151

Timestamp:

12/12/12 16:23:02 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: reverting back: icefront is never NaN

Location:

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

Files:

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

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

@@ -708 +708 @@
 
                         %in 3d, pressureload: [node1 node2 node3 node4 element]
-                        if ~isnan(md.diagnostic.icefront)
-                                pressureload_layer1=[md.diagnostic.icefront(:,1:2)  md.diagnostic.icefront(:,2)+md.mesh.numberofvertices2d  md.diagnostic.icefront(:,1)+md.mesh.numberofvertices2d  md.diagnostic.icefront(:,3:4)]; %Add two columns on the first layer 
-                                pressureload=[];
-                                for i=1:numlayers-1,
-                                        pressureload=[pressureload ;pressureload_layer1(:,1:4)+(i-1)*md.mesh.numberofvertices2d pressureload_layer1(:,5)+(i-1)*md.mesh.numberofelements2d pressureload_layer1(:,6)];
-                                end
-                                md.diagnostic.icefront=pressureload;
-                        end
+                        pressureload_layer1=[md.diagnostic.icefront(:,1:2)  md.diagnostic.icefront(:,2)+md.mesh.numberofvertices2d  md.diagnostic.icefront(:,1)+md.mesh.numberofvertices2d  md.diagnostic.icefront(:,3:4)]; %Add two columns on the first layer 
+                        pressureload=[];
+                        for i=1:numlayers-1,
+                                pressureload=[pressureload ;pressureload_layer1(:,1:4)+(i-1)*md.mesh.numberofvertices2d pressureload_layer1(:,5)+(i-1)*md.mesh.numberofelements2d pressureload_layer1(:,6)];
+                        end
+                        md.diagnostic.icefront=pressureload;
 
                         %connectivity

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

@@ -635 +635 @@
 
                 #in 3d, pressureload: [node1 node2 node3 node4 element]
-                if not numpy.any(numpy.isnan(md.diagnostic.icefront)):
-                        pressureload_layer1=numpy.hstack((md.diagnostic.icefront[:,0:2],md.diagnostic.icefront[:,1:2]+md.mesh.numberofvertices2d,md.diagnostic.icefront[:,0:1]+md.mesh.numberofvertices2d,md.diagnostic.icefront[:,2:4]))    #Add two columns on the first layer 
-                        pressureload=numpy.empty((0,6),int)
-                        for i in xrange(numlayers-1):
-                                pressureload=numpy.vstack((pressureload,numpy.hstack((pressureload_layer1[:,0:4]+i*md.mesh.numberofvertices2d,pressureload_layer1[:,4:5]+i*md.mesh.numberofelements2d,pressureload_layer1[:,5:6]))))
-                        md.diagnostic.icefront=pressureload
+                pressureload_layer1=numpy.hstack((md.diagnostic.icefront[:,0:2],md.diagnostic.icefront[:,1:2]+md.mesh.numberofvertices2d,md.diagnostic.icefront[:,0:1]+md.mesh.numberofvertices2d,md.diagnostic.icefront[:,2:4]))    #Add two columns on the first layer 
+                pressureload=numpy.empty((0,6),int)
+                for i in xrange(numlayers-1):
+                        pressureload=numpy.vstack((pressureload,numpy.hstack((pressureload_layer1[:,0:4]+i*md.mesh.numberofvertices2d,pressureload_layer1[:,4:5]+i*md.mesh.numberofelements2d,pressureload_layer1[:,5:6]))))
+                md.diagnostic.icefront=pressureload
 
                 #connectivity