Changeset 15396 for issm/trunk/src/m/classes/inversion.py

Timestamp:

07/02/13 09:24:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 15394

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/classes/inversion.py (modified) (9 diffs)

issm/trunk

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

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

@@ -1 @@
-#module imports
 import numpy
 import copy
@@ -16 +15 @@
         """
 
-        #properties
-        def __init__(self):
-                # {{{ Properties
+        def __init__(self): # {{{
                 self.iscontrol                   = 0
                 self.tao                         = 0
@@ -43 +40 @@
 
                 #}}}
-        def __repr__(self):
-                # {{{ Display
+        def __repr__(self): # {{{
                 string='   inversion parameters:'
                 string="%s\n%s"%(string,fielddisplay(self,'iscontrol','is inversion activated?'))
-                string="%s\n%s"%(string,fielddisplay(self,'incomplete_adjoint','do we assume linear viscosity?'))
-                string="%s\n%s"%(string,fielddisplay(self,'control_parameters','parameter where inverse control is carried out; ex: {''FrictionCoefficient''}, or {''MaterialsRheologyBbar''}'))
+                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,'nsteps','number of optimization searches'))
                 string="%s\n%s"%(string,fielddisplay(self,'cost_functions','indicate the type of response for each optimization step'))
@@ -59 +55 @@
                 string="%s\n%s"%(string,fielddisplay(self,'max_parameters','absolute maximum acceptable value of the inversed parameter on each vertex'))
                 string="%s\n%s"%(string,fielddisplay(self,'gradient_only','stop control method solution at gradient'))
-                string="%s\n%s"%(string,fielddisplay(self,'vx_obs','observed velocity x component [m/a]'))
-                string="%s\n%s"%(string,fielddisplay(self,'vy_obs','observed velocity y component [m/a]'))
-                string="%s\n%s"%(string,fielddisplay(self,'vel_obs','observed velocity magnitude [m/a]'))
+                string="%s\n%s"%(string,fielddisplay(self,'vx_obs','observed velocity x component [m/yr]'))
+                string="%s\n%s"%(string,fielddisplay(self,'vy_obs','observed velocity y component [m/yr]'))
+                string="%s\n%s"%(string,fielddisplay(self,'vel_obs','observed velocity magnitude [m/yr]'))
                 string="%s\n%s"%(string,fielddisplay(self,'thickness_obs','observed thickness [m]'))
                 string="%s\n%s"%(string,'Available cost functions:')
@@ -75 +71 @@
                 return string
                 #}}}
-
         def setdefaultparameters(self): # {{{
                 
@@ -117 +112 @@
                 return self
         #}}}
-
         def checkconsistency(self,md,solution,analyses):    # {{{
 
@@ -149 +143 @@
                 return md
         # }}}
+        def marshall(self,md,fid):    # {{{
 
-        def marshall(self,fid):    # {{{
+                yts=365.0*24.0*3600.0
 
                 WriteData(fid,'object',self,'fieldname','iscontrol','format','Boolean')
@@ -166 +161 @@
                 WriteData(fid,'object',self,'fieldname','step_threshold','format','DoubleMat','mattype',3)
                 WriteData(fid,'object',self,'fieldname','gradient_only','format','Boolean')
-                WriteData(fid,'object',self,'fieldname','vx_obs','format','DoubleMat','mattype',1)
-                WriteData(fid,'object',self,'fieldname','vy_obs','format','DoubleMat','mattype',1)
-                WriteData(fid,'object',self,'fieldname','vz_obs','format','DoubleMat','mattype',1)
+                WriteData(fid,'object',self,'fieldname','vx_obs','format','DoubleMat','mattype',1,'scale',1./yts)
+                WriteData(fid,'object',self,'fieldname','vy_obs','format','DoubleMat','mattype',1,'scale',1./yts)
+                WriteData(fid,'object',self,'fieldname','vz_obs','format','DoubleMat','mattype',1,'scale',1./yts)
                 WriteData(fid,'object',self,'fieldname','thickness_obs','format','DoubleMat','mattype',1)
 
@@ -194 +189 @@
                 WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer')
         # }}}
-

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache