Changeset 17913

Timestamp:

05/01/14 17:32:58 (11 years ago)

Author:

cborstad

Message:

BUG: a couple minor fixes for python version

File:

• issm/trunk-jpl/src/m/classes/m1qn3inversion.py (modified) (3 diffs)

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

@@ -60 +60 @@
                 string="%s\n%s"%(string,fielddisplay(self,'iscontrol','is inversion activated?'))
                 string="%s\n%s"%(string,fielddisplay(self,'incomplete_adjoint','1: linear viscosity, 0: non-linear viscosity'))
-                string="%s\n%s"%(string,fielddisplay(self,'control_parameters','ex: {''FrictionCoefficient''}, or {''MaterialsRheologyBbar''}'))
+                string="%s\n%s"%(string,fielddisplay(self,'control_parameters','ex: [''FrictionCoefficient''], or [''MaterialsRheologyBbar'']'))
                 string="%s\n%s"%(string,fielddisplay(self,'nsteps','number of optimization searches'))
                 string="%s\n%s"%(string,fielddisplay(self,'dxmin','convergence criterion: two points less than dxmin from eachother (sup-norm) are considered identical'))
@@ -118 +118 @@
                 md = checkfield(md,'fieldname','inversion.control_parameters','cell',1,'values',['BalancethicknessThickeningRate','FrictionCoefficient','MaterialsRheologyBbar','DamageDbar','Vx','Vy','Thickness'])
                 md = checkfield(md,'fieldname','inversion.nsteps','numel',[1],'>=',0)
-                md = checkfield(md,'fieldname','inversion.dxmin','numel',1,'>',0.)
-                md = checkfield(md,'fieldname','inversion.epsrel','numel',1,'>',0.)
+                md = checkfield(md,'fieldname','inversion.dxmin','numel',[1],'>',0.)
+                md = checkfield(md,'fieldname','inversion.epsrel','numel',[1],'>',0.)
                 md = checkfield(md,'fieldname','inversion.cost_functions','size',[num_costfunc],'values',[101,102,103,104,105,201,501,502,503,504,505])
                 md = checkfield(md,'fieldname','inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices,num_costfunc],'>=',0)
@@ -143 +143 @@
                 WriteData(fid,'object',self,'class','inversion','fieldname','incomplete_adjoint','format','Boolean')
                 WriteData(fid,'object',self,'class','inversion','fieldname','nsteps','format','Integer')
-                WriteData(fid,'object',obj,'class','inversion','fieldname','dxmin','format','Double')
-                WriteData(fid,'object',obj,'class','inversion','fieldname','epsrel','format','Double')
+                WriteData(fid,'object',self,'class','inversion','fieldname','dxmin','format','Double')
+                WriteData(fid,'object',self,'class','inversion','fieldname','epsrel','format','Double')
                 WriteData(fid,'object',self,'class','inversion','fieldname','cost_functions_coefficients','format','DoubleMat','mattype',1)
                 WriteData(fid,'object',self,'class','inversion','fieldname','min_parameters','format','DoubleMat','mattype',3)