Changeset 18684

Timestamp:

10/27/14 09:09:41 (10 years ago)

Author:

seroussi

Message:

BUG: tao algorithm name for different petsc versions

Location:

issm/trunk-jpl

Files:

• jenkins/imac-012301-gil (modified) (2 diffs)
• test/NightlyRun/test340.m (modified) (1 diff)

issm/trunk-jpl/jenkins/imac-012301-gil

@@ -14 +14 @@
         --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
+        --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
         --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
         --with-numthreads=8 \
@@ -51 +52 @@
                                                 m1qn3     install.sh    
                                                 petsc     install-3.4-macosx64.sh    
+                                                ta0       install-2.2.sh
                                                 triangle  install-macosx64.sh 
                                                 shell2junit  install.sh "

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;