[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] (no subject)
From: |
Yves Renard |
Subject: |
[Getfem-commits] (no subject) |
Date: |
Sun, 18 Jun 2017 13:29:13 -0400 (EDT) |
branch: devel-yves
commit 9b94fb70c274d6906d681db2d908e9da10fce1d5
Author: Yves Renard <address@hidden>
Date: Sun Jun 18 20:28:32 2017 +0200
minor modification
---
configure.ac | 4 +---
interface/tests/matlab/check_spmat.m | 3 ++-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index e030753..74e1774 100644
--- a/configure.ac
+++ b/configure.ac
@@ -872,7 +872,7 @@ if test "$usematlab" != NO; then
if $(echo "" | $MEX 2>&1 | grep 'This is .*TeX'); then
AC_MSG_ERROR([the mex binary which is in the PATH appears to be part
of LaTeX, not matlab !! run ./configure MEX=/path/to/matlab/mex]);
fi;
- MATLAB_ROOT=`$MEX -v 2>&1 | grep "MATLAB_" | awk '{print $4}'|sed -e
'2,$d'`
+ MATLAB_ROOT=`$MEX -v 2>&1 | grep "MATLAB " | awk '{print $4}'|sed -e
'2,$d'`
Matlab_INC_DIR=$MATLAB_ROOT/extern/include
echo "checking for matlab path... " $MATLAB_ROOT
MATLAB_COM_EXT=`$MEX -v 2>&1 | grep "LDEXTENSION " | awk '{print $3}'`
@@ -884,8 +884,6 @@ if test "$usematlab" != NO; then
fi
AM_CONDITIONAL(BUILDMEX, test x$usematlab = xYES)
-
-
AC_SUBST(MATLAB_ROOT)
AC_SUBST(MATLAB_INC_DIR)
AC_SUBST(MATLAB_RELEASE)
diff --git a/interface/tests/matlab/check_spmat.m
b/interface/tests/matlab/check_spmat.m
index 91d2e5b..d5e2612 100644
--- a/interface/tests/matlab/check_spmat.m
+++ b/interface/tests/matlab/check_spmat.m
@@ -168,7 +168,8 @@ function check_spmat(iverbose,idebug)
A=gf_asm('laplacian',mim,mf,mf,ones(1,gf_mesh_fem_get(mf,'nbdof')));
A=A+.1*speye(size(A,1));
B=rand(gf_mesh_fem_get(mf,'nbdof'),1);
- [L,U]=ilu(A);
+ setup.type='nofill';
+ [L,U]=ilu(A,setup);
X1=gf_linsolve('cg',A,B);
mm=gf_spmat('copy',inv(L));
p=gf_precond('spmat',mm);