Changeset 19860 for issm/trunk-jpl/src/m/classes/mask.m

Timestamp:

12/05/15 22:58:08 (9 years ago)

Author:

Eric.Larour

Message:

CHG (JAVASCRIPT): fixed some issues with segfaults.

File:

• issm/trunk-jpl/src/m/classes/mask.m (modified) (3 diffs)

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

@@ -46 +46 @@
 
                         md = checkfield(md,'fieldname','mask.groundedice_levelset','size',[md.mesh.numberofvertices 1]);
-                        md = checkfield(md,'fieldname','mask.ice_levelset'        ,'size',[md.mesh.numberofvertices 1]);
+                        md = checkfield(md,'fieldname','mask.ice_levelset','forcing',1);
                         isice=(md.mask.ice_levelset<=0);
                         if sum(isice)==0,
@@ -56 +56 @@
                         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')),
-                                if strcmp(elementtype(md.mesh),'Tria'),
-                                        numberemptyelements=length(find(icefront==3));
-                                elseif strcmp(elementtype(md.mesh),'Penta')
-                                        numberemptyelements=length(find(icefront==6));
-                                end
-                                error([' ' num2str(numberemptyelements) ' have all nodes on ice front, change md.mask.ice_levelset to fix it'])
+                                error('At least one element has all nodes on ice front, change md.mask.ice_levelset to fix it')
                         end
                 end % }}}
@@ -72 +67 @@
                 function marshall(self,md,fid) % {{{
                         WriteData(fid,'object',self,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',self,'fieldname','ice_levelset','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',self,'fieldname','ice_levelset','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
 
                         % get mask of vertices of elements with ice
-                        isice=md.mask.ice_levelset<=0.;
-                        vlist = zeros(md.mesh.numberofvertices,1);
-                        if md.mesh.numberofelements==1,
-                                pos=find(sum(isice(md.mesh.elements),1)>0);
+                        if size(md.mask.ice_levelset,1)==md.mesh.numberofvertices,
+                                isice=md.mask.ice_levelset<=0.;
+                                vlist = zeros(md.mesh.numberofvertices,1);
+                                pos=find(sum(isice(md.mesh.elements),2)>0);
+                                vlist(md.mesh.elements(pos,:))=1;
+                                WriteData(fid,'data',vlist,'enum',IceMaskNodeActivationEnum(),'format','DoubleMat','mattype',1);
                         else
+                                isice=md.mask.ice_levelset(1:end-1,1)<=0.;
+                                vlist = zeros(md.mesh.numberofvertices,1);
                                 pos=find(sum(isice(md.mesh.elements),2)>0);
+                                vlist(md.mesh.elements(pos,:))=1;
+                                WriteData(fid,'data',vlist,'enum',IceMaskNodeActivationEnum(),'format','DoubleMat','mattype',1);
+                                save temp vlist;
                         end
-                        vlist(md.mesh.elements(pos,:))=1;
-                        WriteData(fid,'data',vlist,'enum',IceMaskNodeActivationEnum(),'format','DoubleMat','mattype',1);
 
                 end % }}}