Changeset 13642


Ignore:
Timestamp:
10/12/12 14:38:24 (12 years ago)
Author:
jschierm
Message:

CHG: Make default number of dimensions consistent.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/m/classes/inversion.py

    r13624 r13642  
    9696                #inversed parameter (10^8 for B, 50 for drag) and can be decreased
    9797                #after the first iterations
    98                 self.gradient_scaling=50*numpy.ones(self.nsteps)
     98                self.gradient_scaling=50*numpy.ones((self.nsteps,1))
    9999
    100100                #several responses can be used:
    101                 self.cost_functions=101*numpy.ones(self.nsteps)
     101                self.cost_functions=101*numpy.ones((self.nsteps,1))
    102102
    103103                #step_threshold is used to speed up control method. When
     
    124124
    125125                num_controls=numpy.size(md.inversion.control_parameters)
    126                 num_costfunc=numpy.size(md.inversion.cost_functions,1)
     126                num_costfunc=numpy.size(md.inversion.cost_functions,axis=1)
    127127
    128128                md = checkfield(md,'inversion.iscontrol','values',[0,1])
     
    177177
    178178                #process cost functions
    179                 num_cost_functions=numpy.size(self.cost_functions,1)
     179                num_cost_functions=numpy.size(self.cost_functions,axis=1)
    180180                data=self.cost_functions
    181181                data[numpy.nonzero(data==101)]=SurfaceAbsVelMisfitEnum()
Note: See TracChangeset for help on using the changeset viewer.