Changeset 17562

Timestamp:

03/27/14 11:00:36 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: spctemperature were not set correctly because 2d meshes do not have vertexonsurface anymore

Location:

issm/trunk-jpl/src/m/classes

Files:

• mesh2d.m (modified) (1 diff)
• mesh2d.py (modified) (1 diff)
• mesh2dvertical.m (modified) (1 diff)
• mesh3dprisms.m (modified) (1 diff)
• mesh3dprisms.py (modified) (1 diff)
• mesh3dtetras.m (modified) (1 diff)
• model.m (modified) (1 diff)
• model.py (modified) (1 diff)

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

@@ -76 +76 @@
                 end % }}}
                 function disp(obj) % {{{
-                        disp(sprintf('   2d Mesh:')); 
+                        disp(sprintf('   2D tria Mesh (horizontal):')); 
 
                         disp(sprintf('\n      Elements and vertices:'));

issm/trunk-jpl/src/m/classes/mesh2d.py

@@ -42 +42 @@
                 #}}}
         def __repr__(self): # {{{
-                string="   2d Mesh:" 
+                string="   2D tria Mesh (horizontal):" 
 
                 string="%s\n%s"%(string,"\n      Elements and vertices:")

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

@@ -77 +77 @@
                 end % }}}
                 function disp(obj) % {{{
-                        disp(sprintf('   2d vertical Mesh:')); 
+                        disp(sprintf('   2D tria Mesh (vertical):')); 
 
                         disp(sprintf('\n      Elements and vertices:'));

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

@@ -92 +92 @@
                 end % }}}
                 function disp(obj) % {{{
-                        disp(sprintf('   Mesh:')); 
+                        disp(sprintf('   3D prism Mesh:')); 
 
                         disp(sprintf('\n      Elements and vertices of the original 2d mesh:'));

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

@@ -55 +55 @@
                 #}}}
         def __repr__(self): # {{{
-                string="   Mesh 3D prisms:" 
+                string="   3D prism Mesh:" 
 
                 string="%s\n%s"%(string,"\n      Elements and vertices of the original 2d mesh3dprisms:")

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

@@ -88 +88 @@
                 end % }}}
                 function disp(obj) % {{{
-                        disp(sprintf('   Mesh:')); 
+                        disp(sprintf('   3D tetra Mesh:')); 
 
                         disp(sprintf('\n      Elements and vertices of the original 2d mesh:'));

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

@@ -741 +741 @@
                         md.stressbalance.spcvz=project3d(md,'vector',md.stressbalance.spcvz,'type','node');
                         md.thermal.spctemperature=project3d(md,'vector',md.thermal.spctemperature,'type','node','layer',md.mesh.numberoflayers,'padding',NaN);
+                        if (length(md.initialization.temperature)==md.mesh.numberofvertices),
+                                md.thermal.spctemperature=NaN*ones(md.mesh.numberofvertices,1);
+                                if isprop(md.mesh,'vertexonsurface'),
+                                        pos=find(md.mesh.vertexonsurface);
+                                        md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface
+                                end
+                        end
                         md.masstransport.spcthickness=project3d(md,'vector',md.masstransport.spcthickness,'type','node');
                         md.masstransport.calvingrate=project3d(md,'vector',md.masstransport.calvingrate,'type','node');

issm/trunk-jpl/src/m/classes/model.py

@@ -640 +640 @@
                 md.stressbalance.spcvz=project3d(md,'vector',md.stressbalance.spcvz,'type','node')
                 md.thermal.spctemperature=project3d(md,'vector',md.thermal.spctemperature,'type','node','layer',md.mesh.numberoflayers,'padding',float('NaN'))
+                if isinstance(md.initialization.temperature,numpy.ndarray) and numpy.size(md.initialization.temperature,axis=0)==md.mesh.numberofvertices:
+                        md.thermal.spctemperature=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
+                        if hasattr(md.mesh,'vertexonsurface'):
+                                pos=numpy.nonzero(md.mesh.vertexonsurface)[0]
+                                md.thermal.spctemperature[pos]=md.initialization.temperature[pos]    #impose observed temperature on surface
                 md.masstransport.spcthickness=project3d(md,'vector',md.masstransport.spcthickness,'type','node')
                 md.balancethickness.spcthickness=project3d(md,'vector',md.balancethickness.spcthickness,'type','node')