Index: /issm/trunk-jpl/src/m/classes/flowequation.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/flowequation.py	(revision 23525)
+++ /issm/trunk-jpl/src/m/classes/flowequation.py	(revision 23526)
@@ -16,5 +16,5 @@
 
 	def __init__(self): # {{{
-		
+
 		self.isSIA                          = 0
 		self.isSSA                          = 0
@@ -49,5 +49,5 @@
 		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'"))
+		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_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"))
Index: /issm/trunk-jpl/src/m/classes/friction.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/friction.py	(revision 23525)
+++ /issm/trunk-jpl/src/m/classes/friction.py	(revision 23526)
@@ -29,5 +29,5 @@
 		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
Index: /issm/trunk-jpl/src/m/classes/frictionhydro.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/frictionhydro.py	(revision 23525)
+++ /issm/trunk-jpl/src/m/classes/frictionhydro.py	(revision 23526)
@@ -26,5 +26,5 @@
 	def __repr__(self): # {{{
 		string='Effective Pressure based friction law described in Gagliardini 2007'
-		string="%s\n%s"%(string,fielddisplay(self,'coupling','Coupling flag: 0 for default, 1 for forcing(provide md.friction.effective_pressure)  and 2 for coupled(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,'q','friction law exponent q>=1'))
 		string="%s\n%s"%(string,fielddisplay(self,'C','friction law max value (Iken bound)'))
@@ -39,10 +39,8 @@
 		self.C=project3d(md,'vector',self.C,'type','element')
 		self.As=project3d(md,'vector',self.As,'type','element')
-		if self.coupling==1:
+		if self.coupling in[3,4]:
 			self.effective_pressure=project3d(md,'vector',self.effective_pressure,'type','node','layer',1)
-		elif self.coupling==2:
-			raise ValueError('coupling not supported yet')
-		elif self.coupling > 2:
-			raise ValueError('md.friction.coupling larger than 2, not supported yet')
+		elif self.coupling > 4:
+			raise ValueError('md.friction.coupling larger than 4, not supported yet')
 		return self
 	# }}}
@@ -62,14 +60,12 @@
 			return md
 
-		md = checkfield(md,'fieldname','friction.coupling','numel',[1],'values',[0,1,2])
+		md = checkfield(md,'fieldname','friction.coupling','numel',[1],'values',[0,1,2,3,4])
 		md = checkfield(md,'fieldname','friction.q','NaN',1,'Inf',1,'size',[md.mesh.numberofelements])
 		md = checkfield(md,'fieldname','friction.C','NaN',1,'Inf',1,'size',[md.mesh.numberofelements])
 		md = checkfield(md,'fieldname','friction.As','NaN',1,'Inf',1,'size',[md.mesh.numberofelements])
-		if self.coupling==1:
+		if self.coupling==3:
 			md = checkfield(md,'fieldname','friction.effective_pressure','NaN',1,'Inf',1,'timeseries',1)
-		elif self.coupling==2:
-			raise ValueError('coupling not supported yet')
-		elif self.coupling > 2:
-			raise ValueError('md.friction.coupling larger than 2, not supported yet')
+		elif self.coupling > 4:
+			raise ValueError('md.friction.coupling larger than 4, not supported yet')
 	# }}}
 
@@ -80,9 +76,7 @@
 		WriteData(fid,prefix,'class','friction','object',self,'fieldname','C','format','DoubleMat','mattype',2)
 		WriteData(fid,prefix,'class','friction','object',self,'fieldname','As','format','DoubleMat','mattype',2)
-		if self.coupling==1:
+		if self.coupling in[3,4]:
 			WriteData(fid,prefix,'class','friction','object',self,'fieldname','effective_pressure','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
-		elif self.coupling==2:
-			raise ValueError('coupling not supported yet')
-		elif self.coupling > 2:
-			raise ValueError('md.friction.coupling larger than 2, not supported yet')
+		elif self.coupling > 4:
+			raise ValueError('md.friction.coupling larger than 4, not supported yet')
 	#}}}
Index: /issm/trunk-jpl/src/m/contrib/defleurian/paraview/enveloppeVTK.py
===================================================================
--- /issm/trunk-jpl/src/m/contrib/defleurian/paraview/enveloppeVTK.py	(revision 23525)
+++ /issm/trunk-jpl/src/m/contrib/defleurian/paraview/enveloppeVTK.py	(revision 23526)
@@ -124,5 +124,5 @@
 
 				#getting the  fields in the solution
-				if(np.size(res_struct.__dict__[sol])>1):
+				if(type(res_struct.__dict__[sol])==list):
 					fieldnames=dict.keys(res_struct.__dict__[sol].__getitem__(timestep).__dict__)
 				else:
@@ -130,5 +130,5 @@
 				#check which field is a real result and print
 				for field in fieldnames:
-					if(np.size(res_struct.__dict__[sol])>1):
+					if(type(res_struct.__dict__[sol])==list):
 						fieldstruct=res_struct.__dict__[sol].__getitem__(timestep).__dict__[field]
 					else: