Changeset 13642

Timestamp:

10/12/12 14:38:24 (12 years ago)

Author:

jschierm

Message:

CHG: Make default number of dimensions consistent.

File:

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

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

@@ -96 +96 @@
                 #inversed parameter (10^8 for B, 50 for drag) and can be decreased
                 #after the first iterations
-                self.gradient_scaling=50*numpy.ones(self.nsteps)
+                self.gradient_scaling=50*numpy.ones((self.nsteps,1))
 
                 #several responses can be used:
-                self.cost_functions=101*numpy.ones(self.nsteps)
+                self.cost_functions=101*numpy.ones((self.nsteps,1))
 
                 #step_threshold is used to speed up control method. When
@@ -124 +124 @@
 
                 num_controls=numpy.size(md.inversion.control_parameters)
-                num_costfunc=numpy.size(md.inversion.cost_functions,1)
+                num_costfunc=numpy.size(md.inversion.cost_functions,axis=1)
 
                 md = checkfield(md,'inversion.iscontrol','values',[0,1])
@@ -177 +177 @@
 
                 #process cost functions
-                num_cost_functions=numpy.size(self.cost_functions,1)
+                num_cost_functions=numpy.size(self.cost_functions,axis=1)
                 data=self.cost_functions
                 data[numpy.nonzero(data==101)]=SurfaceAbsVelMisfitEnum()