Merge branch 'namespaces' of geraldine.fjfi.cvut.cz:/local/projects/tnl/tnl into namespaces (3e0099a1) · Commits · TNL / tnl-dev

CMakeLists.txt

+16 −8

Original line number	Diff line number	Diff line
		@@ -27,16 +27,16 @@ include( UseCodeCoverage )
		# Settings for debug/release version
		#
		if( CMAKE_BUILD_TYPE STREQUAL "Debug")
		set( PROJECT_BUILD_PATH ${PROJECT_SOURCE_DIR}/Debug/src )
		set( PROJECT_TESTS_PATH ${PROJECT_SOURCE_DIR}/Debug/tests )
		set( PROJECT_TOOLS_PATH ${PROJECT_SOURCE_DIR}/Debug/tools )
		set( PROJECT_BUILD_PATH ${PROJECT_SOURCE_DIR}/Debug/src/TNL )
		set( PROJECT_TESTS_PATH ${PROJECT_SOURCE_DIR}/Debug/src/Tests )
		set( PROJECT_TOOLS_PATH ${PROJECT_SOURCE_DIR}/Debug/bin )
		set( LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/Debug/lib )
		set( EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/Debug/bin )
		set( debugExt -dbg )
		else()
		set( PROJECT_BUILD_PATH ${PROJECT_SOURCE_DIR}/Release/src )
		set( PROJECT_TESTS_PATH ${PROJECT_SOURCE_DIR}/Release/tests )
		set( PROJECT_TOOLS_PATH ${PROJECT_SOURCE_DIR}/Release/tools )
		set( PROJECT_BUILD_PATH ${PROJECT_SOURCE_DIR}/Release/src/TNL )
		set( PROJECT_TESTS_PATH ${PROJECT_SOURCE_DIR}/Release/src/Tests )
		set( PROJECT_TOOLS_PATH ${PROJECT_SOURCE_DIR}/Release/bin )
		set( LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/Release/lib)
		set( EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/Release/bin)
		endif()
		@@ -84,7 +84,7 @@ if( WITH_CUDA STREQUAL "yes" )
		# Select GPU architecture
		#
		set( CUDA_ARCH_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/tnl-cuda-arch)
		set( CUDA_ARCH_SOURCE ${PROJECT_SOURCE_DIR}/tools/src/tnl-cuda-arch.cu)
		set( CUDA_ARCH_SOURCE ${PROJECT_SOURCE_DIR}/src/Tools/tnl-cuda-arch.cu)
		message( "Compiling tnl-cuda-arch ..." )
		file( MAKE_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} )
		execute_process( COMMAND nvcc ${CUDA_ARCH_SOURCE} -o ${CUDA_ARCH_EXECUTABLE}
		@@ -175,6 +175,7 @@ if( OPENMP_FOUND )
		message( "Compiler supports OpenMP." )
		set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_OPENMP -fopenmp" )
		endif()
		#set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_OPENMP -fopenmp=libgomp" )

		####
		# Check for MPI
		@@ -251,6 +252,8 @@ if( WITH_TESTS STREQUAL "yes" )
		endif( GTEST_FOUND )
		endif( WITH_TESTS STREQUAL "yes" )

		find_package( PythonInterp 3 )

		#if( BUILD_MPI )
		# FIND_PATH( PETSC_INCLUDE_DIR petsc.h
		# /usr/include/petsc
		@@ -311,6 +314,11 @@ set( sourceDirectory \"${PROJECT_SOURCE_DIR}/\" )
		set( testsDirectory \"${PROJECT_TESTS_PATH}/\" )
		CONFIGURE_FILE( "tnlConfig.h.in" "${PROJECT_BUILD_PATH}/TNL/tnlConfig.h" )
		INSTALL( FILES ${PROJECT_BUILD_PATH}/TNL/tnlConfig.h DESTINATION include/tnl-${tnlVersion}/TNL )
		if( PYTHONINTERP_FOUND )
		CONFIGURE_FILE( "Config.py.in" "${PROJECT_BUILD_PATH}/TNL/Config.py" )
		INSTALL( FILES ${PROJECT_BUILD_PATH}/TNL/Config.py DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/TNL )
		CONFIGURE_FILE( "python-version.in" "${PROJECT_TOOLS_PATH}/../python-version" )
		endif( PYTHONINTERP_FOUND )

		#Nastavime cesty k hlavickovym souborum a knihovnam
		INCLUDE_DIRECTORIES( src )
		@@ -320,8 +328,8 @@ LINK_DIRECTORIES( ${LIBRARY_OUTPUT_PATH} )

		#Pokracujeme dalsimi podadresari
		add_subdirectory( src )
		add_subdirectory( share )
		add_subdirectory( tests )
		add_subdirectory( tools )
		add_subdirectory( examples )

		set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Template Numerical Library")

Config.py.in

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		tnl_install_prefix = ${CMAKE_INSTALL_PREFIX}

build

+9 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@

		TARGET=TNL
		PREFIX=${HOME}/local
		WITH_CLANG="no"
		WITH_CUDA="yes"
		WITH_TESTS="yes"

		@@ -25,6 +26,7 @@ do
		case $option in
		--prefix=* ) PREFIX="${option#*=}" ;;
		--build=* ) BUILD="${option#*=}" ;;
		--with-clang=* ) WITH_CLANG="${option#*=}" ;;
		--with-tests=* ) WITH_TESTS="${option#*=}" ;;
		--with-cuda=* ) WITH_CUDA="${option#*=}" ;;
		--with-cuda-arch=* ) WITH_CUDA_ARCH="${option#*=}";;
		@@ -73,6 +75,13 @@ then
		exit 1
		fi

		if test ${WITH_CLANG} = "yes";
		then
		export CXX=clang++
		export CC=clang
		fi


		echo "Configuring ${BUILD} $TARGET ..."

		${CMAKE} ${ROOT_DIR} \

