Changeset 25581

Timestamp:

09/17/20 15:45:01 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: no need to look at type anymore for dependents

Location:

issm/trunk-jpl/src/m/classes

Files:

• dependent.m (modified) (4 diffs)
• dependent.py (modified) (5 diffs)

issm/trunk-jpl/src/m/classes/dependent.m

@@ -7 +7 @@
         properties (SetAccess=public) 
                 name                 = '';
-                type                 = '';
                 fos_reverse_index    = NaN;
                 exp                  = '';
@@ -21 +20 @@
 
                         self.name=getfieldvalue(options,'name','');
-                        self.type=getfieldvalue(options,'type','');
                         self.exp=getfieldvalue(options,'exp','');
                         self.segments=getfieldvalue(options,'segments',[]);
@@ -65 +63 @@
 
                         fielddisplay(self,'name','variable name (must match corresponding String)');
-                        fielddisplay(self,'type','type of variable (''vertex'' or ''scalar'')');
-
                         if ~isnan(self.fos_reverse_index),
                                 fielddisplay(self,'fos_reverse_index','index for fos_reverse driver of ADOLC');
@@ -76 +72 @@
 
                 end % }}}
-                function scalar=typetoscalar(self) % {{{
-                        if strcmpi(self.type,'scalar'),
-                                scalar=0;
-                        elseif strcmpi(self.type,'vertex'),
-                                scalar=1;
-                        end
-
-                end % }}}
         end
 end

issm/trunk-jpl/src/m/classes/dependent.py

@@ -17 +17 @@
     def __init__(self, *args):  # {{{
         self.name = ''
-        self.type = ''
         self.fos_reverse_index = float('NaN')
         self.exp = ''
@@ -31 +30 @@
 
         self.name = options.getfieldvalue('name', '')
-        self.type = options.getfieldvalue('type', '')
         self.exp = options.getfieldvalue('exp', '')
         self.segments = options.getfieldvalue('segments', [])
@@ -46 +44 @@
             self.segments = MeshProfileIntersection(mesh.elements, mesh.x, mesh.y, self.exp)[0]
     # }}}
-
     def __repr__(self):  # {{{
         s = "   dependent variable:\n"
 
         s += "%s\n" % fielddisplay(self, 'name', "variable name (must match corresponding String)")
-        s += "%s\n" % fielddisplay(self, 'type', "type of variable ('vertex' or 'scalar')")
 
         if not np.isnan(self.fos_reverse_index):
@@ -61 +57 @@
         return s
     # }}}
-
     def setdefaultparameters(self):  # {{{
         #do nothing
         return self
     # }}}
-
     def checkconsistency(self, md, solution, analyses):  # {{{
         if strcmpi(self.name, 'MassFlux'):
@@ -82 +76 @@
         return md
     # }}}
-
-    def typetoscalar(self):  # {{{
-        if strcmpi(self.type, 'scalar'):
-            scalar = 0
-        elif strcmpi(self.type, 'vertex'):
-            scalar = 1
-
-        return scalar
-    # }}}