Index: /issm/trunk-jpl/src/m/classes/friction.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/friction.m	(revision 21742)
+++ /issm/trunk-jpl/src/m/classes/friction.m	(revision 21743)
@@ -9,6 +9,6 @@
 		p           = NaN;
 		q           = NaN;
-		coupling    = 0;	%Silje
-		effective_pressure = NaN;	%Silje
+		coupling    = 0;
+		effective_pressure = NaN;
 	end
 	methods
@@ -47,5 +47,5 @@
 			md = checkfield(md,'fieldname','friction.q','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);
 			md = checkfield(md,'fieldname','friction.p','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);
-			md = checkfield(md,'fieldname','friction.coupling','numel',[1],'values',[0 1 2]);%Silje
+			md = checkfield(md,'fieldname','friction.coupling','numel',[1],'values',[0 1 2]);
 			switch self.coupling
 				case 0
@@ -63,6 +63,6 @@
 			fielddisplay(self,'p','p exponent');
 			fielddisplay(self,'q','q exponent');
-			fielddisplay(self,'effective_pressure','Effective Pressure for the forcing if not coupled [Pa]');%Silje
-			fielddisplay(self,'coupling','Coupling flag: 0 for default, 1 for forcing(provide md.friction.effective_pressure)  and 2 for coupled(not implemented yet)');%Silje
+			fielddisplay(self,'effective_pressure','Effective Pressure for the forcing if not coupled [Pa]');
+			fielddisplay(self,'coupling','Coupling flag: 0 for default, 1 for forcing(provide md.friction.effective_pressure)  and 2 for coupled(not implemented yet)');
 		end % }}}
 		function marshall(self,prefix,md,fid) % {{{
@@ -73,5 +73,5 @@
 			WriteData(fid,prefix,'object',self,'fieldname','p','format','DoubleMat','mattype',2);
 			WriteData(fid,prefix,'object',self,'fieldname','q','format','DoubleMat','mattype',2);
-			WriteData(fid,prefix,'class','friction','object',self,'fieldname','coupling','format','Integer'); %Silje
+			WriteData(fid,prefix,'class','friction','object',self,'fieldname','coupling','format','Integer');
 			switch self.coupling
 				case 0
@@ -89,6 +89,6 @@
 			writejs1Darray(fid,[modelname '.friction.p'],self.p);
 			writejs1Darray(fid,[modelname '.friction.q'],self.q);
-			writejs1Darray(fid,[modelname '.friction.coupling'],self.coupling);%Silje
-			writejs1Darray(fid,[modelname '.friction.effective_pressure'],self.effective_pressure);%Silje
+			writejs1Darray(fid,[modelname '.friction.coupling'],self.coupling);
+			writejs1Darray(fid,[modelname '.friction.effective_pressure'],self.effective_pressure);
 
 		end % }}}