Changeset 15946

Timestamp:

08/26/13 10:41:10 (12 years ago)

Author:

Mathieu Morlighem

Message:

CG: renaming icelevelset ice_levelset

Location:

issm/trunk-jpl/src/m

Files:

• boundaryconditions/SetIceShelfBC.m (modified) (2 diffs)
• boundaryconditions/SetIceShelfBC.py (modified) (2 diffs)
• boundaryconditions/SetMarineIceSheetBC.m (modified) (2 diffs)
• boundaryconditions/SetMarineIceSheetBC.py (modified) (2 diffs)
• plot/plot_icefront.m (modified) (2 diffs)

issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.m

@@ -35 +35 @@
 
 %Ice front position: 
-md.mask.icelevelset(find(nodeonicefront))=0;
+md.mask.ice_levelset(find(nodeonicefront))=0;
 
 %First find segments that are not completely on the front
@@ -43 +43 @@
         numbernodesfront=4;
 end
-segmentsfront=md.mask.icelevelset(md.mesh.segments(:,1:numbernodesfront))==0;
+segmentsfront=md.mask.ice_levelset(md.mesh.segments(:,1:numbernodesfront))==0;
 segments=find(sum(segmentsfront,2)~=numbernodesfront);
 %Find all nodes for these segments and spc them

issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.py

@@ -40 +40 @@
         #Icefront position
         pos=numpy.nonzero(nodeonicefront)[0]
-        md.mask.icelevelset[pos]=0
+        md.mask.ice_levelset[pos]=0
 
         #First find segments that are not completely on the front
@@ -47 +47 @@
         else:
                 numbernodesfront=4
-        if any(md.mask.icelevelset<=0):
-                values=md.mask.icelevelset[md.mesh.segments[:,0:-1]-1]
+        if any(md.mask.ice_levelset<=0):
+                values=md.mask.ice_levelset[md.mesh.segments[:,0:-1]-1]
                 segmentsfront=1-values
                 numpy.sum(segmentsfront,axis=1)!=numbernodesfront

issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.m

@@ -42 +42 @@
 
 %Position of ice front
-md.mask.icelevelset(find(vertexonicefront))=0;
+md.mask.ice_levelset(find(vertexonicefront))=0;
 
 %First find segments that are not completely on the front
@@ -50 +50 @@
         numbernodesfront=4;
 end
-segmentsfront=md.mask.icelevelset(md.mesh.segments(:,1:numbernodesfront))==0;
+segmentsfront=md.mask.ice_levelset(md.mesh.segments(:,1:numbernodesfront))==0;
 segments=find(sum(segmentsfront,2)~=numbernodesfront);
 %Find all nodes for these segments and spc them

issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.py

@@ -48 +48 @@
         #Position of ice front
         pos=numpy.nonzero(vertexonicefront)[0]
-        md.mask.icelevelset[pos]=0
+        md.mask.ice_levelset[pos]=0
 
         #First find segments that are not completely on the front
@@ -55 +55 @@
         else:
                 numbernodesfront=4
-        if any(md.mask.icelevelset<=0):
-                values=md.mask.icelevelset[md.mesh.segments[:,0:-1]-1]
+        if any(md.mask.ice_levelset<=0):
+                values=md.mask.ice_levelset[md.mesh.segments[:,0:-1]-1]
                 segmentsfront=1-values
                 numpy.sum(segmentsfront,axis=1)!=numbernodesfront

issm/trunk-jpl/src/m/plot/plot_icefront.m

@@ -12 +12 @@
 %process mesh and data
 [x y z elements is2d isplanet]=processmesh(md,[],options);
-ice=(md.mask.icelevelset>0);
-noice=(md.mask.icelevelset<=0);
-zeroice=(md.mask.icelevelset==0);
+ice=(md.mask.ice_levelset>0);
+noice=(md.mask.ice_levelset<=0);
+zeroice=(md.mask.ice_levelset==0);
 elementice=sum(ice(md.mesh.elements),2);
 elementnoice=sum(noice(md.mesh.elements),2);
@@ -33 +33 @@
         hold on;
 
-        %Plot zero icelevelset line
+        %Plot zero ice_levelset line
 
 else