Changeset 13027

Timestamp:

08/14/12 10:03:11 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: recover_areas is now a subfunction of setflowequations

Location:

issm/trunk-jpl/src/m

Files:

• geometry/recover_areas.m (deleted)
• geometry/recover_areas.py (deleted)
• parameterization/setflowequation.m (modified) (2 diffs)
• parameterization/setflowequation.py (modified) (1 diff)

issm/trunk-jpl/src/m/parameterization/setflowequation.m

@@ -3 +3 @@
 %
 %   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. 
@@ -280 +280 @@
         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 }}}

issm/trunk-jpl/src/m/parameterization/setflowequation.py

@@ -4 +4 @@
 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):
         """