Changeset 18994 for issm/trunk-jpl/src/m/classes/m1qn3inversion.py

Timestamp:

01/07/15 08:48:32 (10 years ago)

Author:

Mathieu Morlighem

Message:

NEW: merging cost functions

File:

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

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

@@ -1 +1 @@
 import numpy
-import copy
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
@@ -6 +5 @@
 from checkfield import checkfield
 from WriteData import WriteData
+from supportedcontrols import supportedcontrols
+from supportedcostfunctions import supportedcostfunctions
+from marshallcostfunctions import marshallcostfunctions
 
 class m1qn3inversion(object):
@@ -119 +121 @@
                 md = checkfield(md,'fieldname','inversion.iscontrol','values',[0,1])
                 md = checkfield(md,'fieldname','inversion.incomplete_adjoint','values',[0,1])
-                md = checkfield(md,'fieldname','inversion.control_parameters','cell',1,'values',['BalancethicknessThickeningRate','FrictionCoefficient','MaterialsRheologyBbar','DamageDbar','Vx','Vy','Thickness'])
+                md = checkfield(md,'fieldname','inversion.control_parameters','cell',1,'values',supportedcontrols())
                 md = checkfield(md,'fieldname','inversion.maxsteps','numel',[1],'>=',0)
                 md = checkfield(md,'fieldname','inversion.maxiter','numel',[1],'>=',0)
                 md = checkfield(md,'fieldname','inversion.dxmin','numel',[1],'>',0.)
                 md = checkfield(md,'fieldname','inversion.gttol','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','size',[num_costfunc],'values',supportedcostfunctions())
                 md = checkfield(md,'fieldname','inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices,num_costfunc],'>=',0)
                 md = checkfield(md,'fieldname','inversion.min_parameters','size',[md.mesh.numberofvertices,num_controls])
@@ -166 +168 @@
                 #process cost functions
                 num_cost_functions=numpy.size(self.cost_functions)
-                data=copy.deepcopy(self.cost_functions)
-                pos=[i for i,x in enumerate(self.cost_functions) if x==101];
-                for i in pos: data[i]=SurfaceAbsVelMisfitEnum()        
-                pos=[i for i,x in enumerate(self.cost_functions) if x==102];
-                for i in pos: data[i]=SurfaceRelVelMisfitEnum()        
-                pos=[i for i,x in enumerate(self.cost_functions) if x==103];
-                for i in pos: data[i]=SurfaceLogVelMisfitEnum()        
-                pos=[i for i,x in enumerate(self.cost_functions) if x==104];
-                for i in pos: data[i]=SurfaceLogVxVyMisfitEnum()       
-                pos=[i for i,x in enumerate(self.cost_functions) if x==105];
-                for i in pos: data[i]=SurfaceAverageVelMisfitEnum()    
-                pos=[i for i,x in enumerate(self.cost_functions) if x==201];
-                for i in pos: data[i]=ThicknessAbsMisfitEnum()         
-                pos=[i for i,x in enumerate(self.cost_functions) if x==501];
-                for i in pos: data[i]=DragCoefficientAbsGradientEnum() 
-                pos=[i for i,x in enumerate(self.cost_functions) if x==502];
-                for i in pos: data[i]=RheologyBbarAbsGradientEnum()    
-                pos=[i for i,x in enumerate(self.cost_functions) if x==503];
-                for i in pos: data[i]=ThicknessAbsGradientEnum()       
-                pos=[i for i,x in enumerate(self.cost_functions) if x==504];
-                for i in pos: data[i]=ThicknessAlongGradientEnum()     
-                pos=[i for i,x in enumerate(self.cost_functions) if x==505];
-                for i in pos: data[i]=ThicknessAcrossGradientEnum()    
+                data=marshallcostfunctions(self.cost_functions)
                 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')