Changeset 9714 for issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m

Timestamp:

09/09/11 07:28:59 (14 years ago)

Author:

Mathieu Morlighem

Message:

moved some stuff to mesh

File:

• issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m (modified) (2 diffs)

issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m ¶

@@ -24 +24 @@
         end
         nodeinsideicefront=ContourToMesh(md.elements,md.x,md.y,icefrontfile,'node',2);
-        vertexonicefront=double(md.nodeonboundary & nodeinsideicefront);
+        vertexonicefront=double(md.mesh.vertexonboundary & nodeinsideicefront);
 else
         %Guess where the ice front is
         vertexonfloatingice=zeros(md.numberofnodes,1);
         vertexonfloatingice(md.elements(find(md.mask.elementonfloatingice),:))=1;
-        vertexonicefront=double(md.nodeonboundary & vertexonfloatingice);
+        vertexonicefront=double(md.mesh.vertexonboundary & vertexonfloatingice);
 end
-pos=find(md.nodeonboundary & ~vertexonicefront);
+pos=find(md.mesh.vertexonboundary & ~vertexonicefront);
 if isempty(pos),
         warning('SetMarineIceSheetBC warning: ice front all around the glacier, no dirichlet found. Dirichlet must be added manually')
@@ -53 +53 @@
 
 md.hydrology.spcwatercolumn=zeros(md.numberofnodes,2);
-pos=find(md.nodeonboundary); 
+pos=find(md.mesh.vertexonboundary); 
 md.hydrology.spcwatercolumn(pos,1)=1;
 
 %segment on Neumann (Ice Front)
-pos=find(vertexonicefront(md.segments(:,1)) | vertexonicefront(md.segments(:,2)));
+pos=find(vertexonicefront(md.mesh.segments(:,1)) | vertexonicefront(md.mesh.segments(:,2)));
 if (md.dim==2)
-        pressureload=md.segments(pos,:);
+        pressureload=md.mesh.segments(pos,:);
 elseif md.dim==3
-        pressureload_layer1=[md.segments(pos,1:2)  md.segments(pos,2)+md.numberofnodes2d  md.segments(pos,1)+md.numberofnodes2d  md.segments(pos,3)];
+        pressureload_layer1=[md.mesh.segments(pos,1:2)  md.mesh.segments(pos,2)+md.numberofnodes2d  md.mesh.segments(pos,1)+md.numberofnodes2d  md.mesh.segments(pos,3)];
         pressureload=[];
         for i=1:md.numlayers-1,