Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/geometry/recover_areas.py
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/geometry/recover_areas.py	(revision 13026)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/geometry/recover_areas.py	(revision 13027)
@@ -1,26 +0,0 @@
-from pairoptions import *
-from FlagElements import *
-
-def recover_areas(md,*args):
-	"""
-	RECOVER_AREAS - flag the element depending on the physical model that is assigned to them
-
-	   This routine is called by setelementstype, do not use
-
-	   Usage:
-	      [hutterflag macayealflag pattynflag stokesflag filltype]=recover_areas(md,varargin);
-	"""
-
-	#go through varargin, extract options and plug them into subtype options, by order of appearance
-	options=pairoptions(*args)
-#	options=deleteduplicates(options,1);
-
-	#recover elements distribution
-	hutterflag  =FlagElements(md,options.getfieldvalue('hutter',''))
-	macayealflag=FlagElements(md,options.getfieldvalue('macayeal',''))
-	pattynflag  =FlagElements(md,options.getfieldvalue('pattyn',''))
-	stokesflag  =FlagElements(md,options.getfieldvalue('stokes',''))
-	filltype    =options.getfieldvalue('fill','none')
-
-	return hutterflag,macayealflag,pattynflag,stokesflag,filltype
-
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/geometry/recover_areas.m
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/geometry/recover_areas.m	(revision 13026)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/geometry/recover_areas.m	(revision 13027)
@@ -1,22 +0,0 @@
-function [hutterflag macayealflag pattynflag stokesflag filltype]=recover_areas(md,varargin);
-%RECOVER_AREAS - flag the element depending on the physical model that is assigned to them
-%
-%   This routine is called by setelementstype, do not use
-%
-%   Usage:
-%      [hutterflag macayealflag pattynflag stokesflag filltype]=recover_areas(md,varargin);
-
-	%go through varargin, extract options and plug them into subtype options, by order of appearance
-	options=pairoptions(varargin{:});
-	options=deleteduplicates(options,1);
-
-	%recover elements distribution
-	hutterflag  =FlagElements(md,getfieldvalue(options,'hutter',''));
-	macayealflag=FlagElements(md,getfieldvalue(options,'macayeal',''));
-	pattynflag  =FlagElements(md,getfieldvalue(options,'pattyn',''));
-	stokesflag  =FlagElements(md,getfieldvalue(options,'stokes',''));
-	filltype    =getfieldvalue(options,'fill','none');
-
-end %end function
-
-
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/parameterization/setflowequation.py
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/parameterization/setflowequation.py	(revision 13026)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/parameterization/setflowequation.py	(revision 13027)
@@ -3,7 +3,31 @@
 from pairoptions import *
 from recover_areas import *
 from MatlabFuncs import *
+from FlagElements import *
 
+def recover_areas(md,*args): # {{{
+	"""
+	RECOVER_AREAS - flag the element depending on the physical model that is assigned to them
+
+		This routine is called by setelementstype, do not use
+
+		Usage:
+			[hutterflag macayealflag pattynflag stokesflag filltype]=recover_areas(md,varargin);
+	"""
+
+	#go through varargin, extract options and plug them into subtype options, by order of appearance
+	options=pairoptions(*args)
+#	options=deleteduplicates(options,1);
+
+	#recover elements distribution
+	hutterflag  =FlagElements(md,options.getfieldvalue('hutter',''))
+	macayealflag=FlagElements(md,options.getfieldvalue('macayeal',''))
+	pattynflag  =FlagElements(md,options.getfieldvalue('pattyn',''))
+	stokesflag  =FlagElements(md,options.getfieldvalue('stokes',''))
+	filltype    =options.getfieldvalue('fill','none')
+
+	return hutterflag,macayealflag,pattynflag,stokesflag,filltype
+#}}}
 def setflowequation(md,*args):
 	"""
 	SETELEMENTSTYPE - associate a solution type to each element
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/parameterization/setflowequation.m
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/parameterization/setflowequation.m	(revision 13026)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/parameterization/setflowequation.m	(revision 13027)
@@ -2,7 +2,7 @@
 %SETELEMENTSTYPE - associate a solution type to each element
 %
 %   This routine works like plotmodel: it works with an even number of inputs
-%   'hutter','macayeal','pattyn','stokes' and 'fill' are the possible options
+%   'hutter','macayeal','l1l2','pattyn','stokes' and 'fill' are the possible options
 %   that must be followed by the corresponding exp file or flags list
 %   It can either be a domain file (argus type, .exp extension), or an array of element flags. 
 %   If user wants every element outside the domain to be 
@@ -279,3 +279,25 @@
 if any(md.flowequation.borderstokes) & any(md.flowequation.borderpattyn) & any(md.flowequation.borderpattyn + md.flowequation.borderstokes~=1),
 	error('error coupling domain too irregular');
 end
+end 
+
+function [hutterflag macayealflag pattynflag stokesflag filltype]=recover_areas(md,varargin); % {{{
+%RECOVER_AREAS - flag the element depending on the physical model that is assigned to them
+%
+%   This routine is called by setelementstype, do not use
+%
+%   Usage:
+%      [hutterflag macayealflag pattynflag stokesflag filltype]=recover_areas(md,varargin);
+
+	%go through varargin, extract options and plug them into subtype options, by order of appearance
+	options=pairoptions(varargin{:});
+	options=deleteduplicates(options,1);
+
+	%recover elements distribution
+	hutterflag  =FlagElements(md,getfieldvalue(options,'hutter',''));
+	macayealflag=FlagElements(md,getfieldvalue(options,'macayeal',''));
+	pattynflag  =FlagElements(md,getfieldvalue(options,'pattyn',''));
+	stokesflag  =FlagElements(md,getfieldvalue(options,'stokes',''));
+	filltype    =getfieldvalue(options,'fill','none');
+
+end %end function }}}