Changeset 19104

Timestamp:

Feb 12, 2015, 4:35:03 PM (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk and trunk-jpl

Location:

issm/trunk-jpl

Files:

• . (modified) (1 prop)
• configs/configure.sh (modified) (1 diff)
• externalpackages/petsc/install-3.5-pleiades-intel2012.0.032-mpt.2.06rp16.sh (copied) (copied from issm/trunk/externalpackages/petsc/install-3.5-pleiades-intel2012.0.032-mpt.2.06rp16.sh )
• src (modified) (1 prop)
• src/m/contrib/paraview/exportVTK.m (modified) (1 diff)

issm/trunk-jpl/configs/configure.sh

@@ -13 +13 @@
         --with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \
         --with-metis-dir="$ISSM_DIR/externalpackages/petsc/install" \
-        --with-blas-lapack-dir="$ISSM_DIR/externalpackages/petsc/install" \
         --with-scalapack-dir="$ISSM_DIR/externalpackages/petsc/install/" \
         --with-mumps-dir="$ISSM_DIR/externalpackages/petsc/install/" \

issm/trunk-jpl/src/m/contrib/paraview/exportVTK.m

@@ -59 +59 @@
                 if(size(sol_struct{i},2)>num_of_timesteps);
                         num_of_timesteps=size(sol_struct{i},2);
+    end
   end
- end
 else
         num_of_timesteps=1;