Changeset 18671

Timestamp:

10/23/14 15:20:02 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: check petsc version to check what algorithm should be used

File:

• issm/trunk-jpl/src/m/classes/taoinversion.m (modified) (1 diff)

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

@@ -89 +89 @@
                         md = checkfield(md,'fieldname','inversion.grtol','numel',1,'>=',0);
                         md = checkfield(md,'fieldname','inversion.gttol','numel',1,'>=',0);
-                        md = checkfield(md,'fieldname','inversion.algorithm','values',{'tao_blmvm','tao_cg','tao_lmvm','blmvm','cg','lmvm'});
+
+                        PETSCMAJOR = IssmConfig('_PETSC_MAJOR_');
+                        PETSCMINOR = IssmConfig('_PETSC_MINOR_');
+                        if(PETSCMAJOR>3 | PETSCMAJOR==3 & PETSCMINOR>=5)
+                                md = checkfield(md,'fieldname','inversion.algorithm','values',{'blmvm','cg','lmvm'});
+                        else
+                                md = checkfield(md,'fieldname','inversion.algorithm','values',{'tao_blmvm','tao_cg','tao_lmvm'});
+                        end
+
                         md = checkfield(md,'fieldname','inversion.cost_functions','size',[1 num_costfunc],'values',[101:105 201 501:506]);
                         md = checkfield(md,'fieldname','inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices num_costfunc],'>=',0);