Commit f3695bae authored by prudhomm's avatar prudhomm
Browse files

applied yabu

parent 3a45420b
-Idebug
ChangeLog
Doxyfile
Doxygen
Doxylog
Makefile
......
......@@ -29,7 +29,8 @@ $(top_srcdir)/configure.in: $(top_srcdir)/subdirs $(top_srcdir)/configure.files
cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in
EXTRA_DIST = configure.in.in configure.in.bot configure.in.mid subdirs configure.files Mainpage.dox BUGS
EXTRA_DIST = configure.in.in configure.in.bot configure.in.mid subdirs configure.files\
Mainpage.dox BUGS Makefile.headers
MAINTAINERCLEANFILES = configure.files subdirs
......@@ -38,6 +39,8 @@ SUBDIRS = admin doc life testsuite
include $(top_srcdir)/admin/Doxyfile.am
include $(top_srcdir)/Makefile.headers
dist-hook: changelog
# make sure that we have an up-to-date ChangeLog
if test -w . -a $(top_srcdir) != $(top_builddir) -a ! -f ChangeLog; then\
......@@ -88,3 +91,6 @@ $(top_srcdir)/acinclude.m4:
@echo 'm4_include([admin/lifev_check_compilers.m4])'>>acinclude.m4
@echo 'm4_include([admin/lifev_default_paths.m4])'>>acinclude.m4
Makefile.headers: tools/update-headers
$(SHELL) tools/update-headers
......@@ -26,7 +26,8 @@ New in 0.7.0:
** Renamed lifeV.hpp to life.hpp and split it
** lifeversion.hpp to handle macros and functions to interrogate
life version
** lifemacros.hpp for assertions macros
** lifemacros.hpp for deprecation, (no)export macros
** lifeassert.hpp for assertions macros
* Added SmartAssert class and LIFEV_ASSERT macro (CP)
[lifefem]
......@@ -37,6 +38,10 @@ New in 0.7.0:
[testsuite]
* Added levelset tests (DADP)
[tools]
* Added inspect: a tool to check for issues like missing copyright,
missing license, tabs in file, minmax issues, ...
New in 0.6.0:
=============
......@@ -277,4 +282,4 @@ New in 0.1.0pre3:
* fixed some bugs and miscompilation in a few places
-- Christophe Prud'homme <prudhomm@debian.org>, Sat Feb 19 22:49:20 2005
-- Christophe Prud'homme <prudhomm@debian.org>, Tue Feb 22 10:15:24 2005
......@@ -59,9 +59,12 @@ AC_CHECK_PROG(LIFE_HAS_DOT, dot, [yes] )
AC_CHECK_BOOST
AC_CHECK_BOOST_GRAPH
AC_CHECK_BOOST_SIGNALS
AC_CHECK_BOOST_REGEX
AC_CHECK_BOOST_FILESYSTEM
AC_CHECK_BOOST_TEST
dnl
dnl checks for some scientific computing libraries
dnl
......@@ -92,13 +95,10 @@ AC_CHECK_LIB([grace_np],GraceClose,[grace_libs="-lgrace_np"],[grace_libs=""])
AC_SUBST(grace_libs)
all_includes="-I\$(top_srcdir)/life/lifecore -I\$(top_srcdir)/life/lifearray -I\$(top_srcdir)/life/lifemesh -I\$(top_srcdir)/life/lifealg -I\$(top_srcdir)/life/lifefem -I\$(top_srcdir)/life/lifesolver -I\$(top_srcdir)/life/lifefilters"
AC_SUBST(all_includes)
CPPFLAGS="-DTHREEDIM ${CPPFLAGS}"
CXXFLAGS="-Wall ${CXXFLAGS}"
#all_includes="-I\$(top_srcdir) -I\$(top_srcdir)/life/lifecore -I\$(top_srcdir)/life/lifearray -I\$(top_srcdir)/life/lifemesh -I\$(top_srcdir)/life/lifealg -I\$(top_srcdir)/life/lifefem -I\$(top_srcdir)/life/lifesolver -I\$(top_srcdir)/life/lifefilters"
#AC_SUBST(all_includes)
CPPFLAGS="-I\$(top_srcdir) ${CPPFLAGS}"
life_libs="\$(top_builddir)/life/lifefilters/liblifefilters.la \$(top_builddir)/life/lifesolver/liblifesolver.la \$(top_builddir)/life/lifefem/liblifefem.la \$(top_builddir)/life/lifealg/liblifealg.la \$(top_builddir)/life/lifemesh/liblifemesh.la \$(top_builddir)/life/lifearray/liblifearray.la \$(top_builddir)/life/lifecore/liblifecore.la"
......@@ -107,6 +107,7 @@ life_libs="\$(top_builddir)/life/lifefilters/liblifefilters.la \$(top_builddir)/
#life_libs="\$(top_builddir)/life/lifefilters/liblifefilters.la \$(top_builddir)/life/lifefem/liblifefem.la \$(top_builddir)/life/lifealg/liblifealg.la \$(top_builddir)/life/lifearray/liblifearray.la \$(top_builddir)/life/lifemesh/liblifemesh.la \$(top_builddir)/life/lifecore/liblifecore.la"
AC_SUBST(life_libs)
LIFEV_LIBS="-llifefilters -llifesolver -llifefem -llifealg -llifemesh -llifearray -llifecore"
#
......@@ -120,3 +121,6 @@ fi
dnl testdir
AC_CONFIG_TESTDIR(testsuite)
dnl pkgconfig
AX_CREATE_PKGCONFIG_INFO(life.pc,,[${LIFEV_LIBS} $LIBS],[Finite Element Library and more],[$CPPFLAGS $CFLAGS])
......@@ -9,7 +9,7 @@
<ignoreparts/>
<projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
<description></description>
<description/>
<secondaryLanguages>
<language>Fortran77</language>
</secondaryLanguages>
......@@ -23,7 +23,7 @@
<mainprogram>src/life</mainprogram>
<directoryradio>executable</directoryradio>
<customdirectory>/</customdirectory>
<programargs></programargs>
<programargs/>
<terminal>false</terminal>
<autocompile>true</autocompile>
<envvars/>
......@@ -61,17 +61,17 @@
<abortonerror>false</abortonerror>
<numberofjobs>1</numberofjobs>
<dontact>false</dontact>
<makebin></makebin>
<makebin/>
</make>
</kdevautoproject>
<kdevdebugger>
<general>
<dbgshell>libtool</dbgshell>
<programargs></programargs>
<gdbpath></gdbpath>
<configGdbScript></configGdbScript>
<runShellScript></runShellScript>
<runGdbScript></runGdbScript>
<programargs/>
<gdbpath/>
<configGdbScript/>
<runShellScript/>
<runGdbScript/>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
......@@ -113,7 +113,10 @@
</codecompletion>
</kdevcppsupport>
<kdevfileview>
<groups/>
<groups>
<hidenonprojectfiles>false</hidenonprojectfiles>
<hidenonlocation>false</hidenonlocation>
</groups>
<tree>
<hidepatterns>*.o,*.lo,CVS</hidepatterns>
<showvcsfields>false</showvcsfields>
......
......@@ -22,26 +22,12 @@
SUFFIXES = .cpp .hpp .idl .c .h .f .F .o .moc
INCLUDES = -I$(top_srcdir)/life/lifecore -I$(top_srcdir)/life/lifearray -I$(top_srcdir)/life/lifemesh
#INCLUDES = -I$(top_srcdir)/life/lifecore -I$(top_srcdir)/life/lifearray
if HAVE_PETSC
PETSC_SRCS = SolverPETSC.cpp
PETSC_HDRS = SolverPETSC.hpp
PETSC_SRCS=SolverPETSC.cpp
endif
if HAVE_UMFPACK
UMFPACK_SRCS = SolverUMFPACK.cpp
UMFPACK_HDRS = SolverUMFPACK.hpp
UMFPACK_SRCS=SolverUMFPACK.cpp
endif
BLASLAPACK = cblas.h clapack.h
include_HEADERS = $(BLASLAPACK) algebraic_facto.hpp dataAztec.hpp \
dataNewton.hpp inexactLU.hpp \
linesearch_cubic.hpp linesearch_parabolic.hpp newton.hpp \
picard.hpp saddlePointCG.hpp SolverAztec.hpp \
generalizedAitken.hpp nonLinRichardson.hpp \
$(PETSC_HDRS) $(UMFPACK_HDRS)
lib_LTLIBRARIES = liblifealg.la
......
......@@ -31,7 +31,7 @@
#include <boost/utility.hpp>
#include <SolverAztec.hpp>
#include <life/lifealg/SolverAztec.hpp>
class GetPot;
......
......@@ -29,8 +29,8 @@
#ifndef SolverAztec_H
#define SolverAztec_H 1
#include <dataAztec.hpp>
#include <vecUnknown.hpp>
#include <life/lifealg/dataAztec.hpp>
#include <life/lifearray/vecUnknown.hpp>
class GetPot;
......
......@@ -30,13 +30,13 @@
*/
#include <lifeconfig.h>
#include <debug.hpp>
#include <life/lifecore/debug.hpp>
#include <vecUnknown.hpp>
#include <GetPot.hpp>
#include <singleton.hpp>
#include <life/lifearray/vecUnknown.hpp>
#include <life/lifecore/GetPot.hpp>
#include <life/lifecore/singleton.hpp>
#include <SolverPETSC.hpp>
#include <life/lifealg/SolverPETSC.hpp>
namespace LifeV
{
......
......@@ -40,10 +40,10 @@
#include <petscpc.h>
#endif /* HAVE_PETSC_H */
#include <singleton.hpp>
#include <life/lifecore/singleton.hpp>
#include <vecUnknown.hpp>
#include <sparseArray.hpp>
#include <life/lifearray/vecUnknown.hpp>
#include <life/lifearray/sparseArray.hpp>
class GetPot;
......
......@@ -26,9 +26,9 @@
\author Christophe Prud'homme <christophe.prudhomme@epfl.ch>
\date 2004-10-04
*/
#include <debug.hpp>
#include <life/lifecore/debug.hpp>
#include <SolverUMFPACK.hpp>
#include <life/lifealg/SolverUMFPACK.hpp>
#include <boost/numeric/ublas/matrix_sparse.hpp>
#include <boost/numeric/ublas/io.hpp>
......
......@@ -40,8 +40,8 @@ extern "C"
#include <boost/utility.hpp>
#include <boost/numeric/ublas/vector.hpp>
#include <sparseArray.hpp>
#include <vecUnknown.hpp>
#include <life/lifearray/sparseArray.hpp>
#include <life/lifearray/vecUnknown.hpp>
namespace LifeV
{
......@@ -123,7 +123,7 @@ public:
/*!
\param __X the solution
\param __B the right hand side
\param __B the right hand side
\return the number of iterations
*/
void solve( array_type& __X, array_type const& __B );
......
......@@ -57,8 +57,8 @@
#define DATA_NAME_AZTEC_MATS 40
#endif
#include "sparseArray.hpp"
#include "dataAztec.hpp"
#include <life/lifearray/sparseArray.hpp>
#include <life/lifealg/dataAztec.hpp>
namespace LifeV
{
......
/*
* cblas_f77.h
* Written by Keita Teranishi
*
* Updated by Jeff Horner
* Merged cblas_f77.h and cblas_fortran_header.h
*/
/*
* Updated 2004 Christophe Prud'homme <christophe.prudhomme@epfl.ch>
* - use F77NAME() to declare the fortran functions
* - removed some extremely verbose declarations
*/
#ifndef CBLAS_F77_H
#define CBLAS_f77_H
#include <life/lifecore/fortran_wrap.hpp>
#ifdef __cplusplus
#include <cstdio>
extern "C"
{
#endif
int F77NAME(xerbla)(char*, int*);
/*
* Level 1 Fortran Prototypes
*/
/* Single Precision */
void F77NAME(srot)(const int*, float *, const int*, float *, const int*, const float *, const float *);
void F77NAME(srotg)(float *,float *,float *,float *);
void F77NAME(srotm)( const int*, float *, const int*, float *, const int*, const float *);
void F77NAME(srotmg)(float *,float *,float *,const float *, float *);
void F77NAME(sswap)( const int*, float *, const int*, float *, const int*);
void F77NAME(scopy)( const int*, const float *, const int*, float *, const int*);
void F77NAME(saxpy)( const int*, const float *, const float *, const int*, float *, const int*);
void F77NAME(sdot_sub)(const int*, const float *, const int*, const float *, const int*, float *);
void F77NAME(sdsdot_sub)( const int*, const float *, const float *, const int*, const float *, const int*, float *);
void F77NAME(sscal)( const int*, const float *, float *, const int*);
void F77NAME(snrm2_sub)( const int*, const float *, const int*, float *);
void F77NAME(sasum_sub)( const int*, const float *, const int*, float *);
void F77NAME(isamax_sub)( const int*, const float * , const int*, const int*);
/* Double Precision */
void F77NAME(drot)(const int*, double *, const int*, double *, const int*, const double *, const double *);
void F77NAME(drotg)(double *,double *,double *,double *);
void F77NAME(drotm)( const int*, double *, const int*, double *, const int*, const double *);
void F77NAME(drotmg)(double *,double *,double *,const double *, double *);
void F77NAME(dswap)( const int*, double *, const int*, double *, const int*);
void F77NAME(dcopy)( const int*, const double *, const int*, double *, const int*);
void F77NAME(daxpy)( const int*, const double *, const double *, const int*, double *, const int*);
void F77NAME(dswap)( const int*, double *, const int*, double *, const int*);
void F77NAME(dsdot_sub)(const int*, const float *, const int*, const float *, const int*, double *);
void F77NAME(ddot_sub)( const int*, const double *, const int*, const double *, const int*, double *);
void F77NAME(dscal)( const int*, const double *, double *, const int*);
void F77NAME(dnrm2_sub)( const int*, const double *, const int*, double *);
void F77NAME(dasum_sub)( const int*, const double *, const int*, double *);
void F77NAME(idamax_sub)( const int*, const double * , const int*, const int*);
/* Single Complex Precision */
void F77NAME(cswap)( const int*, void *, const int*, void *, const int*);
void F77NAME(ccopy)( const int*, const void *, const int*, void *, const int*);
void F77NAME(caxpy)( const int*, const void *, const void *, const int*, void *, const int*);
void F77NAME(cswap)( const int*, void *, const int*, void *, const int*);
void F77NAME(cdotc_sub)( const int*, const void *, const int*, const void *, const int*, void *);
void F77NAME(cdotu_sub)( const int*, const void *, const int*, const void *, const int*, void *);
void F77NAME(cscal)( const int*, const void *, void *, const int*);
void F77NAME(icamax_sub)( const int*, const void *, const int*, const int*);
void F77NAME(csscal)( const int*, const float *, void *, const int*);
void F77NAME(scnrm2_sub)( const int*, const void *, const int*, float *);
void F77NAME(scasum_sub)( const int*, const void *, const int*, float *);
/* Double Complex Precision */
void F77NAME(zswap)( const int*, void *, const int*, void *, const int*);
void F77NAME(zcopy)( const int*, const void *, const int*, void *, const int*);
void F77NAME(zaxpy)( const int*, const void *, const void *, const int*, void *, const int*);
void F77NAME(zswap)( const int*, void *, const int*, void *, const int*);
void F77NAME(zdotc_sub)( const int*, const void *, const int*, const void *, const int*, void *);
void F77NAME(zdotu_sub)( const int*, const void *, const int*, const void *, const int*, void *);
void F77NAME(zdscal)( const int*, const double *, void *, const int*);
void F77NAME(zscal)( const int*, const void *, void *, const int*);
void F77NAME(dznrm2_sub)( const int*, const void *, const int*, double *);
void F77NAME(dzasum_sub)( const int*, const void *, const int*, double *);
void F77NAME(izamax_sub)( const int*, const void *, const int*, const int*);
/*
* Level 2 Fortran Prototypes
*/
/* Single Precision */
void F77NAME(sgemv)(char*, const int*, const int*, const float *, const float *, const int*, const float *, const int*, const float *, float *, const int*);
void F77NAME(sgbmv)(char*, const int*, const int*, const int*, const int*, const float *, const float *, const int*, const float *, const int*, const float *, float *, const int*);
void F77NAME(ssymv)(char*, const int*, const float *, const float *, const int*, const float *, const int*, const float *, float *, const int*);
void F77NAME(ssbmv)(char*, const int*, const int*, const float *, const float *, const int*, const float *, const int*, const float *, float *, const int*);
void F77NAME(sspmv)(char*, const int*, const float *, const float *, const float *, const int*, const float *, float *, const int*);
void F77NAME(strmv)( char*, char*, char*, const int*, const float *, const int*, float *, const int*);
void F77NAME(stbmv)( char*, char*, char*, const int*, const int*, const float *, const int*, float *, const int*);
void F77NAME(strsv)( char*, char*, char*, const int*, const float *, const int*, float *, const int*);
void F77NAME(stbsv)( char*, char*, char*, const int*, const int*, const float *, const int*, float *, const int*);
void F77NAME(stpmv)( char*, char*, char*, const int*, const float *, float *, const int*);
void F77NAME(stpsv)( char*, char*, char*, const int*, const float *, float *, const int*);
void F77NAME(sger)( const int*, const int*, const float *, const float *, const int*, const float *, const int*, float *, const int*);
void F77NAME(ssyr)(char*, const int*, const float *, const float *, const int*, float *, const int*);
void F77NAME(sspr)(char*, const int*, const float *, const float *, const int*, float *);
void F77NAME(sspr2)(char*, const int*, const float *, const float *, const int*, const float *, const int*, float *);
void F77NAME(ssyr2)(char*, const int*, const float *, const float *, const int*, const float *, const int*, float *, const int*);
/* Double Precision */
void F77NAME(dgemv)(char*, const int*, const int*, const double *, const double *, const int*, const double *, const int*, const double *, double *, const int*);
void F77NAME(dgbmv)(char*, const int*, const int*, const int*, const int*, const double *, const double *, const int*, const double *, const int*, const double *, double *, const int*);
void F77NAME(dsymv)(char*, const int*, const double *, const double *, const int*, const double *, const int*, const double *, double *, const int*);
void F77NAME(dsbmv)(char*, const int*, const int*, const double *, const double *, const int*, const double *, const int*, const double *, double *, const int*);
void F77NAME(dspmv)(char*, const int*, const double *, const double *, const double *, const int*, const double *, double *, const int*);
void F77NAME(dtrmv)( char*, char*, char*, const int*, const double *, const int*, double *, const int*);
void F77NAME(dtbmv)( char*, char*, char*, const int*, const int*, const double *, const int*, double *, const int*);
void F77NAME(dtrsv)( char*, char*, char*, const int*, const double *, const int*, double *, const int*);
void F77NAME(dtbsv)( char*, char*, char*, const int*, const int*, const double *, const int*, double *, const int*);
void F77NAME(dtpmv)( char*, char*, char*, const int*, const double *, double *, const int*);
void F77NAME(dtpsv)( char*, char*, char*, const int*, const double *, double *, const int*);
void F77NAME(dger)( const int*, const int*, const double *, const double *, const int*, const double *, const int*, double *, const int*);
void F77NAME(dsyr)(char*, const int*, const double *, const double *, const int*, double *, const int*);
void F77NAME(dspr)(char*, const int*, const double *, const double *, const int*, double *);
void F77NAME(dspr2)(char*, const int*, const double *, const double *, const int*, const double *, const int*, double *);
void F77NAME(dsyr2)(char*, const int*, const double *, const double *, const int*, const double *, const int*, double *, const int*);
/* Single Complex Precision */
void F77NAME(cgemv)(char*, const int*, const int*, const void *, const void *, const int*, const void *, const int*, const void *, void *, const int*);
void F77NAME(cgbmv)(char*, const int*, const int*, const int*, const int*, const void *, const void *, const int*, const void *, const int*, const void *, void *, const int*);
void F77NAME(chemv)(char*, const int*, const void *, const void *, const int*, const void *, const int*, const void *, void *, const int*);
void F77NAME(chbmv)(char*, const int*, const int*, const void *, const void *, const int*, const void *, const int*, const void *, void *, const int*);
void F77NAME(chpmv)(char*, const int*, const void *, const void *, const void *, const int*, const void *, void *, const int*);
void F77NAME(ctrmv)( char*, char*, char*, const int*, const void *, const int*, void *, const int*);
void F77NAME(ctbmv)( char*, char*, char*, const int*, const int*, const void *, const int*, void *, const int*);
void F77NAME(ctpmv)( char*, char*, char*, const int*, const void *, void *, const int*);
void F77NAME(ctrsv)( char*, char*, char*, const int*, const void *, const int*, void *, const int*);
void F77NAME(ctbsv)( char*, char*, char*, const int*, const int*, const void *, const int*, void *, const int*);
void F77NAME(ctpsv)( char*, char*, char*, const int*, const void *, void *,const int*);
void F77NAME(cgerc)( const int*, const int*, const void *, const void *, const int*, const void *, const int*, void *, const int*);
void F77NAME(cgeru)( const int*, const int*, const void *, const void *, const int*, const void *, const int*, void *, const int*);
void F77NAME(cher)(char*, const int*, const float *, const void *, const int*, void *, const int*);
void F77NAME(cher2)(char*, const int*, const void *, const void *, const int*, const void *, const int*, void *, const int*);
void F77NAME(chpr)(char*, const int*, const float *, const void *, const int*, void *);
void F77NAME(chpr2)(char*, const int*, const float *, const void *, const int*, const void *, const int*, void *);
/* Double Complex Precision */
void F77NAME(zgemv)(char*, const int*, const int*, const void *, const void *, const int*, const void *, const int*, const void *, void *, const int*);
void F77NAME(zgbmv)(char*, const int*, const int*, const int*, const int*, const void *, const void *, const int*, const void *, const int*, const void *, void *, const int*);
void F77NAME(zhemv)(char*, const int*, const void *, const void *, const int*, const void *, const int*, const void *, void *, const int*);
void F77NAME(zhbmv)(char*, const int*, const int*, const void *, const void *, const int*, const void *, const int*, const void *, void *, const int*);
void F77NAME(zhpmv)(char*, const int*, const void *, const void *, const void *, const int*, const void *, void *, const int*);
void F77NAME(ztrmv)( char*, char*, char*, const int*, const void *, const int*, void *, const int*);
void F77NAME(ztbmv)( char*, char*, char*, const int*, const int*, const void *, const int*, void *, const int*);
void F77NAME(ztpmv)( char*, char*, char*, const int*, const void *, void *, const int*);
void F77NAME(ztrsv)( char*, char*, char*, const int*, const void *, const int*, void *, const int*);
void F77NAME(ztbsv)( char*, char*, char*, const int*, const int*, const void *, const int*, void *, const int*);
void F77NAME(ztpsv)( char*, char*, char*, const int*, const void *, void *,const int*);
void F77NAME(zgerc)( const int*, const int*, const void *, const void *, const int*, const void *, const int*, void *, const int*);
void F77NAME(zgeru)( const int*, const int*, const void *, const void *, const int*, const void *, const int*, void *, const int*);
void F77NAME(zher)(char*, const int*, const double *, const void *, const int*, void *, const int*);
void F77NAME(zher2)(char*, const int*, const void *, const void *, const int*, const void *, const int*, void *, const int*);
void F77NAME(zhpr)(char*, const int*, const double *, const void *, const int*, void *);
void F77NAME(zhpr2)(char*, const int*, const double *, const void *, const int*, const void *, const int*, void *);
/*
* Level 3 Fortran Prototypes
*/
/* Single Precision */
void F77NAME(sgemm)(char*, char*, const int*, const int*, const int*, const float *, const float *, const int*, const float *, const int*, const float *, float *, const int*);
void F77NAME(ssymm)(char*, char*, const int*, const int*, const float *, const float *, const int*, const float *, const int*, const float *, float *, const int*);
void F77NAME(ssyrk)(char*, char*, const int*, const int*, const float *, const float *, const int*, const float *, float *, const int*);
void F77NAME(ssyr2k)(char*, char*, const int*, const int*, const float *, const float *, const int*, const float *, const int*, const float *, float *, const int*);
void F77NAME(strmm)(char*, char*, char*, char*, const int*, const int*, const float *, const float *, const int*, float *, const int*);
void F77NAME(strsm)(char*, char*, char*, char*, const int*, const int*, const float *, const float *, const int*, float *, const int*);
/* Double Precision */
void F77NAME(dgemm)(char*, char*, const int*, const int*, const int*, const double *, const double *, const int*, const double *, const int*, const double *, double *, const int*);
void F77NAME(dsymm)(char*, char*, const int*, const int*, const double *, const double *, const int*, const double *, const int*, const double *, double *, const int*);
/**
blas routine declaration for the symmetric rank k operations :
C := alpha*A*A' + beta*C,
*/
void F77NAME(dsyrk)(char*, char*, const int*, const int*, const double *, const double *, const int*, const double *, double *, const int*);
void F77NAME(dsyr2k)(char*, char*, const int*, const int*, const double *, const double *, const int*, const double *, const int*, const double *, double *, const int*);
void F77NAME(dtrmm)(char*, char*, char*, char*, const int*, const int*, const double *, const double *, const int*, double *, const int*);
void F77NAME(dtrsm)(char*, char*, char*, char*, const int*, const int*, const double *, const double *, const int*, double *, const int*);
/* Single Complex Precision */
void F77NAME(cgemm)(char*, char*, const int*, const int*, const int*, const float *, const float *, const int*, const float *, const int*, const float *, float *, const int*);
void F77NAME(csymm)(char*, char*, const int*, const int*, const float *, const float *, const int*, const float *, const int*, const float *, float *, const int*);
void F77NAME(chemm)(char*, char*, const int*, const int*, const float *, const float *, const int*, const float *, const int*, const float *, float *, const int*);
void F77NAME(csyrk)(char*, char*, const int*, const int*, const float *, const float *, const int*, const float *, float *, const int*);
void F77NAME(cherk)(char*, char*, const int*, const int*, const float *, const float *, const int*, const float *, float *, const int*);
void F77NAME(csyr2k)(char*, char*, const int*, const int*, const float *, const float *, const int*, const float *, const int*, const float *, float *, const int*);
void F77NAME(cher2k)(char*, char*, const int*, const int*, const float *, const float *, const int*, const float *, const int*, const float *, float *, const int*);
void F77NAME(ctrmm)(char*, char*, char*, char*, const int*, const int*, const float *, const float *, const int*, float *, const int*);
void F77NAME(ctrsm)(char*, char*, char*, char*, const int*, const int*, const float *, const float *, const int*, float *, const int*);
/* Double Complex Precision */
void F77NAME(zgemm)(char*, char*, const int*, const int*, const int*, const double *, const double *, const int*, const double *, const int*, const double *, double *, const int*);
void F77NAME(zsymm)(char*, char*, const int*, const int*, const double *, const double *, const int*, const double *, const int*, const double *, double *, const int*);
void F77NAME(zhemm)(char*, char*, const int*, const int*, const double *, const double *, const int*, const double *, const int*, const double *, double *, const int*);
void F77NAME(zsyrk)(char*, char*, const int*, const int*, const double *, const double *, const int*, const double *, double *, const int*);
void F77NAME(zherk)(char*, char*, const int*, const int*, const double *, const double *, const int*, const double *, double *, const int*);
void F77NAME(zsyr2k)(char*, char*, const int*, const int*, const double *, const double *, const int*, const double *, const int*, const double *, double *, const int*);
void F77NAME(zher2k)(char*, char*, const int*, const int*, const double *, const double *, const int*, const double *, const int*, const double *, double *, const int*);
void F77NAME(ztrmm)(char*, char*, char*, char*, const int*, const int*, const double *, const double *, const int*, double *, const int*);
void F77NAME(ztrsm)(char*, char*, char*, char*, const int*, const int*, const double *, const double *, const int*, double *, const int*);
}
#endif /* CBLAS_F77_H */
This diff is collapsed.
......@@ -20,7 +20,7 @@
#include <vector>
#include <fstream>
#include "dataAztec.hpp"
#include <life/lifealg/dataAztec.hpp>
namespace LifeV
{
......@@ -255,25 +255,25 @@ void DataAztec::aztecSolveLinearSyst( MSRMatr<double>& mat,
// cout << "1) data_org[AZ_name] = " << data_org[AZ_name] << endl;
AZ_transform(proc_config, &external,
(int *)pattern.giveRaw_bindx(), mat.giveRaw_value(),
update, &update_index,
&extern_index, &data_org, N_update, NULL, NULL, NULL, NULL,
AZ_MSR_MATRIX);
(int *)pattern.giveRaw_bindx(), mat.giveRaw_value(),
update, &update_index,
&extern_index, &data_org, N_update, NULL, NULL, NULL, NULL,
AZ_MSR_MATRIX);
// cout << "2) data_org[AZ_name] = " << data_org[AZ_name] << endl;
// data_org[AZ_name] = 1;
//Here, Aztec options and parameters are provided by the calling function
AZ_solve(unknown, rhs, options, params, NULL,
(int *)pattern.giveRaw_bindx(), NULL, NULL, NULL,
mat.giveRaw_value(), data_org,status, proc_config);
(int *)pattern.giveRaw_bindx(), NULL, NULL, NULL,
mat.giveRaw_value(), data_org,status, proc_config);
//cout << "3) data_org[AZ_name] = " << data_org[AZ_name] << endl;
}
void DataAztec::aztecSolveLinearSyst(MSRMatr<double>& mat,
Real* unknown,Real* rhs,
int unknown_size,MSRPatt& pattern,
int* options,double* params,
int& az_name,bool flag)
Real* unknown,Real* rhs,
int unknown_size,MSRPatt& pattern,
int* options,double* params,
int& az_name,bool flag)
{
/*