Index: /issm/trunk-jpl/src/m/classes/mesh2d.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/mesh2d.m (revision 18557)
+++ /issm/trunk-jpl/src/m/classes/mesh2d.m (revision 18558)
@@ -8,24 +8,46 @@
x = NaN;
y = NaN;
- elements = NaN
+ elements = NaN;
numberofelements = 0;
numberofvertices = 0;
numberofedges = 0;
- lat = NaN
- long = NaN
- hemisphere = NaN
+ lat = NaN;
+ long = NaN;
+ epsg = 0;
- vertexonboundary = NaN
+ vertexonboundary = NaN;
- edges = NaN
- segments = NaN
- segmentmarkers = NaN
- vertexconnectivity = NaN
- elementconnectivity = NaN
+ edges = NaN;
+ segments = NaN;
+ segmentmarkers = NaN;
+ vertexconnectivity = NaN;
+ elementconnectivity = NaN;
average_vertex_connectivity = 0;
- extractedvertices = NaN
- extractedelements = NaN
+ extractedvertices = NaN;
+ extractedelements = NaN;
+ end
+ methods (Static)
+ function self = loadself(self) % {{{
+ % This function is directly called by matlab when a model selfect is
+ % loaded. Update old properties here
+
+ %2014 Oct. 1st
+ if isstruct(self),
+ oldself=self;
+ %Assign property values from struct
+ self=structtoself(mesh2d(),oldself)
+ if isfield(oldself,'hemisphere'),
+ disp('md.mesh.hemisphere has been automatically converted to EPSG code');
+ if strcmpi(oldself.hemisphere,'n'),
+ self.epsg=3413;
+ else
+ self.epsg=3031;
+ end
+ end
+ end
+
+ end% }}}
end
methods
@@ -102,48 +124,48 @@
fielddisplay(obj,'lat','vertices latitude [degrees]');
fielddisplay(obj,'long','vertices longitude [degrees]');
- fielddisplay(obj,'hemisphere','Indicate hemisphere ''n'' or ''s'' ');
+ fielddisplay(obj,'epsg','EPSG code (ex: 3413 for UPS Greenland, 3031 for UPS Antarctica)');
end % }}}
- function createxml(obj,fid) % {{{
- fprintf(fid, '\n');
-
- %elements and vertices
- fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' ',' number of elements ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' ',' number of vertices ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' ',' vertex indices of the mesh elements ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices x coordinate [m] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices y coordinate [m] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' edges of the 2d mesh (vertex1 vertex2 element1 element2) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number of edges of the 2d mesh ',' ');
- fprintf(fid,'%s\n%s\n','');
-
- % properties
- fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices on the boundary of the domain flag list ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' edges on domain boundary (vertex1 vertex2 element) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number associated to each segment ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' list of vertices connected to vertex_i ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' list of vertices connected to element_i ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' average number of vertices connected to one vertex ',' ');
- fprintf(fid,'%s\n%s\n','');
-
- %extracted model
- fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices extracted from the model ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' elements extracted from the model ',' ');
- fprintf(fid,'%s\n%s\n','');
-
- %projection
- fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices latitude [degrees] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' verticies longitude [degrees] ',' ');
- % choice (hemisphere) 'n' or 's'
- fprintf(fid,'%s\n%s\n%s\n',' ',' ',' Indicate hemisphere ''n'' or ''s'' ');
- fprintf(fid,'%s\n',' ');
- fprintf(fid,'%s\n',' ');
- fprintf(fid,'%s\n',' ');
- fprintf(fid,'%s\n%s\n','');
-
- end % }}}
+ function createxml(obj,fid) % {{{
+ fprintf(fid, '\n');
+
+ %elements and vertices
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' ',' number of elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' ',' number of vertices ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' ',' vertex indices of the mesh elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices x coordinate [m] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices y coordinate [m] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' edges of the 2d mesh (vertex1 vertex2 element1 element2) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number of edges of the 2d mesh ',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ % properties
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices on the boundary of the domain flag list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' edges on domain boundary (vertex1 vertex2 element) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number associated to each segment ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' list of vertices connected to vertex_i ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' list of vertices connected to element_i ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' average number of vertices connected to one vertex ',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ %extracted model
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices extracted from the model ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' elements extracted from the model ',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ %projection
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices latitude [degrees] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' verticies longitude [degrees] ',' ');
+ % choice (epsg) 'n' or 's'
+ fprintf(fid,'%s\n%s\n%s\n',' ',' ',' Indicate epsg ''n'' or ''s'' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ end % }}}
function marshall(obj,md,fid) % {{{
WriteData(fid,'enum',DomainTypeEnum(),'data',StringToEnum(['Domain' domaintype(obj)]),'format','Integer');
Index: /issm/trunk-jpl/src/m/classes/mesh2d.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/mesh2d.py (revision 18557)
+++ /issm/trunk-jpl/src/m/classes/mesh2d.py (revision 18558)
@@ -24,5 +24,5 @@
self.lat = float('NaN');
self.long = float('NaN');
- self.hemisphere = float('NaN');
+ self.epsg = 0;
self.vertexonboundary = float('NaN');
@@ -68,5 +68,5 @@
string="%s\n%s"%(string,fielddisplay(self,"lat","vertices latitude [degrees]"))
string="%s\n%s"%(string,fielddisplay(self,"long","vertices longitude [degrees]"))
- string="%s\n%s"%(string,fielddisplay(self,"hemisphere","Indicate hemisphere 'n' or 's'"))
+ string="%s\n%s"%(string,fielddisplay(self,"epsg","EPSG code (ex: 3413 for UPS Greenland, 3031 for UPS Antarctica)"))
return string
#}}}
Index: /issm/trunk-jpl/src/m/classes/mesh2dvertical.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/mesh2dvertical.m (revision 18557)
+++ /issm/trunk-jpl/src/m/classes/mesh2dvertical.m (revision 18558)
@@ -8,58 +8,80 @@
x = NaN;
y = NaN;
- elements = NaN
+ elements = NaN;
numberofelements = 0;
numberofvertices = 0;
numberofedges = 0;
- lat = NaN
- long = NaN
- hemisphere = NaN
-
- vertexonboundary = NaN
- vertexonbase = NaN
- vertexonsurface = NaN
-
- edges = NaN
- segments = NaN
- segmentmarkers = NaN
- vertexconnectivity = NaN
- elementconnectivity = NaN
+ lat = NaN;
+ long = NaN;
+ epsg = NaN;
+
+ vertexonboundary = NaN;
+ vertexonbase = NaN;
+ vertexonsurface = NaN;
+
+ edges = NaN;
+ segments = NaN;
+ segmentmarkers = NaN;
+ vertexconnectivity = NaN;
+ elementconnectivity = NaN;
average_vertex_connectivity = 0;
end
+ methods (Static)
+ function self = loadself(self) % {{{
+ % This function is directly called by matlab when a model selfect is
+ % loaded. Update old properties here
+
+ %2014 Oct. 1st
+ if isstruct(self),
+ oldself=self;
+ %Assign property values from struct
+ self=structtoself(mesh2dvertical(),oldself)
+ if isfield(oldself,'hemisphere'),
+ disp('md.mesh.hemisphere has been automatically converted to EPSG code');
+ if strcmpi(oldself.hemisphere,'n'),
+ self.epsg=3413;
+ else
+ self.epsg=3031;
+ end
+ end
+ end
+
+ end% }}}
+ end
methods
- function createxml(obj,fid) % {{{
- fprintf(fid, '\n');
-
- %elements and vertices
- fprintf(fid,'%s\n%s\n%s\n',' ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of elements ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of vertices ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' vertex indices of the mesh elements ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices x coordinate [m] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices y coordinate [m] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' edges of the 2d mesh (vertex1 vertex2 element1 element2) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number of edges of the 2d mesh ',' ');
- fprintf(fid,'%s\n%s\n',' ');
-
- % properties
- fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices on the boundary of the domain flag list ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices on the bed of the domain flag list ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' edges on domain boundary (vertex1 vertex2 element) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number associated to each segment ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' list of vertices connected to vertex_i ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' list of vertices connected to element_i ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' average number of vertices connected to one vertex ',' ');
- fprintf(fid,'%s\n%s\n','');
-
- %projection
- fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices latitude [degrees] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' verticies longitude [degrees] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' ',' Indicate hemisphere ''n'' or ''s'' ',' ');
- fprintf(fid,'%s\n%s\n','');
-
- end % }}}
+ function createxml(obj,fid) % {{{
+ fprintf(fid, '\n');
+
+ %elements and vertices
+ fprintf(fid,'%s\n%s\n%s\n',' ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of vertices ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' vertex indices of the mesh elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices x coordinate [m] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices y coordinate [m] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' edges of the 2d mesh (vertex1 vertex2 element1 element2) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number of edges of the 2d mesh ',' ');
+ fprintf(fid,'%s\n%s\n',' ');
+
+ % properties
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices on the boundary of the domain flag list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices on the bed of the domain flag list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' edges on domain boundary (vertex1 vertex2 element) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number associated to each segment ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' list of vertices connected to vertex_i ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' list of vertices connected to element_i ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' average number of vertices connected to one vertex ',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ %projection
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices latitude [degrees] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' verticies longitude [degrees] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' ',' Indicate epsg ''n'' or ''s'' ',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ end % }}}
function obj = mesh2dvertical(varargin) % {{{
switch nargin
@@ -134,5 +156,5 @@
fielddisplay(obj,'lat','vertices latitude [degrees]');
fielddisplay(obj,'long','vertices longitude [degrees]');
- fielddisplay(obj,'hemisphere','Indicate hemisphere ''n'' or ''s'' ');
+ fielddisplay(obj,'epsg','EPSG code (ex: 3413 for UPS Greenland, 3031 for UPS Antarctica)');
end % }}}
function marshall(obj,md,fid) % {{{
Index: /issm/trunk-jpl/src/m/classes/mesh3dprisms.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/mesh3dprisms.m (revision 18557)
+++ /issm/trunk-jpl/src/m/classes/mesh3dprisms.m (revision 18558)
@@ -8,89 +8,111 @@
x = NaN;
y = NaN;
- z = NaN
- elements = NaN
+ z = NaN;
+ elements = NaN;
numberoflayers = 0;
numberofelements = 0;
numberofvertices = 0;
- lat = NaN
- long = NaN
- hemisphere = NaN
-
- vertexonbase = NaN
- vertexonsurface = NaN
- lowerelements = NaN
- lowervertex = NaN
- upperelements = NaN
- uppervertex = NaN
- vertexonboundary = NaN
-
- vertexconnectivity = NaN
- elementconnectivity = NaN
+ lat = NaN;
+ long = NaN;
+ epsg = 0;
+
+ vertexonbase = NaN;
+ vertexonsurface = NaN;
+ lowerelements = NaN;
+ lowervertex = NaN;
+ upperelements = NaN;
+ uppervertex = NaN;
+ vertexonboundary = NaN;
+
+ vertexconnectivity = NaN;
+ elementconnectivity = NaN;
average_vertex_connectivity = 0;
- x2d = NaN
- y2d = NaN
- elements2d = NaN
+ x2d = NaN;
+ y2d = NaN;
+ elements2d = NaN;
numberofvertices2d = 0;
numberofelements2d = 0;
- extractedvertices = NaN
- extractedelements = NaN
+ extractedvertices = NaN;
+ extractedelements = NaN;
+ end
+ methods (Static)
+ function self = loadself(self) % {{{
+ % This function is directly called by matlab when a model selfect is
+ % loaded. Update old properties here
+
+ %2014 Oct. 1st
+ if isstruct(self),
+ oldself=self;
+ %Assign property values from struct
+ self=structtoself(mesh3dprisms(),oldself)
+ if isfield(oldself,'hemisphere'),
+ disp('md.mesh.hemisphere has been automatically converted to EPSG code');
+ if strcmpi(oldself.hemisphere,'n'),
+ self.epsg=3413;
+ else
+ self.epsg=3031;
+ end
+ end
+ end
+
+ end% }}}
end
methods
- function createxml(obj,fid) % {{{
- fprintf(fid, '\n');
-
- % Elements and verticies of the original 2d mesh
- fprintf(fid,'%s\n%s\n%s\n',' ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of elements ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of vertices ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' vertex indices of the mesh elements ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices x coordinate [m] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices y coordinate [m] ',' ');
- fprintf(fid,'%s\n%s\n',' ');
-
- % Elements and vertices of the extruded 3d mesh
- fprintf(fid,'%s\n%s\n%s\n',' ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of elements ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of vertices ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' vertex indices of the mesh elements ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices x coordinate [m] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices y coordinate [m] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices z coordinate [m] ',' ');
- fprintf(fid,'%s\n%s\n',' ');
-
- % properties
- fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number of extrusion layers ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower vertices flags list ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower elements flags list ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper vertices flags list ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper elements flags list ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper vertex list (NaN for vertex on the upper surface) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper element list (NaN for element on the upper layer) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower vertex list (NaN for vertex on the lower surface) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' element list (NaN for element on the lower layer) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices on the boundary of the domain flag list ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' list of vertices connected to vertex_i ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' average number of vertices connected to one vertex ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' average number of vertices connected to one vertex ',' ');
- fprintf(fid,'%s\n%s\n','');
-
- % Extracted model
- fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices extracted from the model ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' elements extracted from the model ',' ');
- fprintf(fid,'%s\n%s\n','');
-
- % Projection
- fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices latitude [degrees] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' verticies longitude [degrees] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' ',' Indicate hemisphere ''n'' or ''s'' ',' ');
- fprintf(fid,'%s\n%s\n','');
-
- end % }}}cd
+ function createxml(obj,fid) % {{{
+ fprintf(fid, '\n');
+
+ % Elements and verticies of the original 2d mesh
+ fprintf(fid,'%s\n%s\n%s\n',' ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of vertices ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' vertex indices of the mesh elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices x coordinate [m] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices y coordinate [m] ',' ');
+ fprintf(fid,'%s\n%s\n',' ');
+
+ % Elements and vertices of the extruded 3d mesh
+ fprintf(fid,'%s\n%s\n%s\n',' ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of vertices ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' vertex indices of the mesh elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices x coordinate [m] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices y coordinate [m] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices z coordinate [m] ',' ');
+ fprintf(fid,'%s\n%s\n',' ');
+
+ % properties
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number of extrusion layers ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower vertices flags list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower elements flags list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper vertices flags list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper elements flags list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper vertex list (NaN for vertex on the upper surface) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper element list (NaN for element on the upper layer) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower vertex list (NaN for vertex on the lower surface) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' element list (NaN for element on the lower layer) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices on the boundary of the domain flag list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' list of vertices connected to vertex_i ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' average number of vertices connected to one vertex ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' average number of vertices connected to one vertex ',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ % Extracted model
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices extracted from the model ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' elements extracted from the model ',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ % Projection
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices latitude [degrees] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' verticies longitude [degrees] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' ',' Indicate epsg ''n'' or ''s'' ',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ end % }}}cd
function self = mesh3dprisms(varargin) % {{{
switch nargin
@@ -133,5 +155,4 @@
md = checkfield(md,'fieldname','mesh.numberofelements','>',0);
md = checkfield(md,'fieldname','mesh.numberofvertices','>',0);
- %no checks for numberofedges lat long and hemisphere
md = checkfield(md,'fieldname','mesh.vertexonbase','size',[md.mesh.numberofvertices 1],'values',[0 1]);
md = checkfield(md,'fieldname','mesh.vertexonsurface','size',[md.mesh.numberofvertices 1],'values',[0 1]);
@@ -179,5 +200,5 @@
fielddisplay(obj,'lat','vertices latitude [degrees]');
fielddisplay(obj,'long','vertices longitude [degrees]');
- fielddisplay(obj,'hemisphere','Indicate hemisphere ''n'' or ''s'' ');
+ fielddisplay(obj,'epsg','EPSG code (ex: 3413 for UPS Greenland, 3031 for UPS Antarctica)');
end % }}}
function marshall(obj,md,fid) % {{{
Index: /issm/trunk-jpl/src/m/classes/mesh3dprisms.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/mesh3dprisms.py (revision 18557)
+++ /issm/trunk-jpl/src/m/classes/mesh3dprisms.py (revision 18558)
@@ -25,7 +25,7 @@
self.lat = float('NaN');
self.long = float('NaN');
- self.hemisphere = float('NaN');
+ self.epsg = 0;
- self.vertexonbase = float('NaN');
+ self.vertexonbase = float('NaN');
self.vertexonsurface = float('NaN');
self.lowerelements = float('NaN');
@@ -90,5 +90,5 @@
string="%s\n%s"%(string,fielddisplay(self,"lat","vertices latitude [degrees]"))
string="%s\n%s"%(string,fielddisplay(self,"long","vertices longitude [degrees]"))
- string="%s\n%s"%(string,fielddisplay(self,"hemisphere","Indicate hemisphere 'n' or 's'"))
+ string="%s\n%s"%(string,fielddisplay(self,"epsg","EPSG code (ex: 3413 for UPS Greenland, 3031 for UPS Antarctica)"))
return string
#}}}
@@ -116,5 +116,4 @@
md = checkfield(md,'fieldname','mesh.numberofelements','>',0)
md = checkfield(md,'fieldname','mesh.numberofvertices','>',0)
- #no checks for numberofedges lat long and hemisphere
md = checkfield(md,'fieldname','mesh.vertexonbase','size',[md.mesh.numberofvertices],'values',[0,1])
md = checkfield(md,'fieldname','mesh.vertexonsurface','size',[md.mesh.numberofvertices],'values',[0,1])
Index: /issm/trunk-jpl/src/m/classes/mesh3dtetras.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/mesh3dtetras.m (revision 18557)
+++ /issm/trunk-jpl/src/m/classes/mesh3dtetras.m (revision 18558)
@@ -8,89 +8,111 @@
x = NaN;
y = NaN;
- z = NaN
- elements = NaN
+ z = NaN;
+ elements = NaN;
numberoflayers = 0;
numberofelements = 0;
numberofvertices = 0;
- lat = NaN
- long = NaN
- hemisphere = NaN
-
- vertexonbase = NaN
- vertexonsurface = NaN
- lowerelements = NaN
- lowervertex = NaN
- upperelements = NaN
- uppervertex = NaN
- vertexonboundary = NaN
-
- vertexconnectivity = NaN
- elementconnectivity = NaN
+ lat = NaN;
+ long = NaN;
+ epsg = 0;
+
+ vertexonbase = NaN;
+ vertexonsurface = NaN;
+ lowerelements = NaN;
+ lowervertex = NaN;
+ upperelements = NaN;
+ uppervertex = NaN;
+ vertexonboundary = NaN;
+
+ vertexconnectivity = NaN;
+ elementconnectivity = NaN;
average_vertex_connectivity = 0;
- x2d = NaN
- y2d = NaN
- elements2d = NaN
+ x2d = NaN;
+ y2d = NaN;
+ elements2d = NaN;
numberofvertices2d = 0;
numberofelements2d = 0;
- extractedvertices = NaN
- extractedelements = NaN
+ extractedvertices = NaN;
+ extractedelements = NaN;
+ end
+ methods (Static)
+ function self = loadself(self) % {{{
+ % This function is directly called by matlab when a model selfect is
+ % loaded. Update old properties here
+
+ %2014 Oct. 1st
+ if isstruct(self),
+ oldself=self;
+ %Assign property values from struct
+ self=structtoself(mesh3dtetras(),oldself)
+ if isfield(oldself,'hemisphere'),
+ disp('md.mesh.hemisphere has been automatically converted to EPSG code');
+ if strcmpi(oldself.hemisphere,'n'),
+ self.epsg=3413;
+ else
+ self.epsg=3031;
+ end
+ end
+ end
+
+ end% }}}
end
methods
- function createxml(obj,fid) % {{{
- fprintf(fid, '\n');
-
- % Elements and verticies of the original 2d mesh
- fprintf(fid,'%s\n%s\n%s\n',' ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of elements ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of vertices ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' vertex indices of the mesh elements ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices x coordinate [m] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices y coordinate [m] ',' ');
- fprintf(fid,'%s\n%s\n',' ');
-
- % Elements and vertices of the extruded 3d mesh
- fprintf(fid,'%s\n%s\n%s\n',' ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of elements ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of vertices ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' vertex indices of the mesh elements ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices x coordinate [m] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices y coordinate [m] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices z coordinate [m] ',' ');
- fprintf(fid,'%s\n%s\n',' ');
-
- % properties
- fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number of extrusion layers ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower vertices flags list ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower elements flags list ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper vertices flags list ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper elements flags list ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper vertex list (NaN for vertex on the upper surface) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper element list (NaN for element on the upper layer) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower vertex list (NaN for vertex on the lower surface) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' element list (NaN for element on the lower layer) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices on the boundary of the domain flag list ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' list of vertices connected to vertex_i ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' average number of vertices connected to one vertex ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' average number of vertices connected to one vertex ',' ');
- fprintf(fid,'%s\n%s\n','');
-
- % Extracted model
- fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices extracted from the model ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' elements extracted from the model ',' ');
- fprintf(fid,'%s\n%s\n','');
-
- % Projection
- fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices latitude [degrees] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' verticies longitude [degrees] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' ',' Indicate hemisphere ''n'' or ''s'' ',' ');
- fprintf(fid,'%s\n%s\n','');
-
- end % }}}cd
+ function createxml(obj,fid) % {{{
+ fprintf(fid, '\n');
+
+ % Elements and verticies of the original 2d mesh
+ fprintf(fid,'%s\n%s\n%s\n',' ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of vertices ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' vertex indices of the mesh elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices x coordinate [m] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices y coordinate [m] ',' ');
+ fprintf(fid,'%s\n%s\n',' ');
+
+ % Elements and vertices of the extruded 3d mesh
+ fprintf(fid,'%s\n%s\n%s\n',' ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of vertices ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' vertex indices of the mesh elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices x coordinate [m] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices y coordinate [m] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices z coordinate [m] ',' ');
+ fprintf(fid,'%s\n%s\n',' ');
+
+ % properties
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number of extrusion layers ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower vertices flags list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower elements flags list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper vertices flags list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper elements flags list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper vertex list (NaN for vertex on the upper surface) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper element list (NaN for element on the upper layer) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower vertex list (NaN for vertex on the lower surface) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' element list (NaN for element on the lower layer) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices on the boundary of the domain flag list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' list of vertices connected to vertex_i ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' average number of vertices connected to one vertex ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' average number of vertices connected to one vertex ',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ % Extracted model
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices extracted from the model ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' elements extracted from the model ',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ % Projection
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices latitude [degrees] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' verticies longitude [degrees] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' ',' Indicate epsg ''n'' or ''s'' ',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ end % }}}cd
function self = mesh3dtetras(varargin) % {{{
switch nargin
@@ -133,5 +155,4 @@
md = checkfield(md,'fieldname','mesh.numberofelements','>',0);
md = checkfield(md,'fieldname','mesh.numberofvertices','>',0);
- %no checks for numberofedges lat long and hemisphere
md = checkfield(md,'fieldname','mesh.vertexonbase','size',[md.mesh.numberofvertices 1],'values',[0 1]);
md = checkfield(md,'fieldname','mesh.vertexonsurface','size',[md.mesh.numberofvertices 1],'values',[0 1]);
@@ -179,5 +200,5 @@
fielddisplay(obj,'lat','vertices latitude [degrees]');
fielddisplay(obj,'long','vertices longitude [degrees]');
- fielddisplay(obj,'hemisphere','Indicate hemisphere ''n'' or ''s'' ');
+ fielddisplay(obj,'epsg','EPSG code (ex: 3413 for UPS Greenland, 3031 for UPS Antarctica)');
end % }}}
function marshall(obj,md,fid) % {{{
Index: /issm/trunk-jpl/src/m/classes/model.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/model.m (revision 18557)
+++ /issm/trunk-jpl/src/m/classes/model.m (revision 18558)
@@ -660,5 +660,5 @@
md.mesh.lat = mesh2d.lat;
md.mesh.long = mesh2d.long;
- md.mesh.hemisphere = mesh2d.hemisphere;
+ md.mesh.epsg = mesh2d.epsg;
md.mesh.vertexonboundary = mesh2d.vertexonboundary;
@@ -973,5 +973,4 @@
if isfield(structmd,'extractedelements'), md.mesh.extractedelements=structmd.extractedelements; end
if isfield(structmd,'nodeonboundary'), md.mesh.vertexonboundary=structmd.nodeonboundary; end
- if isfield(structmd,'hemisphere'), md.mesh.hemisphere=structmd.hemisphere; end
if isfield(structmd,'lat'), md.mesh.lat=structmd.lat; end
if isfield(structmd,'long'), md.mesh.long=structmd.long; end
Index: /issm/trunk-jpl/src/m/classes/model.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/model.py (revision 18557)
+++ /issm/trunk-jpl/src/m/classes/model.py (revision 18558)
@@ -517,5 +517,5 @@
md.mesh.lat = mesh2d.lat
md.mesh.long = mesh2d.long
- md.mesh.hemisphere = mesh2d.hemisphere
+ md.mesh.epsg = mesh2d.epsg
md.mesh.vertexonboundary = mesh2d.vertexonboundary
Index: /issm/trunk-jpl/src/m/plot/applyoptions.m
===================================================================
--- /issm/trunk-jpl/src/m/plot/applyoptions.m (revision 18557)
+++ /issm/trunk-jpl/src/m/plot/applyoptions.m (revision 18558)
@@ -6,11 +6,4 @@
%
% See also: PLOTMODEL, PARSE_OPTIONS
-
-%some defaults
-if isfield(md.mesh,'hemisphere'),
- if strcmpi(md.mesh.hemisphere,'n'), options=addfielddefault(options,'hemisphere','n');
- elseif strcmpi(md.mesh.hemisphere,'s'), options=addfielddefault(options,'hemisphere','s');
- end
-end
%fontsize
@@ -365,13 +358,13 @@
axis equal off
%box off
- if strcmpi(md.mesh.hemisphere,'n') | strcmpi(md.mesh.hemisphere,'north'),
+ if md.mesh.epsg==3413,
A=expread('/u/astrid-r1b/ModelData/Exp/GreenlandBoxFront.exp');
[A.x A.y]=ll2xy(A.x,A.y,+1,45,70);
A.x = A.x(1:30:end);
A.y = A.y(1:30:end);
- elseif strcmpi(md.mesh.hemisphere,'s') | strcmpi(md.mesh.hemisphere,'south'),
+ elseif md.mesh.epsg==3031,
A=expread('/u/astrid-r1b/ModelData/Exp/Antarctica.exp');
else
- error('applyoptions error message: hemisphere not defined');
+ error('applyoptions error message: md.mesh.epsg not defined');
end
offset=3*10^4;
Index: /issm/trunk-jpl/src/m/plot/applyoptions.py
===================================================================
--- /issm/trunk-jpl/src/m/plot/applyoptions.py (revision 18557)
+++ /issm/trunk-jpl/src/m/plot/applyoptions.py (revision 18558)
@@ -24,8 +24,4 @@
See also: PLOTMODEL, PARSE_OPTIONS
'''
-
- #some defaults (this seems to be adding a field that already exists...)
- #if not isnan(md.mesh.hemisphere):
- # options.addfielddefault('hemisphere',md.mesh.hemisphere)
# get handle to current figure and axes instance
Index: /issm/trunk-jpl/src/m/plot/googlemaps.m
===================================================================
--- /issm/trunk-jpl/src/m/plot/googlemaps.m (revision 18557)
+++ /issm/trunk-jpl/src/m/plot/googlemaps.m (revision 18558)
@@ -22,14 +22,18 @@
end
end
+
+if md.mesh.epsg==0,
+ error('md.mesh.epsg not defined');
+end
if nargin==1,
%Get xlim and ylim (used to extract Google maps image)
xlim=getfieldvalue(options,'xlim',[min(md.mesh.x) max(md.mesh.x)]);
ylim=getfieldvalue(options,'ylim',[min(md.mesh.y) max(md.mesh.y)]);
- if strcmpi(md.mesh.hemisphere,'n'),
+ if md.mesh.epsg==3413,
[latlist lonlist]= xy2ll(...
[linspace(xlim(1),xlim(2),100) linspace(xlim(2),xlim(2),100) linspace(xlim(2),xlim(1),100) linspace(xlim(1),xlim(1),100)],...
[linspace(ylim(1),ylim(1),100) linspace(ylim(1),ylim(2),100) linspace(ylim(2),ylim(2),100) linspace(ylim(2),ylim(1),100)],...
+1,45,70);
- elseif strcmpi(md.mesh.hemisphere,'s'),
+ elseif md.mesh.epsg==3031,
[latlist lonlist]= xy2ll(...
[linspace(xlim(1),xlim(2),100) linspace(xlim(2),xlim(2),100) linspace(xlim(2),xlim(1),100) linspace(xlim(1),xlim(1),100)],...
@@ -37,5 +41,5 @@
-1,0,71);
else
- error('field hemisphere should either be ''n'' or ''s''');
+ error('EPSG code not supported yet');
end
@@ -50,13 +54,5 @@
%Get region specific projection parameters
EPSGgoogle = 'EPSG:3785'; % Mercator http://www.spatialreference.org/ref/epsg/3785/
-if strcmpi(md.mesh.hemisphere,'n'),
- EPSGlocal = 'EPSG:3413'; % UPS Greenland http://www.spatialreference.org/ref/epsg/3413/
-elseif strcmpi(md.mesh.hemisphere,'s'),
- EPSGlocal = 'EPSG:3031'; % UPS Antarctica http://www.spatialreference.org/ref/epsg/3031/
-elseif strcmpi(md.mesh.hemisphere,'UTM18N'),
- EPSGlocal = 'EPSG:32218'; % UTM 18 N Patagonia
-else
- error('field hemisphere should either be ''n'' or ''s''');
-end
+EPSGlocal = ['EPSG:' md.mesh.epsg]
%Find optimal zoom
@@ -132,10 +128,10 @@
[gX gY]=meshgrid(ulx:ulx+size(final,2)-1,uly:-1:uly-size(final,1)+1);
[LAT LON]=pixelstolatlon(gX,gY, zoom);
- if strcmpi(md.mesh.hemisphere,'n'),
+ if md.mesh.epsg==3413,
[X Y]=ll2xy(LAT,LON,+1,45,70);
- elseif strcmpi(md.mesh.hemisphere,'s'),
+ elseif md.mesh.epsg==3031,
[X Y]=ll2xy(LAT,LON,-1,0,71);
else
- error('field hemisphere should either be ''n'' or ''s''');
+ error('EPSG code not supported yet');
end
md.radaroverlay.pwr=final;
@@ -155,10 +151,10 @@
[gX gY]=meshgrid(ulx:ulx+size(final,2)-1,uly:-1:uly-size(final,1)+1);
[LAT LON]=pixelstolatlon(gX,gY, zoom);
- if strcmpi(md.mesh.hemisphere,'n'),
+ if md.mesh.epsg==3413,
[X Y]=ll2xy(LAT,LON,+1,45,70);
- elseif strcmpi(md.mesh.hemisphere,'s'),
+ elseif md.mesh.epsg==3031,
[X Y]=ll2xy(LAT,LON,-1,0,71);
else
- error('field hemisphere should either be ''n'' or ''s''');
+ error('EPSG code not supported yet');
end
md.radaroverlay.pwr=final;
Index: /issm/trunk-jpl/src/m/plot/latlonoverlay.m
===================================================================
--- /issm/trunk-jpl/src/m/plot/latlonoverlay.m (revision 18557)
+++ /issm/trunk-jpl/src/m/plot/latlonoverlay.m (revision 18558)
@@ -66,11 +66,11 @@
latitudes =lat*ones(size(longitudes));
- if strcmpi(md.mesh.hemisphere,'n'),
+ if md.mesh.epsg==3413,
if lat<0, continue; end
[x,y]=ll2xy(latitudes,longitudes,+1,45,70);
- elseif strcmpi(md.mesh.hemisphere,'s'),
+ elseif md.mesh.epsg==3031,
if lat>0, continue; end
[x,y]=ll2xy(latitudes,longitudes,-1, 0,71);
- else error('field hemisphere should either be ''n'' or ''s'''); end
+ else error('field md.mesh.epsg not supported yet'); end
pos=find(x<=xlimits(2) & x>=xlimits(1) & y<=ylimits(2) & y>=ylimits(1));
@@ -105,14 +105,14 @@
for lon=-180:lonstep:180
- if strcmpi(md.mesh.hemisphere,'n'),
+ if md.mesh.epsg==3413,
latitudes =0:resolution:90;
longitudes=lon*ones(size(latitudes));
[x,y]=ll2xy(latitudes,longitudes,+1,45,70);
- elseif strcmpi(md.mesh.hemisphere,'s'),
+ elseif md.mesh.epsg==3031,
latitudes =-90:resolution:0;
longitudes=lon*ones(size(latitudes));
[x,y]=ll2xy(latitudes,longitudes,-1, 0,71);
else
- error('field hemisphere should either be ''n'' or ''s''');
+ error('field md.mesh.epsg not supported yet');
end
Index: /issm/trunk-jpl/src/m/plot/plot_googlemaps.m
===================================================================
--- /issm/trunk-jpl/src/m/plot/plot_googlemaps.m (revision 18557)
+++ /issm/trunk-jpl/src/m/plot/plot_googlemaps.m (revision 18558)
@@ -25,10 +25,10 @@
xlim=getfieldvalue(options,'xlim',[min(x) max(x)]);
ylim=getfieldvalue(options,'ylim',[min(y) max(y)]);
- if strcmpi(md.mesh.hemisphere,'n'),
+ if md.mesh.epsg==3413,
[latlist lonlist]= xy2ll(...
[linspace(xlim(1),xlim(2),100) linspace(xlim(2),xlim(2),100) linspace(xlim(2),xlim(1),100) linspace(xlim(1),xlim(1),100)],...
[linspace(ylim(1),ylim(1),100) linspace(ylim(1),ylim(2),100) linspace(ylim(2),ylim(2),100) linspace(ylim(2),ylim(1),100)],...
+1,45,70);
- elseif strcmpi(md.mesh.hemisphere,'s'),
+ elseif md.mesh.epsg==3031,
[latlist lonlist]= xy2ll(...
[linspace(xlim(1),xlim(2),100) linspace(xlim(2),xlim(2),100) linspace(xlim(2),xlim(1),100) linspace(xlim(1),xlim(1),100)],...
@@ -38,5 +38,5 @@
latlist = md.mesh.lat; %That might work?
lonlist = md.mesh.long;
- error('field hemisphere should either be ''n'' or ''s''');
+ error('EPSG code not supported yet');
end
Index: /issm/trunk-jpl/src/m/plot/plotdoc.m
===================================================================
--- /issm/trunk-jpl/src/m/plot/plotdoc.m (revision 18557)
+++ /issm/trunk-jpl/src/m/plot/plotdoc.m (revision 18558)
@@ -57,5 +57,4 @@
disp(' ''axis'': same as standard matlab option (''equal'',''off'',''equal on'',...)');
disp(' ''basin'': zoom on a given basin (''pineislandglacier'',''ronneiceshelf'', use isbasin to identify a basin');
-disp(' ''hemisphere'': specify +1 or -1');
disp(' ''basindeltax'': in m');
disp(' ''showbasins'': write lables for every existing basin name around the center of the plot');
@@ -109,5 +108,4 @@
disp(' ''contrast'': (default 1) coefficient to add contrast to the radar amplitude image used in overlays');
disp(' ''highres'': resolution of overlayed radar amplitude image (default is 0, high resolution is 1).');
-disp(' ''hem'': specify hemisphere ''n'' or ''s'' (default is ''s'').');
disp(' ''alpha'': transparency coefficient (the higher, the more transparent). Default is 1.5');
disp(' ''scaling'': scaling factor used by quiver plots. Default is 0.4');
Index: /issm/trunk-jpl/src/m/plot/radarpower.m
===================================================================
--- /issm/trunk-jpl/src/m/plot/radarpower.m (revision 18557)
+++ /issm/trunk-jpl/src/m/plot/radarpower.m (revision 18558)
@@ -36,5 +36,5 @@
%figure out if we should go look for Greenland or Antarctica geotiff, or if user provided one.
if ~exist(options,'overlay_image'),
- if strcmpi(md.mesh.hemisphere,'n'),
+ if md.mesh.epsg==3413,
%if ~exist(['/u/astrid-r1b/ModelData/MOG/mog150_greenland_map.jpg']),
% error(['radarpower error message: file ' '/u/astrid-r1b/ModelData/MOG/mog150_greenland_map.jpg not found.']);
@@ -106,5 +106,5 @@
system('rm -rf ./temp.tif');
- elseif strcmpi(md.mesh.hemisphere,'s'),
+ elseif md.mesh.epsg==3031,
if ~exist(options,'geotiff_name'),
if highres,
@@ -138,5 +138,5 @@
else
- error('field hemisphere should either be ''n'' or ''s''');
+ error('EPSG code not supported yet (ex: 3413 for UPS Greenland, 3031 for UPS Antarctica)');
end
else
Index: /issm/trunk-jpl/src/m/plot/showregion.m
===================================================================
--- /issm/trunk-jpl/src/m/plot/showregion.m (revision 18557)
+++ /issm/trunk-jpl/src/m/plot/showregion.m (revision 18558)
@@ -15,10 +15,10 @@
axis equal off
%box off
-if strcmpi(md.mesh.hemisphere,'n') | strcmpi(md.mesh.hemisphere,'north'),
+if md.mesh.epsg==3413,
A=expread(['/u/astrid-r1b/ModelData/Exp/Greenland.exp']);
-elseif strcmpi(md.mesh.hemisphere,'s') | strcmpi(md.mesh.hemisphere,'south'),
+elseif md.mesh.epsg==3031,
A=expread(['/u/astrid-r1b/ModelData/Exp/Antarctica.exp']);
else
- error('applyoptions error message: hemisphere not defined');
+ error('md.mesh.epsg not supported yet');
end