Changeset 21155

Timestamp:

08/24/16 11:02:56 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: 0 is now allowed in levelset

Location:

issm/trunk-jpl/src/m/classes

Files:

• mask.js (modified) (2 diffs)
• mask.m (modified) (1 diff)
• mask.py (modified) (1 diff)

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

@@ -19 +19 @@
                         fielddisplay(this,"ice_levelset","presence of ice if < 0, icefront position if = 0, no ice if > 0");
                 } //}}}
-        this.extrude = function(md) {//{{{
-            this.groundedice_levelset=project3d(md,'vector',this.groundedice_levelset,'type','node');
-            this.ice_levelset=project3d(md,'vector',this.ice_levelset,'type','node');
-            return this;
-        }//}}}
+                this.extrude = function(md) {//{{{
+                        this.groundedice_levelset=project3d(md,'vector',this.groundedice_levelset,'type','node');
+                        this.ice_levelset=project3d(md,'vector',this.ice_levelset,'type','node');
+                        return this;
+                }//}}}
                 this.classname = function () { //{{{
                         return "mask";
@@ -39 +39 @@
                                 console.log('no ice front provided');
                         }
-                                
-                        var icefront=NewArrayFill(md.mesh.numberofelements,0);
-                        for(var i=0;i<md.mesh.numberofelements;i++){
-                                for(var j=0;j<md.mesh.elements[0].length;j++){
-                                        icefront[i]+=(md.mask.ice_levelset[md.mesh.elements[i][j]-1]==0);
-                                }
-                        }
-                        if ((ArrayMax(icefront)==3 & (md.mesh.elementtype() == 'Tria')) | (ArrayMax(icefront)==6 & md.mesh.elementtype() == 'Penta')){
-                                if (md.mesh.elementtype()=='Tria'){
-                                        var pos=ArrayFindEqual(icefront,3); numberemptyelements=pos.length;
-                                }
-                                else if (md.mesh.elementtype() == 'Penta'){
-                                        var pos=ArrayFindEqual(icefront,6); numberemptyelements=pos.length;
-                                }
-                                throw Error(sprintf(" %i have all nodes on ice front, change md.mask.ice_levelset to fix it",numberemptyelements));
-                        }
                 } // }}}
                 this.marshall=function(md,prefix,fid) { //{{{

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

@@ -48 +48 @@
                                 disp('WARNING: no ice front provided');
                         end
-                        icefront=sum(md.mask.ice_levelset(md.mesh.elements)==0,2);
-                        if (max(icefront)==3 & strcmp(elementtype(md.mesh),'Tria')) | (max(icefront==6) & strcmp(elementtype(md.mesh),'Penta')),
-                                error('At least one element has all nodes on ice front, change md.mask.ice_levelset to fix it')
-                        end
                 end % }}}
                 function disp(self) % {{{

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

@@ -44 +44 @@
                         raise TypeError("no ice present in the domain")
 
-                icefront=numpy.sum(md.mask.ice_levelset[md.mesh.elements-1]==0,axis=1)
-                if (max(icefront)==3 and m.strcmp(md.mesh.elementtype(),'Tria')) or (max(icefront==6) and m.strcmp(md.mesh.elementtype(),'Penta')):
-                        raise TypeError("At least one element has all nodes on ice front, change md.mask.ice_levelset to fix it")
-
                 return md
         # }}}