Changeset 18169

Timestamp:

06/20/14 10:41:57 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: working on new bed topography algorithm

Location:

issm/trunk-jpl/src/m/classes

Files:

• balancethickness2.m (modified) (1 diff)
• inversion.m (modified) (2 diffs)
• taoinversion.m (modified) (1 diff)

issm/trunk-jpl/src/m/classes/balancethickness2.m

@@ -43 +43 @@
                         fielddisplay(obj,'spcpotential','potential constraints (NaN means no constraint)');
                         fielddisplay(obj,'apparent_massbalance','Apparent mass balance [m/yr]');
+                        fielddisplay(obj,'nux','vx_bar = nux vx_s (in ]0 1])');
+                        fielddisplay(obj,'nuy','vy_bar = nuy vy_s (in ]0 1])');
+                        fielddisplay(obj,'vx_obs','observed vx');
+                        fielddisplay(obj,'vy_obs','observed vy');
+                        fielddisplay(obj,'thickness_obs','observed H');
 
                 end % }}}

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

@@ -132 +132 @@
                         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'});
+                                {'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'DamageDbar' 'Vx' 'Vy' 'Thickness' 'BalancethicknessNux' 'BalancethicknessNuy' 'BalancethicknessApparentMassbalance'});
                         md = checkfield(md,'fieldname','inversion.nsteps','numel',1,'>=',0);
                         md = checkfield(md,'fieldname','inversion.maxiter_per_step','size',[md.inversion.nsteps 1],'>=',0);
                         md = checkfield(md,'fieldname','inversion.step_threshold','size',[md.inversion.nsteps 1]);
-                        md = checkfield(md,'fieldname','inversion.cost_functions','size',[1 num_costfunc],'values',[101:105 201 501:506]);
+                        md = checkfield(md,'fieldname','inversion.cost_functions','size',[1 num_costfunc],'values',[101:105 201 501:507]);
                         md = checkfield(md,'fieldname','inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices num_costfunc],'>=',0);
                         md = checkfield(md,'fieldname','inversion.gradient_scaling','size',[md.inversion.nsteps num_controls]);
@@ -232 +232 @@
                         pos=find(obj.cost_functions==505); data(pos)=ThicknessAcrossGradientEnum();
                         pos=find(obj.cost_functions==506); data(pos)=BalancethicknessMisfitEnum();
+                        pos=find(obj.cost_functions==507); data(pos)=Balancethickness2MisfitEnum();
                         WriteData(fid,'data',data,'enum',InversionCostFunctionsEnum(),'format','DoubleMat','mattype',3);
                         WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer');

issm/trunk-jpl/src/m/classes/taoinversion.m

@@ -183 +183 @@
                         pos=find(obj.cost_functions==505); data(pos)=ThicknessAcrossGradientEnum();
                         pos=find(obj.cost_functions==506); data(pos)=BalancethicknessMisfitEnum();
+                        pos=find(obj.cost_functions==507); data(pos)=Balancethickness2MisfitEnum();
                         WriteData(fid,'data',data,'enum',InversionCostFunctionsEnum(),'format','DoubleMat','mattype',3);
                         WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer');