Changeset 18682

Timestamp:

10/27/14 08:40:47 (10 years ago)

Author:

seroussi

Message:

CHG: fixing jenkins and NR for tao and m1qn3 tests

Location:

issm/trunk-jpl

Files:

• jenkins/imac-012301-gil (modified) (1 diff)
• jenkins/linux64_murdo (modified) (1 diff)
• 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-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
         --with-numthreads=8 \
         --enable-debugging \

issm/trunk-jpl/jenkins/linux64_murdo

@@ -20 +20 @@
         --with-boost-dir=$ISSM_DIR/externalpackages/boost/install/ \
         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.6/ -lgfortran" \
+        --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
         --with-numthreads=18 \
         --enable-development \

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;
-md.inversion.algorithm='tao_blmvm';
 md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;