Changeset 17904

Timestamp:

04/30/14 20:59:42 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: make a copy before marshalling responses

Location:

issm/trunk-jpl/src/m/classes

Files:

• m1qn3inversion.m (modified) (1 diff)
• taoinversion.m (modified) (1 diff)

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

@@ -148 +148 @@
                         num_cost_functions=size(obj.cost_functions,2);
                         data=obj.cost_functions;
-                        pos=find(data==101); data(pos)=SurfaceAbsVelMisfitEnum();
-                        pos=find(data==102); data(pos)=SurfaceRelVelMisfitEnum();
-                        pos=find(data==103); data(pos)=SurfaceLogVelMisfitEnum();
-                        pos=find(data==104); data(pos)=SurfaceLogVxVyMisfitEnum();
-                        pos=find(data==105); data(pos)=SurfaceAverageVelMisfitEnum();
-                        pos=find(data==201); data(pos)=ThicknessAbsMisfitEnum();
-                        pos=find(data==501); data(pos)=DragCoefficientAbsGradientEnum();
-                        pos=find(data==502); data(pos)=RheologyBbarAbsGradientEnum();
-                        pos=find(data==503); data(pos)=ThicknessAbsGradientEnum();
-                        pos=find(data==504); data(pos)=ThicknessAlongGradientEnum();
-                        pos=find(data==505); data(pos)=ThicknessAcrossGradientEnum();
-                        pos=find(data==506); data(pos)=BalancethicknessMisfitEnum();
+                        pos=find(obj.cost_functions==101); data(pos)=SurfaceAbsVelMisfitEnum();
+                        pos=find(obj.cost_functions==102); data(pos)=SurfaceRelVelMisfitEnum();
+                        pos=find(obj.cost_functions==103); data(pos)=SurfaceLogVelMisfitEnum();
+                        pos=find(obj.cost_functions==104); data(pos)=SurfaceLogVxVyMisfitEnum();
+                        pos=find(obj.cost_functions==105); data(pos)=SurfaceAverageVelMisfitEnum();
+                        pos=find(obj.cost_functions==201); data(pos)=ThicknessAbsMisfitEnum();
+                        pos=find(obj.cost_functions==501); data(pos)=DragCoefficientAbsGradientEnum();
+                        pos=find(obj.cost_functions==502); data(pos)=RheologyBbarAbsGradientEnum();
+                        pos=find(obj.cost_functions==503); data(pos)=ThicknessAbsGradientEnum();
+                        pos=find(obj.cost_functions==504); data(pos)=ThicknessAlongGradientEnum();
+                        pos=find(obj.cost_functions==505); data(pos)=ThicknessAcrossGradientEnum();
+                        pos=find(obj.cost_functions==506); data(pos)=BalancethicknessMisfitEnum();
                         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

@@ -148 +148 @@
                         num_cost_functions=size(obj.cost_functions,2);
                         data=obj.cost_functions;
-                        pos=find(data==101); data(pos)=SurfaceAbsVelMisfitEnum();
-                        pos=find(data==102); data(pos)=SurfaceRelVelMisfitEnum();
-                        pos=find(data==103); data(pos)=SurfaceLogVelMisfitEnum();
-                        pos=find(data==104); data(pos)=SurfaceLogVxVyMisfitEnum();
-                        pos=find(data==105); data(pos)=SurfaceAverageVelMisfitEnum();
-                        pos=find(data==201); data(pos)=ThicknessAbsMisfitEnum();
-                        pos=find(data==501); data(pos)=DragCoefficientAbsGradientEnum();
-                        pos=find(data==502); data(pos)=RheologyBbarAbsGradientEnum();
-                        pos=find(data==503); data(pos)=ThicknessAbsGradientEnum();
-                        pos=find(data==504); data(pos)=ThicknessAlongGradientEnum();
-                        pos=find(data==505); data(pos)=ThicknessAcrossGradientEnum();
-                        pos=find(data==506); data(pos)=BalancethicknessMisfitEnum();
+                        pos=find(obj.cost_functions==101); data(pos)=SurfaceAbsVelMisfitEnum();
+                        pos=find(obj.cost_functions==102); data(pos)=SurfaceRelVelMisfitEnum();
+                        pos=find(obj.cost_functions==103); data(pos)=SurfaceLogVelMisfitEnum();
+                        pos=find(obj.cost_functions==104); data(pos)=SurfaceLogVxVyMisfitEnum();
+                        pos=find(obj.cost_functions==105); data(pos)=SurfaceAverageVelMisfitEnum();
+                        pos=find(obj.cost_functions==201); data(pos)=ThicknessAbsMisfitEnum();
+                        pos=find(obj.cost_functions==501); data(pos)=DragCoefficientAbsGradientEnum();
+                        pos=find(obj.cost_functions==502); data(pos)=RheologyBbarAbsGradientEnum();
+                        pos=find(obj.cost_functions==503); data(pos)=ThicknessAbsGradientEnum();
+                        pos=find(obj.cost_functions==504); data(pos)=ThicknessAlongGradientEnum();
+                        pos=find(obj.cost_functions==505); data(pos)=ThicknessAcrossGradientEnum();
+                        pos=find(obj.cost_functions==506); data(pos)=BalancethicknessMisfitEnum();
                         WriteData(fid,'data',data,'enum',InversionCostFunctionsEnum(),'format','DoubleMat','mattype',3);
                         WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer');