Changeset 16287

Timestamp:

10/02/13 20:30:24 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: starting new mesh class and removed planet since it is a model with a sphere mesh class

Location:

issm/trunk-jpl/src/m/classes

Files:

• mesh2d.m (added)
• mesh2d.py (added)
• model (deleted)
• model.m (copied) (copied from issm/trunk-jpl/src/m/classes/model/model.m )
• model.py (copied) (copied from issm/trunk-jpl/src/m/classes/model/model.py )
• spheremesh.m (moved) (moved from issm/trunk-jpl/src/m/classes/planetmesh.m ) (5 diffs)

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

@@ -1 @@
-%PLANETMESH class definition
+%SPHEREMESH class definition
 %
 %   Usage:
-%      planetmesh=planetmesh();
+%      spheremesh=spheremesh();
 
-classdef planetmesh
+classdef spheremesh
         properties (SetAccess=public) 
                 x                           = NaN;
@@ -23 +23 @@
         end
         methods
-                function obj = planetmesh(varargin) % {{{
+                function obj = spheremesh(varargin) % {{{
                         switch nargin
                                 case 0
@@ -42 +42 @@
                 function md = checkconsistency(obj,md,solution,analyses) % {{{
 
-                        md = checkfield(md,'planetmesh.x','NaN',1,'size',[md.planetmesh.numberofvertices 1]);
-                        md = checkfield(md,'planetmesh.y','NaN',1,'size',[md.planetmesh.numberofvertices 1]);
-                        md = checkfield(md,'planetmesh.z','NaN',1,'size',[md.planetmesh.numberofvertices 1]);
-                        md = checkfield(md,'planetmesh.r','NaN',1,'size',[md.planetmesh.numberofvertices 1]);
-                        md = checkfield(md,'planetmesh.theta','NaN',1,'size',[md.planetmesh.numberofvertices 1]);
-                        md = checkfield(md,'planetmesh.phi','NaN',1,'size',[md.planetmesh.numberofvertices 1]);
-                        md = checkfield(md,'planetmesh.elements','NaN',1,'>',0,'values',1:md.planetmesh.numberofvertices);
-                        if(md.planetmesh.dimension==2),
-                                md = checkfield(md,'planetmesh.elements','size',[md.planetmesh.numberofelements 3]);
+                        md = checkfield(md,'spheremesh.x','NaN',1,'size',[md.spheremesh.numberofvertices 1]);
+                        md = checkfield(md,'spheremesh.y','NaN',1,'size',[md.spheremesh.numberofvertices 1]);
+                        md = checkfield(md,'spheremesh.z','NaN',1,'size',[md.spheremesh.numberofvertices 1]);
+                        md = checkfield(md,'spheremesh.r','NaN',1,'size',[md.spheremesh.numberofvertices 1]);
+                        md = checkfield(md,'spheremesh.theta','NaN',1,'size',[md.spheremesh.numberofvertices 1]);
+                        md = checkfield(md,'spheremesh.phi','NaN',1,'size',[md.spheremesh.numberofvertices 1]);
+                        md = checkfield(md,'spheremesh.elements','NaN',1,'>',0,'values',1:md.spheremesh.numberofvertices);
+                        if(md.spheremesh.dimension==2),
+                                md = checkfield(md,'spheremesh.elements','size',[md.spheremesh.numberofelements 3]);
                         else
-                                md = checkfield(md,'planetmesh.elements','size',[md.planetmesh.numberofelements 6]);
+                                md = checkfield(md,'spheremesh.elements','size',[md.spheremesh.numberofelements 6]);
                         end
-                        if any(~ismember(1:md.planetmesh.numberofvertices,sort(unique(md.planetmesh.elements(:)))));
-                                md = checkmessage(md,'orphan nodes have been found. Check the planetmesh outline');
+                        if any(~ismember(1:md.spheremesh.numberofvertices,sort(unique(md.spheremesh.elements(:)))));
+                                md = checkmessage(md,'orphan nodes have been found. Check the spheremesh outline');
                         end
-                        md = checkfield(md,'planetmesh.dimension','values',[2 3]);
-                        md = checkfield(md,'planetmesh.numberoflayers','>=',0);
-                        md = checkfield(md,'planetmesh.numberofelements','>',0);
-                        md = checkfield(md,'planetmesh.numberofvertices','>',0);
-                        if (md.planetmesh.dimension==2),
-                                md = checkfield(md,'planetmesh.average_vertex_connectivity','>=',9,'message','''planetmesh.average_vertex_connectivity'' should be at least 9 in 2d');
+                        md = checkfield(md,'spheremesh.dimension','values',[2 3]);
+                        md = checkfield(md,'spheremesh.numberoflayers','>=',0);
+                        md = checkfield(md,'spheremesh.numberofelements','>',0);
+                        md = checkfield(md,'spheremesh.numberofvertices','>',0);
+                        if (md.spheremesh.dimension==2),
+                                md = checkfield(md,'spheremesh.average_vertex_connectivity','>=',9,'message','''spheremesh.average_vertex_connectivity'' should be at least 9 in 2d');
                         else
-                                md = checkfield(md,'planetmesh.average_vertex_connectivity','>=',24,'message','''planetmesh.average_vertex_connectivity'' should be at least 24 in 3d');
+                                md = checkfield(md,'spheremesh.average_vertex_connectivity','>=',24,'message','''spheremesh.average_vertex_connectivity'' should be at least 24 in 3d');
                         end
-                        md = checkfield(md,'planetmesh.elementconnectivity','size',[md.planetmesh.numberofelements 3],'NaN',1);
+                        md = checkfield(md,'spheremesh.elementconnectivity','size',[md.spheremesh.numberofelements 3],'NaN',1);
 
                         %Solution specific checks
@@ -72 +72 @@
                                 case MasstransportSolutionEnum(),
                                         if md.masstransport.stabilization==3,
-                                                md = checkfield(md,'planetmesh.dimension','values',2,'message','Discontinuous Galerkin only supported for 2d planetmeshes');
+                                                md = checkfield(md,'spheremesh.dimension','values',2,'message','Discontinuous Galerkin only supported for 2d spheremeshes');
                                         end
                                 case TransientSolutionEnum(),
                                         if md.transient.ismasstransport & md.masstransport.stabilization==3,
-                                                md = checkfield(md,'planetmesh.dimension','values',2,'message','Discontinuous Galerkin only supported for 2d planetmeshes');
+                                                md = checkfield(md,'spheremesh.dimension','values',2,'message','Discontinuous Galerkin only supported for 2d spheremeshes');
                                         end
                                 case ThermalSolutionEnum(),
-                                        md = checkfield(md,'planetmesh.dimension','values',3,'message','thermal solution only supported on 3d planetmeshes');
+                                        md = checkfield(md,'spheremesh.dimension','values',3,'message','thermal solution only supported on 3d spheremeshes');
                         end
                 end % }}}
@@ -97 +97 @@
 
                         disp(sprintf('\n      Properties:'));
-                        fielddisplay(obj,'dimension','planetmesh dimension (2d or 3d)');
+                        fielddisplay(obj,'dimension','spheremesh dimension (2d or 3d)');
                         fielddisplay(obj,'numberoflayers','number of extrusion layers');