Commit 25901e26 authored by prudhomm's avatar prudhomm
Browse files

many fixes, see ChangeLog

* bump the version to 0.1.0pre2
* fix some configure problem with aztec
* cleanup in various places
* math.h -> cmath
* compilation fixes in testsuite
* use data/mesh to get the meshses in testsuite and not Meshes anymore
parent 09c7b5f8
-Idebug
Doxygen
Makefile.in
aclocal.m4
autom4te.cache
config.h.in
configure
configure.files
configure.in
debug
debug3.2
doxy.log
life.kdevelop.pcs
life.kdevses
lifeconfig.h.in
optimized
stamp-h.in
subdirs
2004-02-13 Christophe Prud'homme <prudhomm@zion>
* life/lifecore/tab.hpp: use <cmath> instead of <math.h>
* life/lifecore/lifeV.hpp: use <cmath> instead of <math.h>
* life/lifecore/dataNewton.hpp: use <cmath> instead of <math.h>
* life/lifecore/RNM.hpp: added <cassert> and use <cmath>
* life/lifemesh/mesh_util.hpp (checkVolumes): cleanup, no need for dynamic allocation, still a bug in there
* configure.in.in: sanitize aztec configuration
create LIFE_PACKAGE and LIFE_VERSION variables
2004-02-06 Christophe Prud'homme <prudhomm@zion>
* life/lifecore/assemb.hpp (assemble): fix compilation error in assemb. ic should be ints to avoid overload clashes
......
......@@ -23,7 +23,7 @@
# DESCRIP-END.
#
AUTOMAKE_OPTIONS = foreign 1.6
AUTOMAKE_OPTIONS = foreign 1.6 dejagnu
$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/libltdl/ltdl.m4
@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in libltdl/ltdl.m4 > acinclude.m4
......
# -*- autoconf -*-
#
#
# Configure script
#
AC_INIT(life, 0.1.0pre1, christophe.prudhomme@epfl.ch)
LIFE_PACKAGE=life
LIFE_VERSION=0.1.0pre2
AC_SUBST(LIFE_PACKAGE)
AC_SUBST(LIFE_VERSION)
# AC_INIT(${LIFE_PACKAGE}, ${LIFE_VERSION}, christophe.prudhomme@epfl.ch)
AC_INIT(Makefile.am)
AC_CONFIG_AUX_DIR(admin)
......@@ -11,7 +17,7 @@ AC_CANONICAL_HOST
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(life, 0.1.0pre1 )
AM_INIT_AUTOMAKE(${LIFE_PACKAGE}, ${LIFE_VERSION} )
AM_CONFIG_HEADER(lifeconfig.h)
......@@ -27,20 +33,23 @@ AC_PROG_F77_C_O
AC_PROG_LIBTOOL
# AZTEC check
AC_MSG_CHECKING([Aztec headers files presence])
ac_aztec_includedirs="$REPOSITORY/$ARCH/include/Aztec_LifeV/ /usr/include /usr/local/include"
AC_FIND_FILE("az_aztec.h",$ac_aztec_includedirs , ac_aztec_includedir)
echo $ac_aztec_includedir
AC_MSG_RESULT([$ac_aztec_includedir])
CXXFLAGS="-I$ac_aztec_includedir ${CXXFLAGS}"
AC_MSG_CHECKING([Aztec libraries presence])
ac_aztec_libdirs="$REPOSITORY/$ARCH/lib$AFFIX/Aztec_LifeV/ /usr/lib /usr/local/lib"
AC_FIND_FILE("libaztec.a", $ac_aztec_libdirs, ac_aztec_libdir)
echo $ac_aztec_libdir
# echo $ac_aztec_libdir
LDFLAGS="${LDFLAGS} -L${ac_aztec_libdir}"
aztec_libs="-laztec"
AC_SUBST( aztec_libs )
AC_SUBST(aztec_libs)
AC_MSG_RESULT([$aztec_libs])
CXXFLAGS="-I\$(top_srcdir)/life/lifecore -I\$(top_srcdir)/life/lifemesh -I\$(top_srcdir)/life/lifefem"
CXXFLAGS="-I/usr/include/blitz ${CXXFLAGS}"
CXXFLAGS="-I\$(top_srcdir)/life/lifecore -I\$(top_srcdir)/life/lifemesh -I\$(top_srcdir)/life/lifefem ${CXXFLAGS}"
CXXFLAGS="-DTHREEDIM -Wall ${CXXFLAGS}"
life_libs="\$(top_builddir)/life/lifefem/liblifefem.la \$(top_builddir)/life/lifemesh/liblifemesh.la \$(top_builddir)/life/lifecore/liblifecore.la"
......
......@@ -7,11 +7,15 @@
<projectmanagement>KDevAutoProject</projectmanagement>
<primarylanguage>C++</primarylanguage>
<ignoreparts/>
<projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
<description/>
<secondaryLanguages/>
</general>
<kdevautoproject>
<general>
<activetarget>src/life</activetarget>
<useconfiguration>debug</useconfiguration>
<activetarget>testsuite/official/test_mesh/test_mesh</activetarget>
<useconfiguration>optimized</useconfiguration>
</general>
<run>
<mainprogram>src/life</mainprogram>
......@@ -28,10 +32,18 @@
<debug>
<configargs>--enable-debug=full</configargs>
<builddir>debug</builddir>
<ccompiler>GccOptions</ccompiler>
<cxxcompiler>GppOptions</cxxcompiler>
<f77compiler>G77Options</f77compiler>
<ccompiler>kdevgccoptions</ccompiler>
<cxxcompiler>kdevgppoptions</cxxcompiler>
<f77compiler>kdevpgf77options</f77compiler>
<cxxflags>-O0 -g3</cxxflags>
<topsourcedir/>
<cppflags/>
<ldflags/>
<ccompilerbinary/>
<cxxcompilerbinary/>
<f77compilerbinary/>
<cflags>-O0 -g3</cflags>
<f77flags>-O0 -g3</f77flags>
</debug>
</configurations>
<make>
......@@ -44,7 +56,20 @@
<kdevdebugger>
<general>
<dbgshell>libtool</dbgshell>
<programargs/>
<gdbpath/>
<configGdbScript/>
<runShellScript/>
<runGdbScript/>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
</general>
<display>
<staticmembers>false</staticmembers>
<demanglenames>true</demanglenames>
<outputradix>10</outputradix>
</display>
</kdevdebugger>
<kdevfilecreate>
<filetypes/>
......@@ -86,4 +111,10 @@
<hidenonprojectfiles>false</hidenonprojectfiles>
</tree>
</kdevfileview>
<cppsupportpart>
<filetemplates>
<interfacesuffix>.h</interfacesuffix>
<implementationsuffix>.cpp</implementationsuffix>
</filetemplates>
</cppsupportpart>
</kdevelop>
......@@ -25,9 +25,10 @@
SUFFIXES = .cpp .hpp .idl .c .h .f .F .o .moc .cc
INCLUDES = -I$(top_srcdir)/life/lifefem -I$(top_srcdir)/life/lifemesh
AM_CPPFLAGS = -DTHREEDIM
include_HEADERS = ElasticStructureHandler.hpp GetPot.hpp NavierStokesAleHandler.hpp NavierStokesAleSolverPC.hpp \
NavierStokesHandler.hpp NavierStokesHandler_miguel.hpp NavierStokesSolverPC.hpp Operator01.hpp \
RNM.hpp RNM_op.hpp RNM_opc.hpp RNM_tpl.hpp \
......
......@@ -3,14 +3,11 @@
// une tentative qui ne marche pas
// de tableau constant
#include <cassert>
#include <iostream>
#include <iomanip>
#if defined(__Linux)
#include <cmath>
#elif defined(__OSF1)
#include <math.h>
#endif
using namespace std;
#define const_R R
......@@ -196,7 +193,7 @@ public:
R KNMmin() const ; // min -> KNMmin to avoid clash name with aztec, JFG
R KNMmax() const ;// max -> KNMmax to avoid clash name with aztec, JFG
R sum() const ;
KN_ & map(R (*f)(R ));
KN_ & map(R (*)(R));
const KN_& operator =(const Add_KN_<R> & u) ;
const KN_& operator+=(const Add_KN_<R> & u) ;
......@@ -667,7 +664,10 @@ template<class R>
class KNM: public KNM_<R>{ public:
KNM(const int n,const int m)
:KNM_<R>(new R[n*m],n,m){}
:KNM_<R>(new R[n*m],n,m)
{
assert( v != 0 );
}
/* Alain (28/06/02): I remove the explicit statment for allowing implicit
conversion.
......
......@@ -11,6 +11,7 @@
#define _DATANEWTON_H_
#include <string>
#include <iostream>
#include "GetPot.hpp"
#include "lifeV.hpp"
......
/*---------------------------------------------------------------------*
| LifeV main header file |
| |
| $Header: /cvsroot/lifev/lifev/life/lifecore/Attic/lifeV.hpp,v 1.1 2004-02-08 09:09:24 prudhomm Exp $ |
| $Header: /cvsroot/lifev/lifev/life/lifecore/Attic/lifeV.hpp,v 1.2 2004-02-13 09:59:34 prudhomm Exp $ |
| |
| #Version 0.0 Experimental 9/7/99. Luca Formaggia |
| 0.1 Experimental 10/8/99. Jean-Fred Gerbeau. |
......@@ -20,8 +20,8 @@
// Alain: added for version g++3.0x, 20/06/02 (is it necessary to
// always include those ? )
# include <iostream>
# include <cmath>
# include <numeric>
# include <math.h>
// standard IO (always included)
......@@ -211,4 +211,4 @@ using namespace std;
#endif
// $Id: lifeV.hpp,v 1.1 2004-02-08 09:09:24 prudhomm Exp $
// $Id: lifeV.hpp,v 1.2 2004-02-13 09:59:34 prudhomm Exp $
......@@ -2,7 +2,7 @@
#define _TAB_H_INCLUDED
#include <math.h>
#include <cmath>
#include "lifeV.hpp"
......
......@@ -25,9 +25,6 @@
SUFFIXES = .cpp .hpp .idl .c .h .f .F .o .moc .cc
INCLUDES = -I$(top_srcdir)/life/lifecore -I$(top_srcdir)/life/lifemesh
AM_CPPFLAGS = -DTHREEDIM
include_HEADERS = currentBdFE.hpp currentFE.hpp currentHdivFE.hpp elemOper.hpp \
elemOper_ext.hpp geoMap.hpp localDofPattern.hpp quadRule.hpp \
refEle.hpp refFE.hpp refHdivFE.hpp refHybridFE.hpp \
......
#include "currentFE.hpp"
CurrentFE::CurrentFE(const RefFE& _refFE,const GeoMap& _geoMap,const QuadRule& _qr):
CurrentFE::CurrentFE(const RefFE& _refFE,const GeoMap& _geoMap,const QuadRule& _qr)
:
nbGeoNode(_geoMap.nbDof),nbNode(_refFE.nbDof),nbCoor(_refFE.nbCoor),
nbQuadPt(_qr.nbQuadPt), nbDiag( _refFE.nbDiag() ),
nbUpper( _refFE.nbUpper() ) , nbPattern( _refFE.nbPattern() ),
......@@ -31,6 +32,9 @@ CurrentFE::CurrentFE(const RefFE& _refFE,const GeoMap& _geoMap,const QuadRule& _
}
}
}
std::cerr << "N= " << point.N() << "\n"
<< "M= " << point.M() << "\n";
#ifdef TEST_PRE
_hasJac = false;
_hasFirstDeriv = false;
......
......@@ -51,7 +51,8 @@ using namespace std; // To be taken away some time
*/
//! \brief Report 3D element orientation
/*! It uses a linear representation of the Tetra/Hexa: it is only a
orientation check. The orientation is considered positive if it obeys the right-hand rule (right-hand orientation).
orientation check. The orientation is considered positive if it
obeys the right-hand rule (right-hand orientation).
\param mesh A region mesh of 3D elements
......@@ -70,39 +71,45 @@ using namespace std; // To be taken away some time
template <typename RegionMesh3D>
Real checkVolumes(RegionMesh3D const & mesh, SimpleVect<bool> & elSign, Switch & sw)
{
Real meas(0.0);
Real lmeas;
Real meas = 0.0;
Real lmeas = 0.0;
elSign.clear();
elSign.reserve(mesh.numVolumes());
typedef typename RegionMesh3D::VolumeShape GeoShape;
CurrentFE* fe;
switch(GeoShape::Shape){
case TETRA:
fe = new CurrentFE(feTetraP1,geoLinearTetra,quadRuleTetra1pt);
{
CurrentFE fe(feTetraP1,geoLinearTetra,quadRuleTetra1pt);
std::cerr << "N= " << fe.point.N() << "\n"
<< "M= " << fe.point.M() << "\n";
for(ID i = 1; i<=mesh.numVolumes(); i++){
fe->updateJac(mesh.volume(i));
lmeas = fe->measure();
fe.updateJac(mesh.volume(i));
lmeas = fe.measure();
meas+=lmeas;
elSign.push_back(lmeas>0.0);
}
}
break;
case HEXA:
fe = new CurrentFE(feHexaQ1,geoBilinearHexa,quadRuleHexa1pt);
{
CurrentFE fe(feHexaQ1,geoBilinearHexa,quadRuleHexa1pt);
for(ID i = 1; i<=mesh.numVolumes(); i++){
fe->updateJac(mesh.volume(i));
lmeas = fe->measure();
fe.updateJac(mesh.volume(i));
lmeas = fe.measure();
meas+=lmeas;
elSign.push_back(lmeas>0.0);
}
}
break;
default:
sw.create("SKIP_ORIENTATION_TEST",true);
delete fe;
return 0;
}
if(std::find(elSign.begin(),elSign.end(),false)!=elSign.end())sw.create("HAS_NEGATIVE_VOLUMES",true);
if(std::find(elSign.begin(),elSign.end(),false)!=elSign.end())
sw.create("HAS_NEGATIVE_VOLUMES",true);
return meas;
}
......
......@@ -23,4 +23,4 @@
SUFFIXES = .cpp .hpp .idl .c .h .f .F .o .moc
SUBDIRS = official development
\ No newline at end of file
SUBDIRS = official development
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment