Changeset 16307 for issm/trunk-jpl/src/m/classes/inversion.py

Timestamp:

10/07/13 10:54:18 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: md.inversion.cost_functions is now only one line (i.e., we cannot change the cost function during the optimization)

File:

• issm/trunk-jpl/src/m/classes/inversion.py (modified) (4 diffs)

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

@@ -93 +93 @@
 
                 #several responses can be used:
-                self.cost_functions=101*numpy.ones((self.nsteps,1))
+                self.cost_functions=101
 
                 #step_threshold is used to speed up control method. When
@@ -114 +114 @@
 
                 num_controls=numpy.size(md.inversion.control_parameters)
-                num_costfunc=numpy.size(md.inversion.cost_functions,axis=1)
+                num_costfunc=numpy.size(md.inversion.cost_functions)
 
                 md = checkfield(md,'inversion.iscontrol','values',[0,1])
@@ -123 +123 @@
                 md = checkfield(md,'inversion.maxiter_per_step','size',[md.inversion.nsteps],'>=',0)
                 md = checkfield(md,'inversion.step_threshold','size',[md.inversion.nsteps])
-                md = checkfield(md,'inversion.cost_functions','size',[md.inversion.nsteps,num_costfunc],'values',[101,102,103,104,105,201,501,502,503,504,505])
+                md = checkfield(md,'inversion.cost_functions','size',[num_costfunc],'values',[101,102,103,104,105,201,501,502,503,504,505])
                 md = checkfield(md,'inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices,num_costfunc],'>=',0)
                 md = checkfield(md,'inversion.gradient_scaling','size',[md.inversion.nsteps,num_controls])
@@ -171 +171 @@
 
                 #process cost functions
-                num_cost_functions=numpy.size(self.cost_functions,axis=1)
+                num_cost_functions=numpy.size(self.cost_functions)
                 data=copy.deepcopy(self.cost_functions)
-                data[numpy.nonzero(data==101)]=SurfaceAbsVelMisfitEnum()
-                data[numpy.nonzero(data==102)]=SurfaceRelVelMisfitEnum()
-                data[numpy.nonzero(data==103)]=SurfaceLogVelMisfitEnum()
-                data[numpy.nonzero(data==104)]=SurfaceLogVxVyMisfitEnum()
-                data[numpy.nonzero(data==105)]=SurfaceAverageVelMisfitEnum()
-                data[numpy.nonzero(data==201)]=ThicknessAbsMisfitEnum()
-                data[numpy.nonzero(data==501)]=DragCoefficientAbsGradientEnum()
-                data[numpy.nonzero(data==502)]=RheologyBbarAbsGradientEnum()
-                data[numpy.nonzero(data==503)]=ThicknessAbsGradientEnum()
-                data[numpy.nonzero(data==504)]=ThicknessAlongGradientEnum()
-                data[numpy.nonzero(data==505)]=ThicknessAcrossGradientEnum()
-                WriteData(fid,'data',data,'enum',InversionCostFunctionsEnum(),'format','DoubleMat','mattype',3)
+                data=[SurfaceAbsVelMisfitEnum()        if x==101 else x for x in data]
+                data=[SurfaceRelVelMisfitEnum()        if x==102 else x for x in data]
+                data=[SurfaceLogVelMisfitEnum()        if x==103 else x for x in data]
+                data=[SurfaceLogVxVyMisfitEnum()       if x==104 else x for x in data]
+                data=[SurfaceAverageVelMisfitEnum()    if x==105 else x for x in data]
+                data=[ThicknessAbsMisfitEnum()         if x==201 else x for x in data]
+                data=[DragCoefficientAbsGradientEnum() if x==501 else x for x in data]
+                data=[RheologyBbarAbsGradientEnum()    if x==502 else x for x in data]
+                data=[ThicknessAbsGradientEnum()       if x==503 else x for x in data]
+                data=[ThicknessAlongGradientEnum()     if x==504 else x for x in data]
+                data=[ThicknessAcrossGradientEnum()    if x==505 else x for x in data]
+                WriteData(fid,'data',numpy.array(data).reshape(1,-1),'enum',InversionCostFunctionsEnum(),'format','DoubleMat','mattype',3)
                 WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer')
         # }}}