Changeset 16252
- Timestamp:
- 09/25/13 10:20:12 (11 years ago)
- Location:
- issm/trunk-jpl/src
- Files:
-
- 2 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp ¶
r16243 r16252 44 44 parameters->AddObject(iomodel->CopyConstantObject(AutodiffLbufsizeEnum)); 45 45 parameters->AddObject(iomodel->CopyConstantObject(AutodiffTbufsizeEnum)); 46 parameters->AddObject(iomodel->CopyConstantObject(AutodiffGcTriggerRatioEnum)); 47 parameters->AddObject(iomodel->CopyConstantObject(AutodiffGcTriggerMaxSizeEnum)); 46 48 /*}}}*/ 47 49 /*retrieve driver: {{{*/ -
TabularUnified issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h ¶
r16248 r16252 33 33 AutodiffCbufsizeEnum, 34 34 AutodiffTbufsizeEnum, 35 AutodiffGcTriggerRatioEnum, 36 AutodiffGcTriggerMaxSizeEnum, 35 37 BalancethicknessSpcthicknessEnum, 36 38 BalancethicknessStabilizationEnum, -
TabularUnified issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp ¶
r16248 r16252 41 41 case AutodiffCbufsizeEnum : return "AutodiffCbufsize"; 42 42 case AutodiffTbufsizeEnum : return "AutodiffTbufsize"; 43 case AutodiffGcTriggerRatioEnum : return "AutodiffGcTriggerRatio"; 44 case AutodiffGcTriggerMaxSizeEnum : return "AutodiffGcTriggerMaxSize"; 43 45 case BalancethicknessSpcthicknessEnum : return "BalancethicknessSpcthickness"; 44 46 case BalancethicknessStabilizationEnum : return "BalancethicknessStabilization"; -
TabularUnified issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp ¶
r16248 r16252 41 41 else if (strcmp(name,"AutodiffCbufsize")==0) return AutodiffCbufsizeEnum; 42 42 else if (strcmp(name,"AutodiffTbufsize")==0) return AutodiffTbufsizeEnum; 43 else if (strcmp(name,"AutodiffGcTriggerRatio")==0) return AutodiffGcTriggerRatioEnum; 44 else if (strcmp(name,"AutodiffGcTriggerMaxSize")==0) return AutodiffGcTriggerMaxSizeEnum; 43 45 else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum; 44 46 else if (strcmp(name,"BalancethicknessStabilization")==0) return BalancethicknessStabilizationEnum; … … 135 137 else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum; 136 138 else if (strcmp(name,"InversionCostFunctions")==0) return InversionCostFunctionsEnum; 137 else if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum;138 else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum;139 139 else stage=2; 140 140 } 141 141 if(stage==2){ 142 if (strcmp(name,"InversionTao")==0) return InversionTaoEnum; 142 if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum; 143 else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum; 144 else if (strcmp(name,"InversionTao")==0) return InversionTaoEnum; 143 145 else if (strcmp(name,"InversionIncompleteAdjoint")==0) return InversionIncompleteAdjointEnum; 144 146 else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum; … … 258 260 else if (strcmp(name,"SurfaceforcingsS0p")==0) return SurfaceforcingsS0pEnum; 259 261 else if (strcmp(name,"SurfaceforcingsIssmbgradients")==0) return SurfaceforcingsIssmbgradientsEnum; 260 else if (strcmp(name,"SurfaceforcingsMonthlytemperatures")==0) return SurfaceforcingsMonthlytemperaturesEnum;261 else if (strcmp(name,"SurfaceforcingsHref")==0) return SurfaceforcingsHrefEnum;262 262 else stage=3; 263 263 } 264 264 if(stage==3){ 265 if (strcmp(name,"SurfaceforcingsSmbref")==0) return SurfaceforcingsSmbrefEnum; 265 if (strcmp(name,"SurfaceforcingsMonthlytemperatures")==0) return SurfaceforcingsMonthlytemperaturesEnum; 266 else if (strcmp(name,"SurfaceforcingsHref")==0) return SurfaceforcingsHrefEnum; 267 else if (strcmp(name,"SurfaceforcingsSmbref")==0) return SurfaceforcingsSmbrefEnum; 266 268 else if (strcmp(name,"SurfaceforcingsBPos")==0) return SurfaceforcingsBPosEnum; 267 269 else if (strcmp(name,"SurfaceforcingsBNeg")==0) return SurfaceforcingsBNegEnum; … … 381 383 else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum; 382 384 else if (strcmp(name,"TransientParam")==0) return TransientParamEnum; 383 else if (strcmp(name,"Matice")==0) return MaticeEnum;384 else if (strcmp(name,"Matpar")==0) return MatparEnum;385 385 else stage=4; 386 386 } 387 387 if(stage==4){ 388 if (strcmp(name,"Node")==0) return NodeEnum; 388 if (strcmp(name,"Matice")==0) return MaticeEnum; 389 else if (strcmp(name,"Matpar")==0) return MatparEnum; 390 else if (strcmp(name,"Node")==0) return NodeEnum; 389 391 else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum; 390 392 else if (strcmp(name,"NumericalfluxType")==0) return NumericalfluxTypeEnum; … … 504 506 else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum; 505 507 else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum; 506 else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum;507 else if (strcmp(name,"GiaW")==0) return GiaWEnum;508 508 else stage=5; 509 509 } 510 510 if(stage==5){ 511 if (strcmp(name,"P0")==0) return P0Enum; 511 if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum; 512 else if (strcmp(name,"GiaW")==0) return GiaWEnum; 513 else if (strcmp(name,"P0")==0) return P0Enum; 512 514 else if (strcmp(name,"P1")==0) return P1Enum; 513 515 else if (strcmp(name,"P1DG")==0) return P1DGEnum; -
TabularUnified issm/trunk-jpl/src/m/classes/autodiff.m ¶
r16244 r16252 15 15 cbufsize = NaN; 16 16 tbufsize = NaN; 17 gcTriggerRatio = NaN; 18 gcTriggerMaxSize = NaN; 17 19 end 18 20 %}}} … … 31 33 cbufsize = 524288; 32 34 tbufsize = 524288; 35 gcTriggerRatio=2.0; 36 gcTriggerMaxSize=2000000; 33 37 end % }}} 34 38 function md = checkconsistency(obj,md,solution,analyses) % {{{ … … 45 49 md = checkfield(md,'autodiff.cbufsize','>=',524288); 46 50 md = checkfield(md,'autodiff.tbufsize','>=',524288); 51 md = checkfield(md,'autodiff.gcTriggerRatio','>=',2); 52 md = checkfield(md,'autodiff.gcTriggerMaxSize','>=',2000000); 47 53 48 54 %go through our dependents and independents and check consistency: … … 67 73 fielddisplay(obj,'cbufsize','Number of values per buffer (==CBUFSIZE in usrparms.h)'); 68 74 fielddisplay(obj,'tbufsize','Number of taylors per buffer (<=TBUFSIZE in usrparms.h)'); 75 fielddisplay(obj,'gcTriggerRatio','free location block sorting/consolidation triggered if the ratio between allocated and used locations exceeds gcTriggerRatio'); 76 fielddisplay(obj,'gcTriggerMaxSize','free location block sorting/consolidation triggered if the allocated locations exceed gcTriggerMaxSize'); 69 77 end % }}} 70 78 function marshall(obj,md,fid) % {{{ … … 81 89 82 90 %buffer sizes {{{ 83 WriteData(fid,'data',obj,'fieldname','obufsize','enum',AutodiffObufsizeEnum(),'format','Double'); 84 WriteData(fid,'data',obj,'fieldname','lbufsize','enum',AutodiffLbufsizeEnum(),'format','Double'); 85 WriteData(fid,'data',obj,'fieldname','cbufsize','enum',AutodiffCbufsizeEnum(),'format','Double'); 86 WriteData(fid,'data',obj,'fieldname','tbufsize','enum',AutodiffTbufsizeEnum(),'format','Double'); 91 WriteData(fid,'object',obj,'fieldname','obufsize','format','Double'); 92 WriteData(fid,'object',obj,'fieldname','lbufsize','format','Double'); 93 WriteData(fid,'object',obj,'fieldname','cbufsize','format','Double'); 94 WriteData(fid,'object',obj,'fieldname','tbufsize','format','Double'); 95 WriteData(fid,'object',obj,'fieldname','gcTriggerRatio','format','Double'); 96 WriteData(fid,'object',obj,'fieldname','gcTriggerMaxSize','format','Double'); 87 97 %}}} 88 98 %process dependent variables {{{ -
TabularUnified issm/trunk-jpl/src/m/classes/autodiff.py ¶
r16245 r16252 23 23 self.cbufsize = float('NaN') 24 24 self.tbufsize = float('NaN') 25 self.gcTriggerMaxSize = float('NaN') 26 self.gcTriggerRatio = float('NaN') 25 27 if not len(args): 26 28 self.setdefaultparameters() … … 39 41 s+="%s\n" % fielddisplay(self,'cbufsize',"Number of values per buffer (==CBUFSIZE in usrparms.h)") 40 42 s+="%s\n" % fielddisplay(self,'tbufsize',"Number of taylors per buffer (<=TBUFSIZE in usrparms.h)") 43 s+="%s\n" % fielddisplay(self,'gcTriggerRatio',"free location block sorting/consolidation triggered if the ratio between allocated and used locations exceeds gcTriggerRatio") 44 s+="%s\n" % fielddisplay(self,'gcTriggerMaxSize',"free location block sorting/consolidation triggered if the allocated locations exceed gcTriggerMaxSize)") 45 41 46 return s 42 47 # }}} … … 46 51 self.cbufsize = 524288 47 52 self.tbufsize = 524288 53 gcTriggerRatio=2.0 54 gcTriggerMaxSize=2000000 48 55 return self 49 56 # }}} … … 58 65 md = checkfield(md,'autodiff.cbufsize','>=',524288) 59 66 md = checkfield(md,'autodiff.tbufsize','>=',524288) 67 md = checkfield(md,'autodiff.gcTriggerRatio','>=',2.0) 68 md = checkfield(md,'autodiff.gcTriggerMaxSize','>=',2000000) 60 69 61 70 #Driver value: … … 81 90 82 91 #buffer sizes {{{ 83 WriteData(fid,'data',self,'fieldname','obufsize','enum',AutodiffObufsizeEnum(),'format','Double'); 84 WriteData(fid,'data',self,'fieldname','lbufsize','enum',AutodiffLbufsizeEnum(),'format','Double'); 85 WriteData(fid,'data',self,'fieldname','cbufsize','enum',AutodiffCbufsizeEnum(),'format','Double'); 86 WriteData(fid,'data',self,'fieldname','tbufsize','enum',AutodiffTbufsizeEnum(),'format','Double'); 92 WriteData(fid,'object',self,'fieldname','obufsize','format','Double'); 93 WriteData(fid,'object',self,'fieldname','lbufsize','format','Double'); 94 WriteData(fid,'object',self,'fieldname','cbufsize','format','Double'); 95 WriteData(fid,'object',self,'fieldname','tbufsize','format','Double'); 96 WriteData(fid,'object',self,'fieldname','gcTriggerRatio','format','Double'); 97 WriteData(fid,'object',self,'fieldname','gcTriggerMaxSize','format','Double'); 87 98 #}}} 88 99 #process dependent variables {{{ -
TabularUnified issm/trunk-jpl/src/m/enum/EnumDefinitions.py ¶
r16249 r16252 33 33 def AutodiffCbufsizeEnum(): return StringToEnum("AutodiffCbufsize")[0] 34 34 def AutodiffTbufsizeEnum(): return StringToEnum("AutodiffTbufsize")[0] 35 def AutodiffGcTriggerRatioEnum(): return StringToEnum("AutodiffGcTriggerRatio")[0] 36 def AutodiffGcTriggerMaxSizeEnum(): return StringToEnum("AutodiffGcTriggerMaxSize")[0] 35 37 def BalancethicknessSpcthicknessEnum(): return StringToEnum("BalancethicknessSpcthickness")[0] 36 38 def BalancethicknessStabilizationEnum(): return StringToEnum("BalancethicknessStabilization")[0]
Note:
See TracChangeset
for help on using the changeset viewer.