Changeset 16332

Timestamp:

10/08/13 10:04:17 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: preparing mesh2dvertical

Location:

issm/trunk-jpl/src/m

Files:

• classes/flowequation.m (modified) (1 diff)
• classes/geometry.m (modified) (2 diffs)
• classes/mesh2dvertical.m (modified) (1 diff)
• classes/stressbalance.m (modified) (2 diffs)
• mesh/bamg.m (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/flowequation.m ¶

@@ -94 +94 @@
                                         md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices 1],'values',[1:2]);
                                         md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements 1],'values',[1:2]);
+                                elseif strcmp(meshtype(md.mesh),'2Dvertical')
+                                        md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices 1],'values',[4]);
+                                        md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements 1],'values',[4]);
                                 elseif strcmp(meshtype(md.mesh),'3D'),
                                         md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices 1],'values',[0:8]);

issm/trunk-jpl/src/m/classes/geometry.m ¶

@@ -26 +26 @@
                 function md = checkconsistency(obj,md,solution,analyses) % {{{
 
+                        if strcmp(meshtype(md.mesh),'2Dvertical'),
+                                return;
+                        end
+
                         if (solution==TransientSolutionEnum() & md.transient.isgia) | (solution==GiaSolutionEnum()),
                                 md = checkfield(md,'geometry.thickness','forcing',1,'NaN',1,'>=',0);
@@ -51 +55 @@
                 end % }}}
                 function marshall(obj,md,fid) % {{{
+                        if strcmp(meshtype(md.mesh),'2Dvertical'),
+                                return;
+                        end
                         WriteData(fid,'data',obj.surface,'format','DoubleMat','mattype',1,'enum',SurfaceEnum());
                         WriteData(fid,'data',obj.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum(),'forcinglength',md.mesh.numberofvertices+1);

issm/trunk-jpl/src/m/classes/mesh2dvertical.m ¶

@@ -151 +151 @@
                         %element data
                         if (datasize(1)==md.mesh.numberofelements & datasize(2)==1),
-
-                                %Initialize datatype if non patch
-                                if datatype~=4 & datatype~=5,
-                                        datatype=1;
-                                end
+                                datatype=1;
 
                                 %Mask?

issm/trunk-jpl/src/m/classes/stressbalance.m ¶

@@ -81 +81 @@
                         md = checkfield(md,'stressbalance.spcvx','forcing',1);
                         md = checkfield(md,'stressbalance.spcvy','forcing',1);
-                        if strcmp(meshtype(md.mesh),'3D'), md = checkfield(md,'stressbalance.spcvz','forcing',1); end
+                        md = checkfield(md,'stressbalance.spcvz','forcing',1);
                         md = checkfield(md,'stressbalance.restol','size',[1 1],'>',0,'NaN',1);
                         md = checkfield(md,'stressbalance.reltol','size',[1 1]);
@@ -96 +96 @@
 
                         %singular solution
-                        if ~(any(~isnan(md.stressbalance.spcvx)) & any(~isnan(md.stressbalance.spcvy))),
+                        if ~(any(~isnan(md.stressbalance.spcvx)) | any(~isnan(md.stressbalance.spcvy))),
                                 md = checkmessage(md,['model is not well posed (singular). You need at least one node with fixed velocity!']);
                         end

issm/trunk-jpl/src/m/mesh/bamg.m ¶

@@ -37 +37 @@
 %   - verbose :           level of verbosity (default is 1)
 %
+%   - vertical :          is this a 2d vertical mesh (flowband, default is 0)
 %   - rifts :             followed by an ARGUS file that prescribes the rifts
 %   - toltip :            tolerance to move tip on an existing point of the domain outline
@@ -100 +101 @@
                 %update counter
                 count=count+nods;
+        end
+        if numel(getfieldvalue(options,'Markers',[]))==size(bamg_geometry.Edges,1),
+                bamg_geometry.Edges(:,3)=getfieldvalue(options,'Markers');
         end