Changeset 16295 for issm/trunk-jpl/src/m/classes/stressbalance.py

Timestamp:

10/03/13 15:35:54 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: preparing 2d horizontal mesh

File:

• issm/trunk-jpl/src/m/classes/stressbalance.py (modified) (2 diffs)

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

@@ -112 +112 @@
                 md = checkfield(md,'stressbalance.spcvx','forcing',1)
                 md = checkfield(md,'stressbalance.spcvy','forcing',1)
-                if md.mesh.dimension==3:
+                if strcmp(md.mesh.meshtype(),'3D'):
                         md = checkfield(md,'stressbalance.spcvz','forcing',1)
                 md = checkfield(md,'stressbalance.restol','size',[1],'>',0)
@@ -145 +145 @@
                                         md.checkmessage("Vectors in stressbalance.referential (columns 1 to 3 and 4 to 6) must be orthogonal")
                 #CHECK THAT NO rotation specified for FS Grounded ice at base
-#               if md.mesh.dimension==3 & md.flowequation.isFS,
-                if md.mesh.dimension==3 and md.flowequation.isFS:
+                if strcmp(md.mesh.meshtype(),'3D') and md.flowequation.isFS:
                         pos=numpy.nonzero(numpy.logical_and(md.mask.groundedice_levelset,md.mesh.vertexonbed))
                         if numpy.any(numpy.logical_not(numpy.isnan(md.stressbalance.referential[pos,:]))):