Commit ca30741d authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Merge branch 'namespaces' into develop

parents f2042755 858848a7

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()
@@ -88,7 +88,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}
@@ -179,6 +179,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
@@ -267,6 +268,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
@@ -327,6 +330,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 )
@@ -336,8 +344,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
+2 −0
Original line number Diff line number Diff line 
tnl_install_prefix = "@CMAKE_INSTALL_PREFIX@"

tnl_version = "@tnlVersion@"

build

+10 −1
Original line number Diff line number Diff line 
#!/bin/bash



TARGET=TNL

PREFIX=${HOME}/local

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/advectionBuildConfigTag.h

+4 −4
Original line number Diff line number Diff line
@@ -35,14 +35,14 @@ template< int Dimensions, typename Real, typename Device, typename Index > 
/****

 * Please, chose your preferred time discretisation  here.

 */

template<> struct ConfigTagTimeDiscretisation< advectionBuildConfigTag, tnlExplicitTimeDiscretisationTag >{ enum { enabled = true }; };

template<> struct ConfigTagTimeDiscretisation< advectionBuildConfigTag, tnlSemiImplicitTimeDiscretisationTag >{ enum { enabled = true }; };

template<> struct ConfigTagTimeDiscretisation< advectionBuildConfigTag, tnlImplicitTimeDiscretisationTag >{ enum { enabled = true }; };

template<> struct ConfigTagTimeDiscretisation< advectionBuildConfigTag, ExplicitTimeDiscretisationTag >{ enum { enabled = true }; };

template<> struct ConfigTagTimeDiscretisation< advectionBuildConfigTag, SemiImplicitTimeDiscretisationTag >{ enum { enabled = true }; };

template<> struct ConfigTagTimeDiscretisation< advectionBuildConfigTag, ImplicitTimeDiscretisationTag >{ enum { enabled = true }; };



/****

 * Only the Runge-Kutta-Merson solver is enabled by default.

 */

template<> struct ConfigTagExplicitSolver< advectionBuildConfigTag, Solvers::tnlExplicitEulerSolverTag >{ enum { enabled = true }; };

template<> struct ConfigTagExplicitSolver< advectionBuildConfigTag, Solvers::ExplicitEulerSolverTag >{ enum { enabled = true }; };



} // namespace Solvers

} // namespace TNL

examples/advection/advectionProblem.h

+3 −1
Original line number Diff line number Diff line
@@ -45,7 +45,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,