Changeset 15943

Timestamp:

08/26/13 10:33:35 (12 years ago)

Author:

seroussi

Message:

CHG: added groundedice_levelset where missing

Location:

issm/trunk-jpl/src/m

Files:

• classes/mask.py (modified) (1 diff)
• classes/model/model.m (modified) (2 diffs)
• parameterization/setmask.m (modified) (1 diff)
• parameterization/setmask.py (modified) (1 diff)

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

@@ -44 +44 @@
                 md = checkfield(md,'mask.vertexonfloatingice' ,'size',[md.mesh.numberofvertices],'values',[0,1])
                 md = checkfield(md,'mask.vertexongroundedice' ,'size',[md.mesh.numberofvertices],'values',[0,1])
-                md = checkfield(md,'mask.icelevelset'         ,'size',[md.mesh.numberofvertices])
-                isice=numpy.array(md.mask.icelevelset>0,int)
+                md = checkfield(md,'mask.groundedice_levelset','size',[md.mesh.numberofvertices])
+                md = checkfield(md,'mask.ice_levelset'        ,'size',[md.mesh.numberofvertices])
+                isice=numpy.array(md.mask.ice_levelset>0,int)
                 totallyicefree=(numpy.sum(isice[md.mesh.elements-1],axis=1)==0).astype(int)
                 if any(totallyicefree):
-                        raise TypeError("elements with no ice not implemented yet, each element should have at least one vertex with md.mask.icelevelset > 0")
+                        raise TypeError("elements with no ice not implemented yet, each element should have at least one vertex with md.mask.ice_levelset > 0")
 
                 return md

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

@@ -216 +216 @@
                                 md.mask.vertexonrock=project2d(md,md.mask.vertexonrock,1);
                         end
-                        md.mask.icelevelset=project2d(md,md.mask.icelevelset,1);
+                        md.mask.groundedice_levelset=project2d(md,md.mask.groundedice_levelset,1);
+                        md.mask.ice_levelset=project2d(md,md.mask.ice_levelset,1);
 
                         %lat long
@@ -742 +743 @@
                         md.mask.vertexongroundedice=project3d(md,'vector',md.mask.vertexongroundedice,'type','node');
                         md.mask.vertexonrock=project3d(md,'vector',md.mask.vertexonrock,'type','node');
-                        md.mask.icelevelset=project3d(md,'vector',md.mask.icelevelset,'type','node');
+                        md.mask.groundedice_levelset=project3d(md,'vector',md.mask.ice_levelset,'type','node');
+                        md.mask.ice_levelset=project3d(md,'vector',md.mask.ice_levelset,'type','node');
                         if ~isnan(md.inversion.cost_functions_coefficients),md.inversion.cost_functions_coefficients=project3d(md,'vector',md.inversion.cost_functions_coefficients,'type','node');end;
                         if ~isnan(md.inversion.min_parameters),md.inversion.min_parameters=project3d(md,'vector',md.inversion.min_parameters,'type','node');end;

issm/trunk-jpl/src/m/parameterization/setmask.m

@@ -46 +46 @@
 md.mask.elementongroundedice=elementongroundedice;
 md.mask.vertexongroundedice=vertexongroundedice;
-md.mask.icelevelset=ones(md.mesh.numberofvertices,1);
+md.mask.ice_levelset=ones(md.mesh.numberofvertices,1);

issm/trunk-jpl/src/m/parameterization/setmask.py

@@ -46 +46 @@
         md.mask.elementongroundedice = elementongroundedice
         md.mask.vertexongroundedice = vertexongroundedice
-        md.mask.icelevelset = numpy.ones(md.mesh.numberofvertices,bool)
+        md.mask.ice_levelset = numpy.ones(md.mesh.numberofvertices,bool)
 
         return md