Changeset 13863

Timestamp:

10/31/12 15:57:53 (12 years ago)

Author:

jschierm

Message:

FIX: Various small things.

Location:

issm/trunk-jpl/src/m/classes

Files:

• autodiff.m (modified) (1 diff)
• autodiff.py (modified) (3 diffs)
• dependent.py (modified) (3 diffs)
• independent.py (modified) (3 diffs)

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

@@ -43 +43 @@
                 end % }}}
                 function disp(obj) % {{{
-                        disp(sprintf('   automatic differentiation parameters:'));
+                        disp(sprintf('      automatic differentiation parameters:'));
                         fielddisplay(obj,'isautodiff','indicates if the automatic differentiation is activated');
                         fielddisplay(obj,'dependents','list of dependent variables');
                         fielddisplay(obj,'independents','list of independent variables');
-                        fielddisplay(obj,'driver','ADOLC driver (''fos_forward'' or ''fov_forward''');
+                        fielddisplay(obj,'driver','ADOLC driver (''fos_forward'' or ''fov_forward'')');
                 end % }}}
                 function marshall(obj,fid) % {{{

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

@@ -29 +29 @@
 
         def __repr__(self):    # {{{
-                s ="   automatic differentiation parameters:"
+                s ="      automatic differentiation parameters:\n"
 
                 s+="%s\n" % fielddisplay(self,'isautodiff',"indicates if the automatic differentiation is activated")
                 s+="%s\n" % fielddisplay(self,'dependents',"list of dependent variables")
                 s+="%s\n" % fielddisplay(self,'independents',"list of independent variables")
-                s+="%s\n" % fielddisplay(self,'driver',"ADOLC driver ('fos_forward' or 'fov_forward'")
+                s+="%s\n" % fielddisplay(self,'driver',"ADOLC driver ('fos_forward' or 'fov_forward')")
 
                 return s
@@ -140 +140 @@
                         index-=1    #get c-index numbering going
                         WriteData(fid,'data',index,'enum',AutodiffFosReverseIndexEnum(),'format','Integer')
-                end
                 #}}}
 
@@ -159 +158 @@
                         indices-=1    #get c-indices numbering going
                         WriteData(fid,'data',indices,'enum',AutodiffFovForwardIndicesEnum(),'format','IntMat','mattype',3)
-                end
                 #}}}
 

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

@@ -1 +1 @@
 import os.path
 from pairoptions import *
+from fielddisplay import *
 from MatlabFuncs import *
 from EnumDefinitions import *
@@ -47 +48 @@
         # }}}
 
+        def __repr__(self):    # {{{
+                s ="   dependent variable:\n"
+
+                s+="%s\n" % fielddisplay(self,'name',"variable name (must match corresponding Enum)")
+                s+="%s\n" % fielddisplay(self,'type',"type of variable ('vertex' or 'scalar')")
+
+                if not isnan(self.fos_reverse_index):
+                        s+="%s\n" % fielddisplay(self,'fos_reverse_index',"index for fos_reverse driver of ADOLC")
+                if self.exp:
+                        s+="%s\n" % fielddisplay(self,'exp',"file needed to compute dependent variable")
+                        s+="%s\n" % fielddisplay(self,'segments',"mass flux segments")
+
+                return s
+        # }}}
+
         def setdefaultparameters(self):    # {{{
                 #do nothing
@@ -68 +84 @@
         # }}}
 
-        def __repr__(self):    # {{{
-                s ="   dependent variable:\n"
-
-                s+="%s\n" % fielddisplay(self,'name',"variable name (must match corresponding Enum)")
-                s+="%s\n" % fielddisplay(self,'type',"type of variable ('vertex' or 'scalar')")
-
-                if not isnan(self.fos_reverse_index):
-                        s+="%s\n" % fielddisplay(self,'fos_reverse_index',"index for fos_reverse driver of ADOLC")
-                end
-                if self.exp:
-                        s+="%s\n" % fielddisplay(self,'exp',"file needed to compute dependent variable")
-                        s+="%s\n" % fielddisplay(self,'segments',"mass flux segments")
-
-                return s
-        # }}}
-
         def typetoscalar(self):    # {{{
                 if   strcmpi(self.type,'scalar'):

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

@@ -1 +1 @@
 from pairoptions import *
+from fielddisplay import *
 from MatlabFuncs import *
 from EnumDefinitions import *
@@ -29 +30 @@
         # }}}
 
+        def __repr__(self):    # {{{
+                s ="   independent variable:\n"
+
+                s+="%s\n" % fielddisplay(self,'name',"variable name (must match corresponding Enum)")
+                s+="%s\n" % fielddisplay(self,'type',"type of variable ('vertex' or 'scalar')")
+                if not isnan(self.fos_forward_index):
+                        s+="%s\n" % fielddisplay(self,'fos_forward_index',"index for fos_foward driver of ADOLC")
+                if numpy.any(numpy.logical_not(numpy.isnan(self.fov_forward_indices))):
+                        s+="%s\n" % fielddisplay(self,'fov_forward_indices',"indices for fov_foward driver of ADOLC")
+
+                return s
+        # }}}
+
         def setdefaultparameters(self):    # {{{
                 #do nothing
@@ -46 +60 @@
                         if self.nods==0:
                                 raise TypeError("independent checkconsistency error: nods should be set to the size of the independent variable")
-                        end
                         md = checkfield(md,"autodiff.independents[%d].fov_forward_indices" % i,'>=',1,'<=',self.nods,'size',[float('NaN'),1])
 
                 return md
-        # }}}
-
-        def __repr__(self):    # {{{
-                s ="   independent variable:\n"
-
-                s+="%s\n" % fielddisplay(self,'name',"variable name (must match corresponding Enum)")
-                s+="%s\n" % fielddisplay(self,'type',"type of variable ('vertex' or 'scalar')")
-                if not isnan(self.fos_forward_index):
-                        s+="%s\n" % fielddisplay(self,'fos_forward_index',"index for fos_foward driver of ADOLC")
-                if numpy.any(numpy.logical_not(numpy.isnan(self.fov_forward_indices))):
-                        s+="%s\n" % fielddisplay(self,'fov_forward_indices',"indices for fov_foward driver of ADOLC")
-
-                return s
         # }}}