Changeset 22758 for issm/trunk/src/m/classes/mesh3dprisms.py

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/mesh3dprisms.py (modified) (4 diffs)

issm/trunk/src/m/classes/mesh3dprisms.py

@@ -25 +25 @@
                 self.long                        = float('NaN');
                 self.epsg                        = 0;
+                self.scale_factor                = float('NaN');
 
                 self.vertexonbase                = float('NaN');
@@ -90 +91 @@
                 string="%s\n%s"%(string,fielddisplay(self,"long","vertices longitude [degrees]"))
                 string="%s\n%s"%(string,fielddisplay(self,"epsg","EPSG code (ex: 3413 for UPS Greenland, 3031 for UPS Antarctica)"))
+                string="%s\n%s"%(string,fielddisplay(self,"scale_factor","Projection correction for volume, area, etc. computation"))
                 return string
                 #}}}
@@ -118 +120 @@
                 md = checkfield(md,'fieldname','mesh.vertexonsurface','size',[md.mesh.numberofvertices],'values',[0,1])
                 md = checkfield(md,'fieldname','mesh.average_vertex_connectivity','>=',24,'message',"'mesh.average_vertex_connectivity' should be at least 24 in 3d")
+                if(np.size(self.scale_factor)>1):
+                        md = checkfield(md,'fieldname','mesh.scale_factor','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
 
                 return md
@@ -149 +153 @@
                 WriteData(fid,prefix,'object',self,'class','mesh','fieldname','numberofvertices2d','format','Integer')
                 WriteData(fid,prefix,'object',self,'class','mesh','fieldname','numberofelements2d','format','Integer')
+                WriteData(fid,prefix,'object',self,'class','mesh','fieldname','scale_factor','format','DoubleMat','mattype',1)
+                if md.transient.isoceancoupling:
+                        WriteData(fid,prefix,'object',self,'class','mesh','fieldname','lat','format','DoubleMat','mattype',1)
+                        WriteData(fid,prefix,'object',self,'class','mesh','fieldname','long','format','DoubleMat','mattype',1)
         # }}}