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

Mesh dependent data was added to the PDE problem. 

Scripts tnl-compile and tnl-link were added.
parent 07179b5a

CMakeLists.txt

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ include( UseCodeCoverage ) 
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( LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/Debug/lib )

    set( EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/Debug/bin )

    set( debugExt -dbg )
@@ -23,6 +24,7 @@ if( CMAKE_BUILD_TYPE STREQUAL "Debug") 
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( LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/Release/lib)

    set( EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/Release/bin)

    #OptimizeForArchitecture()

build

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ ${CMAKE} ${ROOT_DIR} \ 
         -DCMAKE_BUILD_TYPE=${BUILD} \

         -DCMAKE_INSTALL_PREFIX=${PREFIX} \

         -DWITH_CUDA=${WITH_CUDA} \

         -DWITH_CUDA_ARCH=${WITH_CUDA_ARCH}

         -DWITH_CUDA_ARCH=${WITH_CUDA_ARCH} \

         -DWITH_CUBLAS=${WITH_CUBLAS} \

         -DWITH_TESTS=${WITH_TESTS} \

         -DPETSC_DIR=${PETSC_DIR} \

src/functors/CMakeLists.txt

+4 −4
Original line number Diff line number Diff line
@@ -15,19 +15,19 @@ SET( headers tnlFunctionDiscretizer.h 
             tnlFunctionType.h

             tnlTestFunction_impl.h )



SET( CURRENT_DIR ${CMAKE_SOURCE_DIR}/src/functions )

SET( CURRENT_DIR ${CMAKE_SOURCE_DIR}/src/functors )

set( common_SOURCES

     ${CURRENT_DIR}/tnlTestFunction_impl.cpp )       



IF( BUILD_CUDA )

   set( tnl_functions_CUDA__SOURCES

   set( tnl_functors_CUDA__SOURCES

        ${common_SOURCES} 

        ${CURRENT_DIR}/tnlTestFunction_impl.cu

        PARENT_SCOPE )

ENDIF()    



set( tnl_functions_SOURCES     

set( tnl_functors_SOURCES     

     ${common_SOURCES}

     PARENT_SCOPE )

        

INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/functions )
 
 No newline at end of file
 
INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/functors )
 
 No newline at end of file

src/functors/tnlTestFunction_impl.cu

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#ifdef TEMPLATE_EXPLICIT_INSTANTIATION

#ifdef HAVE_CUDA



#include <functions/tnlTestFunction.h>

#include <functors/tnlTestFunction.h>



template class tnlTestFunction< 1, float, tnlCuda >;

template class tnlTestFunction< 2, float, tnlCuda >;

src/problems/tnlPDEProblem.h

+5 −3
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ class tnlPDEProblem : public tnlProblem< Real, Device, Index > 
      typedef Mesh MeshType;

      typedef tnlVector< RealType, DeviceType, IndexType> DofVectorType;

      typedef tnlCSRMatrix< RealType, DeviceType, IndexType > MatrixType;

      typedef tnlVector< RealType, DeviceType, IndexType > MeshDependentDataType;



      /****

       * This means that the time stepper will be set from the command line arguments.
@@ -50,10 +51,11 @@ class tnlPDEProblem : public tnlProblem< Real, Device, Index > 
      void writeProlog( tnlLogger& logger,

                        const tnlParameterContainer& parameters ) const;



      IndexType getAuxiliaryDofs( const MeshType& mesh ) const;

      bool setMeshDependentData( const MeshType& mesh,

                                 MeshDependentDataType& meshDependentData );



      void bindAuxiliaryDofs( const MeshType& mesh,

                              DofVectorType& auxiliaryDofs );

      void bindMeshDependentData( const MeshType& mesh,

                                  MeshDependentDataType& meshDependentData );



      bool preIterate( const RealType& time,

                       const RealType& tau,