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

tnl-quicstart and installation scripts were improved.

parent b2840e59

install

+37 −0
Original line number Diff line number Diff line
@@ -45,5 +45,42 @@ then 
    make install

    cd ..

fi



TNL_TEST=`which tnl-bindir`



if test x${TNL_TEST} = x;

then

    echo ""

    echo "WARNING !!!"

    echo ""

    echo "Your system does not see TNL which was installed right now."

    echo "You need to add it to your system variables PATH and LD_LIBRARY_PATH."

    echo "Add the following to your .bashrc file:"

    echo ""

    

    PREFIX=${HOME}/local

    for option in "$@"

    do

        case $option in

            --prefix=*                     ) PREFIX="${option#*=}" ;;

        esac

    done



    echo "if test x\${PATH} = x;"

    echo "then"

    echo "   PATH=${PREFIX}/bin"

    echo "else"

    echo "   PATH=\${PATH}:${PREFIX}/bin"

    echo "fi"

    echo "if test x\${LD_LIBRARY_PATH} = x;"

    echo "then"

    echo "   LD_LIBRARY_PATH=${PREFIX}/lib"

    echo "else"

    echo "   LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${PREFIX}/lib"

    echo "fi"

    echo "export PATH"

    echo "export LD_LIBRARY_PATH"

fi



exit 0

src/solvers/linear/krylov/tnlBICGStabSolver_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ tnlBICGStabSolver< Matrix, Preconditioner >:: 
configSetup( tnlConfigDescription& config,

             const tnlString& prefix )

{

   tnlIterativeSolver< RealType, IndexType >::configSetup( config, prefix );

   //tnlIterativeSolver< RealType, IndexType >::configSetup( config, prefix );

}



template< typename Matrix,

src/solvers/linear/krylov/tnlCGSolver_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ tnlCGSolver< Matrix, Preconditioner >:: 
configSetup( tnlConfigDescription& config,

             const tnlString& prefix )

{

   tnlIterativeSolver< RealType, IndexType >::configSetup( config, prefix );

   //tnlIterativeSolver< RealType, IndexType >::configSetup( config, prefix );

}



template< typename Matrix,

src/solvers/linear/krylov/tnlGMRESSolver_impl.h

+3 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ tnlGMRESSolver< Matrix, Preconditioner >:: 
configSetup( tnlConfigDescription& config,

             const tnlString& prefix )

{

   tnlIterativeSolver< RealType, IndexType >::configSetup( config, prefix );

   //tnlIterativeSolver< RealType, IndexType >::configSetup( config, prefix );

   config.addEntry< int >( prefix + "gmres-restarting", "Number of iterations after which the GMRES restarts.", 10 );   

}
@@ -68,6 +68,7 @@ setup( const tnlParameterContainer& parameters, 
{

   tnlIterativeSolver< RealType, IndexType >::setup( parameters, prefix );

   this->setRestarting( parameters.getParameter< int >( "gmres-restarting" ) );

   return true;

}



template< typename Matrix,

src/solvers/linear/krylov/tnlTFQMRSolver_impl.h

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ tnlTFQMRSolver< Matrix, Preconditioner >:: 
configSetup( tnlConfigDescription& config,

             const tnlString& prefix )

{

   tnlIterativeSolver< RealType, IndexType >::configSetup( config, prefix );

   //tnlIterativeSolver< RealType, IndexType >::configSetup( config, prefix );

}



template< typename Matrix,
@@ -59,7 +59,7 @@ tnlTFQMRSolver< Matrix, Preconditioner >:: 
setup( const tnlParameterContainer& parameters,

       const tnlString& prefix )

{

   tnlIterativeSolver< RealType, IndexType >::setup( parameters, prefix );

   return tnlIterativeSolver< RealType, IndexType >::setup( parameters, prefix );

}



template< typename Matrix,