Changeset 13863


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/m/classes/autodiff.m

    r13862 r13863  
    4343                end % }}}
    4444                function disp(obj) % {{{
    45                         disp(sprintf('   automatic differentiation parameters:'));
     45                        disp(sprintf('      automatic differentiation parameters:'));
    4646                        fielddisplay(obj,'isautodiff','indicates if the automatic differentiation is activated');
    4747                        fielddisplay(obj,'dependents','list of dependent variables');
    4848                        fielddisplay(obj,'independents','list of independent variables');
    49                         fielddisplay(obj,'driver','ADOLC driver (''fos_forward'' or ''fov_forward''');
     49                        fielddisplay(obj,'driver','ADOLC driver (''fos_forward'' or ''fov_forward'')');
    5050                end % }}}
    5151                function marshall(obj,fid) % {{{
  • issm/trunk-jpl/src/m/classes/autodiff.py

    r13862 r13863  
    2929
    3030        def __repr__(self):    # {{{
    31                 s ="   automatic differentiation parameters:"
     31                s ="      automatic differentiation parameters:\n"
    3232
    3333                s+="%s\n" % fielddisplay(self,'isautodiff',"indicates if the automatic differentiation is activated")
    3434                s+="%s\n" % fielddisplay(self,'dependents',"list of dependent variables")
    3535                s+="%s\n" % fielddisplay(self,'independents',"list of independent variables")
    36                 s+="%s\n" % fielddisplay(self,'driver',"ADOLC driver ('fos_forward' or 'fov_forward'")
     36                s+="%s\n" % fielddisplay(self,'driver',"ADOLC driver ('fos_forward' or 'fov_forward')")
    3737
    3838                return s
     
    140140                        index-=1    #get c-index numbering going
    141141                        WriteData(fid,'data',index,'enum',AutodiffFosReverseIndexEnum(),'format','Integer')
    142                 end
    143142                #}}}
    144143
     
    159158                        indices-=1    #get c-indices numbering going
    160159                        WriteData(fid,'data',indices,'enum',AutodiffFovForwardIndicesEnum(),'format','IntMat','mattype',3)
    161                 end
    162160                #}}}
    163161
  • issm/trunk-jpl/src/m/classes/dependent.py

    r13862 r13863  
    11import os.path
    22from pairoptions import *
     3from fielddisplay import *
    34from MatlabFuncs import *
    45from EnumDefinitions import *
     
    4748        # }}}
    4849
     50        def __repr__(self):    # {{{
     51                s ="   dependent variable:\n"
     52
     53                s+="%s\n" % fielddisplay(self,'name',"variable name (must match corresponding Enum)")
     54                s+="%s\n" % fielddisplay(self,'type',"type of variable ('vertex' or 'scalar')")
     55
     56                if not isnan(self.fos_reverse_index):
     57                        s+="%s\n" % fielddisplay(self,'fos_reverse_index',"index for fos_reverse driver of ADOLC")
     58                if self.exp:
     59                        s+="%s\n" % fielddisplay(self,'exp',"file needed to compute dependent variable")
     60                        s+="%s\n" % fielddisplay(self,'segments',"mass flux segments")
     61
     62                return s
     63        # }}}
     64
    4965        def setdefaultparameters(self):    # {{{
    5066                #do nothing
     
    6884        # }}}
    6985
    70         def __repr__(self):    # {{{
    71                 s ="   dependent variable:\n"
    72 
    73                 s+="%s\n" % fielddisplay(self,'name',"variable name (must match corresponding Enum)")
    74                 s+="%s\n" % fielddisplay(self,'type',"type of variable ('vertex' or 'scalar')")
    75 
    76                 if not isnan(self.fos_reverse_index):
    77                         s+="%s\n" % fielddisplay(self,'fos_reverse_index',"index for fos_reverse driver of ADOLC")
    78                 end
    79                 if self.exp:
    80                         s+="%s\n" % fielddisplay(self,'exp',"file needed to compute dependent variable")
    81                         s+="%s\n" % fielddisplay(self,'segments',"mass flux segments")
    82 
    83                 return s
    84         # }}}
    85 
    8686        def typetoscalar(self):    # {{{
    8787                if   strcmpi(self.type,'scalar'):
  • issm/trunk-jpl/src/m/classes/independent.py

    r13862 r13863  
    11from pairoptions import *
     2from fielddisplay import *
    23from MatlabFuncs import *
    34from EnumDefinitions import *
     
    2930        # }}}
    3031
     32        def __repr__(self):    # {{{
     33                s ="   independent variable:\n"
     34
     35                s+="%s\n" % fielddisplay(self,'name',"variable name (must match corresponding Enum)")
     36                s+="%s\n" % fielddisplay(self,'type',"type of variable ('vertex' or 'scalar')")
     37                if not isnan(self.fos_forward_index):
     38                        s+="%s\n" % fielddisplay(self,'fos_forward_index',"index for fos_foward driver of ADOLC")
     39                if numpy.any(numpy.logical_not(numpy.isnan(self.fov_forward_indices))):
     40                        s+="%s\n" % fielddisplay(self,'fov_forward_indices',"indices for fov_foward driver of ADOLC")
     41
     42                return s
     43        # }}}
     44
    3145        def setdefaultparameters(self):    # {{{
    3246                #do nothing
     
    4660                        if self.nods==0:
    4761                                raise TypeError("independent checkconsistency error: nods should be set to the size of the independent variable")
    48                         end
    4962                        md = checkfield(md,"autodiff.independents[%d].fov_forward_indices" % i,'>=',1,'<=',self.nods,'size',[float('NaN'),1])
    5063
    5164                return md
    52         # }}}
    53 
    54         def __repr__(self):    # {{{
    55                 s ="   independent variable:\n"
    56 
    57                 s+="%s\n" % fielddisplay(self,'name',"variable name (must match corresponding Enum)")
    58                 s+="%s\n" % fielddisplay(self,'type',"type of variable ('vertex' or 'scalar')")
    59                 if not isnan(self.fos_forward_index):
    60                         s+="%s\n" % fielddisplay(self,'fos_forward_index',"index for fos_foward driver of ADOLC")
    61                 if numpy.any(numpy.logical_not(numpy.isnan(self.fov_forward_indices))):
    62                         s+="%s\n" % fielddisplay(self,'fov_forward_indices',"indices for fov_foward driver of ADOLC")
    63 
    64                 return s
    6565        # }}}
    6666
Note: See TracChangeset for help on using the changeset viewer.