Changeset 18687

Timestamp:

10/27/14 09:35:57 (10 years ago)

Author:

seroussi

Message:

CHG: cleaner to put algorithm verion in default parameters

Location:

issm/trunk-jpl

Files:

• src/m/classes/taoinversion.m (modified) (1 diff)
• test/NightlyRun/test340.m (modified) (1 diff)

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

@@ -60 +60 @@
 
                         %minimization algorithm
-                        obj.algorithm = 'blmvm';
+                        PETSCMAJOR = IssmConfig('_PETSC_MAJOR_');
+                        PETSCMINOR = IssmConfig('_PETSC_MINOR_');
+                        if(PETSCMAJOR>3 | (PETSCMAJOR==3 & PETSCMINOR>=5))
+                                obj.algorithm = 'blmvm';
+                        else
+                                obj.algorithm = 'tao_blmvm';
+                        end
 
                         %several responses can be used:

issm/trunk-jpl/test/NightlyRun/test340.m

@@ -15 +15 @@
 md.inversion.cost_functions=[102  501];
 md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2.*10^-7;
-PETSCMAJOR = IssmConfig('_PETSC_MAJOR_');
-PETSCMINOR = IssmConfig('_PETSC_MINOR_');
-if(PETSCMAJOR>3 | (PETSCMAJOR==3 & PETSCMINOR>=5)),
-        md.inversion.algorithm='blmvm';
-else
-        md.inversion.algorithm='tao_blmvm';
-end
 md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;