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

Removing the directory implementation.

parent 112613dc

install

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


TARGET=TNL

INSTALL_PREFIX=${HOME}/local

WITH_CUDA=no

WITH_CUDA=yes

TEMPLATE_EXPLICIT_INSTANTIATION=yes

#VERBOSE="VERBOSE=1"

src/CMakeLists.txt

+3 −4
Original line number Diff line number Diff line
@@ -9,28 +9,27 @@ ADD_SUBDIRECTORY( operators ) 
ADD_SUBDIRECTORY( problems )

ADD_SUBDIRECTORY( solvers )

ADD_SUBDIRECTORY( legacy )

ADD_SUBDIRECTORY( implementation )



set( tnl_SOURCES ${tnl_functions_SOURCES}

                 ${tnl_config_SOURCES}

                 ${tnl_core_SOURCES}

                 ${tnl_implementation_SOURCES}

                 ${tnl_legacy_SOURCES}

                 ${tnl_debug_SOURCES}

                 ${tnl_matrices_SOURCES}

                 ${tnl_operators_SOURCES}

                 ${tnl_solvers_SOURCES}

                 ${tnl_problems_SOURCES}

                  )



set( tnl_CUDA__SOURCES ${tnl_functions_CUDA__SOURCES}

                       ${tnl_config_CUDA__SOURCES}

                       ${tnl_core_CUDA__SOURCES}

                       ${tnl_implementation_CUDA__SOURCES}

                       ${tnl_legacy_CUDA__SOURCES}

                       ${tnl_debug_CUDA__SOURCES}

                       ${tnl_matrices_CUDA__SOURCES}

                       ${tnl_problems_CUDA__SOURCES}

                       ${tnl_operators_CUDA__SOURCES} )

                       ${tnl_operators_CUDA__SOURCES}

                       ${tnl_solvers_CUDA__SOURCES} )

                 

                 

if( BUILD_CUDA )

src/core/containers/tnlContainer_impl.h

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ bool tnlContainer< Element, Device, Index >::save( tnlFile& file ) const 
           << " " << this->getName() << "." << endl;

      return false;

   }

   return true;

}



template< typename Element, typename Device, typename Index >
@@ -104,6 +105,7 @@ bool tnlContainer< Element, Device, Index >::load( tnlFile& file ) 
           << " " << this->getName() << "." << endl;

      return false;

   }

   return true;

}



#ifdef TEMPLATE_EXPLICIT_INSTANTIATION

src/core/tnlAssert.h

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include <iostream>

#include <stdlib.h>

#include <assert.h>



using namespace std;
@@ -39,6 +40,7 @@ using namespace std; 
           __LINE__ );                                                                                   \

    abort();                                                                   \

   }



#else

#define tnlAssert( ___tnl__assert_condition, ___tnl__assert_command )                       \

	if( ! ( ___tnl__assert_condition ) )                                                     \

src/functions/CMakeLists.txt

+22 −4
Original line number Diff line number Diff line 
SET( headers tnlFunctionDiscretizer.h

             tnlFunctionDiscretizer_impl.h

             tnlFunctionAdapter.h

             tnlConstantFunction.h

             tnlConstantFunction_impl.h

             tnlExpBumpFunction.h

             tnlExpBumpFunction_impl.h

             tnlSinBumpsFunction.h

             tnlSinBumpsFunction_impl.h

             tnlSinWaveFunction.h

             tnlSinWaveFunction_impl.h

             tnlTestFunction.h

             tnlFunctionType.h )

             tnlFunctionType.h

             tnlTestFunction_impl.h )



SET( libtnlfunctionsincludedir ${TNL_INCLUDE_DIR}/functions )

SET( libtnlfunctionsinclude_HEADERS ${headers} )

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

set( common_SOURCES

     ${CURRENT_DIR}/tnlTestFunction_impl.cpp )       



IF( BUILD_CUDA )

   set( tnl_functions_CUDA__SOURCES

        ${common_SOURCES} 

        ${CURRENT_DIR}/tnlTestFunction_impl.cu

        PARENT_SCOPE )

ENDIF()    



set( tnl_functions_SOURCES     

     ${common_SOURCES}

     PARENT_SCOPE )

        

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