Index: /issm/trunk-jpl/src/m/classes/friction.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/friction.py	(revision 22841)
+++ /issm/trunk-jpl/src/m/classes/friction.py	(revision 22842)
@@ -17,6 +17,6 @@
 		self.p           = float('NaN')
 		self.q           = float('NaN')
-                self.coupling  	 = 0
-                self.effective_pressure	= float('NaN')
+		self.coupling  	 = 0
+		self.effective_pressure	= float('NaN')
 		#set defaults
 		self.setdefaultparameters()
@@ -43,5 +43,5 @@
 			raise ValueError('coupling not supported yet')
 		elif self.coupling > 2:
-			raise ValueError('md.friction.coupling larger than 2, not supported yet')	
+			raise ValueError('md.friction.coupling larger than 2, not supported yet')
 		return self
 	#}}}
@@ -61,6 +61,4 @@
 		if self.coupling==1:
 			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')
@@ -75,7 +73,5 @@
 		if self.coupling==1:
 			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')			
+			raise ValueError('md.friction.coupling larger than 2, not supported yet')
 	# }}}