Changeset 23245


Ignore:
Timestamp:
09/10/18 21:49:07 (7 years ago)
Author:
Mathieu Morlighem
Message:

CHG: added field for CoDiPack

Location:
issm/trunk-jpl/src/m/classes
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r21065 r23245  
    1414                this.gcTriggerRatio=2.0;
    1515                this.gcTriggerMaxSize=65536;
     16                this.tapeAlloc    = 15000000;
    1617
    1718        }// }}}
    … …  
    2930                fielddisplay(this,'gcTriggerRatio','free location block sorting/consolidation triggered if the ratio between allocated and used locations exceeds gcTriggerRatio');
    3031                fielddisplay(this,'gcTriggerMaxSize','free location block sorting/consolidation triggered if the allocated locations exceed gcTriggerMaxSize');
     32                fielddisplay(this,'tapeAlloc','Iteration count of a priori memory allocation of the AD tape');
    3133
    3234        }// }}}
    … …  
    4951                        checkfield(md,'fieldname','autodiff.gcTriggerRatio','>=',0);
    5052                        checkfield(md,'fieldname','autodiff.gcTriggerMaxSize','>=',65536);
     53                        checkfield(md,'fieldname','autodiff.tapeAlloc','>=',0);
    5154
    5255                        //go through our dependents and independents and check consistency:
    … …  
    7982                        WriteData(fid,prefix,'object',this,'fieldname','gcTriggerRatio','format','Double');
    8083                        WriteData(fid,prefix,'object',this,'fieldname','gcTriggerMaxSize','format','Double');
     84                        WriteData(fid,prefix,'object',this,'fieldname','tapeAlloc','format','Integer');
    8185                        //}}}
    8286                        //process dependent variables {{{
    … …  
    216220                        this.gcTriggerRatio=NullFix(this.gcTriggerRatio,NaN);
    217221                        this.gcTriggerMaxSize=NullFix(this.gcTriggerMaxSize,NaN);
     222                        this.tapeAlloc=NullFix(this.tapeAlloc,NaN);
    218223                }//}}}
    219224        //properties
    … …  
    229234        this.gcTriggerRatio = NaN;
    230235        this.gcTriggerMaxSize = NaN;
     236        this.tapeAlloc = NaN;
    231237
    232238        this.setdefaultparameters();

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

    r22839 r23245  
    1717                gcTriggerRatio = NaN;
    1818                gcTriggerMaxSize = NaN;
     19                tapeAlloc = NaN;
    1920                end
    2021                %}}}
    … …  
    3536                self.gcTriggerRatio=2.0;
    3637                self.gcTriggerMaxSize=65536;
     38                self.tapeAlloc    = 15000000;
    3739                end % }}}
    3840                function md = checkconsistency(self,md,solution,analyses) % {{{
    … …  
    5153                        md = checkfield(md,'fieldname','autodiff.gcTriggerRatio','>=',0);
    5254                        md = checkfield(md,'fieldname','autodiff.gcTriggerMaxSize','>=',65536);
     55                        md = checkfield(md,'fieldname','autodiff.tapeAlloc','>=',0);
    5356
    5457                        %go through our dependents and independents and check consistency:
    … …  
    7578                        fielddisplay(self,'gcTriggerRatio','free location block sorting/consolidation triggered if the ratio between allocated and used locations exceeds gcTriggerRatio');
    7679                        fielddisplay(self,'gcTriggerMaxSize','free location block sorting/consolidation triggered if the allocated locations exceed gcTriggerMaxSize');
     80                        fielddisplay(self,'tapeAlloc','Iteration count of a priori memory allocation of the AD tape');
    7781                end % }}}
    7882                function marshall(self,prefix,md,fid) % {{{
    … …  
    9599                        WriteData(fid,prefix,'object',self,'fieldname','gcTriggerRatio','format','Double');
    96100                        WriteData(fid,prefix,'object',self,'fieldname','gcTriggerMaxSize','format','Double');
     101                        WriteData(fid,prefix,'object',self,'fieldname','tapeAlloc','format','Integer');
    97102                        %}}}
    98103                        %process dependent variables {{{

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

    r21303 r23245  
    2525                self.gcTriggerMaxSize     = float('NaN')
    2626                self.gcTriggerRatio     = float('NaN')
     27                self.tapeAlloc = float('NaN')
    2728                if not len(args):
    2829                        self.setdefaultparameters()
    … …  
    4344                s+="%s\n" % fielddisplay(self,'gcTriggerRatio',"free location block sorting/consolidation triggered if the ratio between allocated and used locations exceeds gcTriggerRatio")
    4445                s+="%s\n" % fielddisplay(self,'gcTriggerMaxSize',"free location block sorting/consolidation triggered if the allocated locations exceed gcTriggerMaxSize)")
     46                s+="%s\n" % fielddisplay(self,'tapeAlloc','Iteration count of a priori memory allocation of the AD tape');
    4547
    4648                return s
    … …  
    5456                self.gcTriggerRatio=2.0
    5557                self.gcTriggerMaxSize=65536
     58                self.tapeAlloc    = 15000000;
    5659                return self
    5760        # }}}
    … …  
    6871                md = checkfield(md,'fieldname','autodiff.gcTriggerRatio','>=',2.0)
    6972                md = checkfield(md,'fieldname','autodiff.gcTriggerMaxSize','>=',65536)
     73                md = checkfield(md,'fieldname','autodiff.tapeAlloc','>=',0);
    7074
    7175                #Driver value:
    … …  
    97101                WriteData(fid,prefix,'object',self,'fieldname','gcTriggerRatio','format','Double');
    98102                WriteData(fid,prefix,'object',self,'fieldname','gcTriggerMaxSize','format','Double');
    99                 #}}}
     103                WriteData(fid,prefix,'object',self,'fieldname','tapeAlloc','format','Integer');
     104                #}}}
    100105                #process dependent variables {{{
    101106                num_dependent_objects=len(self.dependents)
Note: See TracChangeset for help on using the changeset viewer.