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

Implementing PDE operator EOC test. 

Renaming getParameterType to getType.
parent a5c6337f

CMakeLists.txt

+6 −5
Original line number Diff line number Diff line
@@ -105,11 +105,11 @@ endif() 
####

# Check for MPI

#

find_package( MPI )

if( MPI_CXX_FOUND )

    set( BUILD_MPI TRUE )

    message( "MPI headers found -- ${MPI_CXX_INCLUDE_PATH}")

endif()

#find_package( MPI )

#if( MPI_CXX_FOUND )

#    set( BUILD_MPI TRUE )

#    message( "MPI headers found -- ${MPI_CXX_INCLUDE_PATH}")

#endif()



####

# Check for some system header
@@ -227,6 +227,7 @@ INSTALL( FILES ${PROJECT_BUILD_PATH}/tnlConfig.h DESTINATION include/tnl-${tnlVe 


#Nastavime cesty k hlavickovym souborum a knihovnam

INCLUDE_DIRECTORIES( src )

INCLUDE_DIRECTORIES( tests )

INCLUDE_DIRECTORIES( ${PROJECT_BUILD_PATH} )

LINK_DIRECTORIES( ${LIBRARY_OUTPUT_PATH} )

install

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ ${CMAKE} .. -DCMAKE_BUILD_TYPE=Debug \ 
            -DPETSC_DIR=${PETSC_DIR} \

            -DWITH_TEMPLATE_EXPLICIT_INSTANTIATION=${TEMPLATE_EXPLICIT_INSTANTIATION}

make -j${CPUS} ${VERBOSE}

#make -j${CPUS} test

make -j${CPUS} test

make -j${CPUS} install



cd ../Release
@@ -38,6 +38,6 @@ ${CMAKE} .. -DCMAKE_INSTALL_PREFIX=${HOME}/local \ 
            -DPETSC_DIR=${PETSC_DIR} \

            -DWITH_TEMPLATE_EXPLICIT_INSTANTIATION=${TEMPLATE_EXPLICIT_INSTANTIATION}

make -j${CPUS} ${VERBOSE}

#make -j${CPUS} test

make -j${CPUS} test

make -j${CPUS} install

src/config/tnlConfigEntry.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ struct tnlConfigEntry : public tnlConfigEntryBase 


   tnlString getEntryType() const

   {

      return ::getParameterType< EntryType >();

      return ::getType< EntryType >();

   }



   tnlString getUIEntryType() const

src/config/tnlConfigEntryList.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ struct tnlConfigEntryList : public tnlConfigEntryBase 


   tnlString getEntryType() const

   {

      return ::getParameterType< tnlList< EntryType > >();

      return ::getType< tnlList< EntryType > >();

   }



   tnlString getUIEntryType() const

src/config/tnlParameterContainer.cpp

+3 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ tnlParameterContainer :: tnlParameterContainer() 
bool tnlParameterContainer :: AddParameter( const char* name,

                                            const char* value )

{

   return parameters. Append( new tnlParameter< tnlString >( name, getParameterType< tnlString >().getString(), tnlString( value ) ) );

   return parameters. Append( new tnlParameter< tnlString >( name, ::getType< tnlString >().getString(), tnlString( value ) ) );

}

//--------------------------------------------------------------------------

bool tnlParameterContainer :: SetParameter( const char* name,
@@ -55,7 +55,7 @@ bool tnlParameterContainer :: SetParameter( const char* name, 
   {

      if( parameters[ i ] -> name == name )

      {

         if( parameters[ i ] -> type == getParameterType< tnlString >() )

         if( parameters[ i ] -> type == ::getType< tnlString >() )

         {

            ( ( tnlParameter< tnlString > * ) parameters[ i ] ) -> value. setString( value );

            return true;
@@ -64,7 +64,7 @@ bool tnlParameterContainer :: SetParameter( const char* name, 
         {

            cerr << "Parameter " << name << " already exists with different type " 

                 << parameters[ i ] -> type << " not " 

                 << getParameterType< tnlString>() << endl;

                 << ::getType< tnlString>() << endl;

            abort();

            return false;

         }