Commit 2406e166 authored by Radu Popescu's avatar Radu Popescu
Browse files

Merge branch 'release_2_2'

parents ce97a107 74d69d05
......@@ -37,7 +37,7 @@ set (LAPACK_LIBRARIES "LAPACK_LIBRARIES-NOTFOUND" CACHE STRING "LAPACK libraries
project (LifeV)
set (PROJECT_SHORT_NAME "lifev")
set (LifeV_VERSION_MAJOR 2)
set (LifeV_VERSION_MINOR 0)
set (LifeV_VERSION_MINOR 2)
set (LifeV_VERSION_PATCH 0)
set (PROJECT_BUGREPORT "lifev-user@googlegroups.com")
set (PROJECT_HOMEPAGE "www.lifev.org")
......
......@@ -97,7 +97,7 @@ $(top_srcdir)/acinclude.m4:
@echo 'm4_include([admin/lifev_create_subdirlist.m4])'>>acinclude.m4
$(top_srcdir)/Makefile.headers: $(top_srcdir)/tools/update-headers
$(top_srcdir)/Makefile.headers:
cd $(top_srcdir) && $(SHELL) tools/update-headers
report:
......
# -*- readme-debian -*-
LifeV 2.2.0:
=============
* This is a major release, the last one in the 2.x.x series
* For the next release, LifeV will be modularized, allower finer grained control over what parts of the library to install
* This release allows configuration either with the configure script, either with CMake. The CMake based configuration (undergoing a refactoring) will be the prefered configuration method and starting with the next release, the autoconf based configuration will be deprecated
* Check out the new features in LifeV: the monolithic FSI solver, the one dimensional model and solver, an experimental zero dimensional solver and others
LifeV 2.0.0:
=============
......
......@@ -49,6 +49,31 @@ FOREACH( PACKAGE ${REQUIRED_PACKAGES})
ENDIF()
ENDFOREACH(PACKAGE ${REQUIRED_PACKAGES})
#optional packages
SET( OPTIONAL_PACKAGES "rythmos")
#Now I check if all the required packages are in the list of Trilinos Packages. (This might be done better with a find...)
FOREACH( PACKAGE ${OPTIONAL_PACKAGES})
STRING(TOUPPER ${PACKAGE} UPACK)
FOREACH(Tpack ${Trilinos_PACKAGE_LIST})
STRING(TOUPPER ${Tpack} TPACK)
IF(${UPACK} STREQUAL ${TPACK})
SET(${UPACK}_FOUND TRUE)
ENDIF()
ENDFOREACH(Tpack ${Trilinos_PACKAGE_LIST})
IF(${UPACK}_FOUND)
set( HAVE_TRILINOS_${UPACK} TRUE)
ELSE()
MESSAGE( STATUS "Could not find ${PACKAGE}")
ENDIF()
ENDFOREACH(PACKAGE ${REQUIRED_PACKAGES})
#temporary hack to properly set HAVE_NOX_THYRA
FOREACH(Tpack ${NOX_LIBRARIES})
IF(${Tpack} STREQUAL "noxthyra")
SET(HAVE_NOX_THYRA TRUE)
ENDIF()
ENDFOREACH(Tpack ${NOX_LIBRARIES})
#If XXX is already linked through Trilinos. If so I set the variable XXX_IS_IN_TRILINOS to true
FOREACH(tpl ${Trilinos_TPL_LIST})
STRING(TOUPPER ${tpl} TPL)
......
# -*- autoconf -*-
#
#
AC_INIT([lifev], [2.0.0], [lifev-dev@googlegroups.com])
AC_INIT([lifev], [2.2.0], [lifev-dev@googlegroups.com])
LIFEV_VERSION_MAJOR=2
LIFEV_VERSION_MINOR=0
LIFEV_VERSION_MINOR=2
LIFEV_VERSION_MICRO=0
LIFEV_VERSION_EXTRA=
AC_SUBST(LIFEV_VERSION_MAJOR)
......
......@@ -12,7 +12,7 @@ if(DOXYGEN_FOUND)
# file(COPY yourDir DESTINATION yourDestination)
# generate Doxyfile
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake
${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
# add doc target
......
This diff is collapsed.
......@@ -437,7 +437,7 @@ Cylinder::run()
if (verbose) std::cout << "Calling the fluid constructor ... ";
bcH.setOffset("Inlet", totalVelDof + totalPressDof);
//bcH.setOffset("Inlet", totalVelDof + totalPressDof);
OseenSolver< RegionMesh<LinearTetra> > fluid (oseenData,
*uFESpacePtr,
......
......@@ -24,4 +24,4 @@ OneDFSIFunctionSolverDefined.hpp
RossEthierSteinmanDec.hpp
RossEthierSteinmanInc.hpp
Womersley.hpp DESTINATION include/life/lifefunctions)
install ( FILES bessel.hpp DESTINATION include/life/lifefunctions/bessel)
install ( FILES bessel/bessel.hpp DESTINATION include/life/lifefunctions/bessel)
......@@ -117,6 +117,9 @@
/* Define if the Trilinos RTOp library is used. */
#cmakedefine HAVE_TRILINOS_RTOP
/* Define if the Trilinos Rythmos library is used. */
#cmakedefine HAVE_TRILINOS_RYTHMOS
/* Define if the Trilinos Sacado library is used. */
#cmakedefine HAVE_TRILINOS_SACADO
......@@ -138,6 +141,9 @@
/* Define if the Trilinos Zoltan library is used. */
#cmakedefine HAVE_TRILINOS_ZOLTAN
/* Define if the Trilinos Nox-thyra library is used. */
#cmakedefine HAVE_NOX_THYRA
/*******************************************************************
The following cannot yet be defined due to limitations in the
CMake scripts. Useless defines should be removed
......@@ -164,9 +170,6 @@
/* Define if the Trilinos Nox-epetra library is used. */
#undef HAVE_NOX_EPETRA
/* Define if the Trilinos Nox-thyra library is used. */
#undef HAVE_NOX_THYRA
/* Define if the Trilinos Stratimikos-amesos library is used. */
#undef HAVE_STRATIMIKOS_AMESOS
......
......@@ -13,4 +13,6 @@
SUFFIXES = .cpp .hpp .idl .c .h .f .F .o .moc
SUBDIRS = ensightToHdf5 exporterVTK
\ No newline at end of file
SUBDIRS = ensightToHdf5 exporterVTK
EXTRA_DIST = testsuite.at
......@@ -24,4 +24,4 @@ link:
test -a Mesh || ln -s $(top_srcdir)/testsuite/data/mesh/inria/ Mesh
test -a importDir || ln -s $(top_srcdir)/testsuite/lifefilters/ensightToHdf5 importDir
EXTRA_DIST = data testsuite.at
\ No newline at end of file
EXTRA_DIST = data testsuite.at ethiersteinman.000.case ethiersteinman.000.geo ethiersteinman.001.case ethiersteinman.001.geo ethiersteinman.002.case ethiersteinman.002.geo ethiersteinman.003.case ethiersteinman.003.geo ethiersteinman_pressure.00000.000.scl ethiersteinman_pressure.00000.001.scl ethiersteinman_pressure.00000.002.scl ethiersteinman_pressure.00000.003.scl ethiersteinman_pressure.00001.000.scl ethiersteinman_pressure.00001.001.scl ethiersteinman_pressure.00001.002.scl ethiersteinman_pressure.00001.003.scl ethiersteinman_pressure.00002.000.scl ethiersteinman_pressure.00002.001.scl ethiersteinman_pressure.00002.002.scl ethiersteinman_pressure.00002.003.scl ethiersteinman_pressure.00003.000.scl ethiersteinman_pressure.00003.001.scl ethiersteinman_pressure.00003.002.scl ethiersteinman_pressure.00003.003.scl ethiersteinman_pressure.00004.000.scl ethiersteinman_pressure.00004.001.scl ethiersteinman_pressure.00004.002.scl ethiersteinman_pressure.00004.003.scl ethiersteinman_velocity.00000.000.vct ethiersteinman_velocity.00000.001.vct ethiersteinman_velocity.00000.002.vct ethiersteinman_velocity.00000.003.vct ethiersteinman_velocity.00001.000.vct ethiersteinman_velocity.00001.001.vct ethiersteinman_velocity.00001.002.vct ethiersteinman_velocity.00001.003.vct ethiersteinman_velocity.00002.000.vct ethiersteinman_velocity.00002.001.vct ethiersteinman_velocity.00002.002.vct ethiersteinman_velocity.00002.003.vct ethiersteinman_velocity.00003.000.vct ethiersteinman_velocity.00003.001.vct ethiersteinman_velocity.00003.002.vct ethiersteinman_velocity.00003.003.vct ethiersteinman_velocity.00004.000.vct ethiersteinman_velocity.00004.001.vct ethiersteinman_velocity.00004.002.vct ethiersteinman_velocity.00004.003.vct
......@@ -18,6 +18,8 @@ SUFFIXES = .cpp .hpp .idl .c .h .f .F .o .mo
check_PROGRAMS = test_MatrixEpetraStructuredFramework
test_MatrixEpetraStructuredFramework_SOURCES = main.cpp
EXTRA_DIST = testsuite.at
recheck: clean_PROGRAMS check
clean_PROGRAMS:
......
......@@ -19,7 +19,7 @@ check_PROGRAMS = test_ZeroDimensional
test_ZeroDimensional_SOURCES = main.cpp
EXTRA_DIST = testsuite.at
EXTRA_DIST = testsuite.at RythmosAztecOOParams.xml RythmosAztecOOParamsLowsf.xml RythmosBelosParams.xml data.dat circuitFile.dat inputFile.dat
link:
test -a RythmosAztecOOParams.xml || ln -s $(top_srcdir)/testsuite/test_ZeroDimensional/RythmosAztecOOParams.xml RythmosAztecOOParams.xml
......@@ -37,4 +37,4 @@ clean_PROGRAMS:
clean-results:
-rm *.vct *.scl *.case *.geo *.mfile
include $(top_srcdir)/Doxyfile.am
\ No newline at end of file
include $(top_srcdir)/Doxyfile.am
......@@ -31,7 +31,7 @@ check_PROGRAMS = test_rossEthierSteinman test_kimMoin
test_rossEthierSteinman_SOURCES = mainRossEthierSteinman.cpp ../../life/lifefunctions/RossEthierSteinmanDec.cpp
test_kimMoin_SOURCES = mainKimMoin.cpp ../../life/lifefunctions/KimMoin.cpp
EXTRA_DIST = data testsuite.at
EXTRA_DIST = testsuite.at
link:
test -a dataRossEthierSteinman || ln -s $(srcdir)/dataRossEthierSteinman
......
......@@ -2,19 +2,19 @@
cd life
for DIR in life*; do
echo $DIR
cd $DIR
mv -f CMakeLists.txt CMakeLists.txt.old
CPPFILES=$(find . -name \*.cpp | sed 's,./,,')
HPPFILES=$(ls *.hpp)
cat > CMakeLists.txt << eof
echo $DIR
cd $DIR
mv -f CMakeLists.txt CMakeLists.txt.old
CPPFILES=$(find . -name \*.cpp | sed 's,./,,')
HPPFILES=$(ls *.hpp)
cat > CMakeLists.txt << eof
add_library ( $DIR $CPPFILES )
install ( TARGETS $DIR DESTINATION lib )
install ( FILES $HPPFILES DESTINATION include/life/$DIR)
eof
if [ $DIR == lifefunctions ]; then
cat >> CMakeLists.txt << eof
install ( FILES bessel.hpp DESTINATION include/life/$DIR/bessel)
install ( FILES bessel/bessel.hpp DESTINATION include/life/$DIR/bessel)
eof
fi
cd ..
......
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