examples/advection/advectionProblem.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,9 @@ class advectionProblem:
		void writeProlog( Logger& logger,
		const Config::ParameterContainer& parameters ) const;

		bool setup( const Config::ParameterContainer& parameters );
		bool setup( const MeshPointer& meshPointer,
		const Config::ParameterContainer& parameters,
		const String& prefix = "" );

		bool setInitialCondition( const Config::ParameterContainer& parameters,
		const MeshPointer& mesh,

examples/advection/advectionProblem_impl.h

+11 −7

Original line number	Diff line number	Diff line
		#ifndef advectionPROBLEM_IMPL_H_
		#define advectionPROBLEM_IMPL_H_

		#include <TNL/core/mfilename.h>
		#include <TNL/FileName.h>
		#include <TNL/Matrices/MatrixSetter.h>
		#include <TNL/Solvers/PDE/ExplicitUpdater.h>
		#include <TNL/Solvers/PDE/LinearSystemAssembler.h>
		@@ -51,10 +51,12 @@ template< typename Mesh,
		typename DifferentialOperator >
		bool
		advectionProblem< Mesh, BoundaryCondition, RightHandSide, DifferentialOperator >::
		setup( const Config::ParameterContainer& parameters )
		setup( const MeshPointer& meshPointer,
		const Config::ParameterContainer& parameters,
		const String& prefix )
		{
		if( ! this->boundaryConditionPointer->setup( parameters, "boundary-conditions-" ) \|\|
		! this->rightHandSidePointer->setup( parameters, "right-hand-side-" ) )
		if( ! this->boundaryConditionPointer->setup( meshPointer, parameters, prefix + "boundary-conditions-" ) \|\|
		! this->rightHandSidePointer->setup( parameters, prefix + "right-hand-side-" ) )
		return false;
		return true;
		}
		@@ -225,9 +227,11 @@ makeSnapshot( const RealType& time,
		{
		std::cout << std::endl << "Writing output at time " << time << " step " << step << "." << std::endl;
		this->bindDofs( mesh, dofs );
		String fileName;
		FileNameBaseNumberEnding( "u-", step, 5, ".tnl", fileName );
		if( ! dofs->save( fileName ) )
		FileName fileName;
		fileName.setFileNameBase( "u-" );
		fileName.setExtension( "tnl" );
		fileName.setIndex( step );
		if( ! dofs->save( fileName.getFileName() ) )
		return false;
		return true;
		}