Changeset 23534

Timestamp:

12/11/18 18:43:49 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: reverting to see if this fixes ADOLC NR

Location:

issm/trunk-jpl/src/m/classes

Files:

• flowequation.py (modified) (2 diffs)
• friction.py (modified) (1 diff)

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

@@ -16 +16 @@
 
         def __init__(self): # {{{
-
+                
                 self.isSIA                          = 0
                 self.isSSA                          = 0
@@ -49 +49 @@
                 string="%s\n%s"%(string,fielddisplay(self,'isFS',"are the Full-FS (FS) equations used ?"))
                 string="%s\n%s"%(string,fielddisplay(self,'fe_SSA',"Finite Element for SSA: 'P1', 'P1bubble' 'P1bubblecondensed' 'P2'"))
-                string="%s\n%s"%(string,fielddisplay(self,'fe_HO' ,"Finite Element for HO:  'P1','P1bubble','P1bubblecondensed','P1xP2','P2xP1','P2','P2bubble','P1xP3','P2xP4'"))
+                string="%s\n%s"%(string,fielddisplay(self,'fe_HO' ,"Finite Element for HO:  'P1' 'P1bubble' 'P1bubblecondensed' 'P1xP2' 'P2xP1' 'P2'"))
                 string="%s\n%s"%(string,fielddisplay(self,'fe_FS' ,"Finite Element for FS:  'P1P1' (debugging only) 'P1P1GLS' 'MINIcondensed' 'MINI' 'TaylorHood' 'LATaylorHood' 'XTaylorHood'"))
                 string="%s\n%s"%(string,fielddisplay(self,'vertex_equation',"flow equation for each vertex"))

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

@@ -29 +29 @@
                 string="%s\n%s"%(string,fielddisplay(self,"p","p exponent"))
                 string="%s\n%s"%(string,fielddisplay(self,"q","q exponent"))
-                string="%s\n%s"%(string,fielddisplay(self,'coupling','Coupling flag 0: uniform sheet (negative pressure ok, default), 1: ice pressure only, 2: water pressure assuming uniform sheet (no negative pressure), 3: use provided effective_pressure, 4: used coupled model (not implemented yet)'))
+                string="%s\n%s"%(string,fielddisplay(self,'coupling','Coupling flag 0: uniform sheet (negative pressure ok, default), 1: ice pressure only, 2: water pressure assuming uniform sheet (no negative pressure), 3: use provided effective_pressure, 4: used coupled model (not implemented yet)'))
                 string="%s\n%s"%(string,fielddisplay(self,'effective_pressure','Effective Pressure for the forcing if not coupled [Pa]'))
                 return string