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

Merge branch 'mpi-explosive' of geraldine.fjfi.cvut.cz:/local/projects/tnl/tnl into mpi-explosive

parents 52f8128a 743185e4

examples/heat-equation/HeatEquationBuildConfigTag.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ template<> struct ConfigTagReal< HeatEquationBuildConfigTag, long double > { enu 
 * Turn off support for short int and long int indexing.

 */

template<> struct ConfigTagIndex< HeatEquationBuildConfigTag, short int >{ enum { enabled = false }; };

template<> struct ConfigTagIndex< HeatEquationBuildConfigTag, long int >{ enum { enabled = false }; };

template<> struct ConfigTagIndex< HeatEquationBuildConfigTag, long int >{ enum { enabled = true }; };



/****

 * Please, chose your preferred time discretization  here.

src/TNL/Communicators/MpiCommunicator.h

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ class MpiCommunicator 
            {

               std::cout<< GetRank(AllGroup) <<": Redirecting std::out to file" <<std::endl;

               String stdoutFile;

               stdoutFile=String( "./stdout-")+convertToString(MPI::COMM_WORLD.Get_rank())+String(".txt");

               stdoutFile=String( "./stdout-")+convertToString(GetRank(MPI_COMM_WORLD))+String(".txt");

               filestr.open (stdoutFile.getString()); 

               psbuf = filestr.rdbuf(); 

               std::cout.rdbuf(psbuf);

src/Tools/tnl-grid-setup.h

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ bool resolveIndexType( const Config::ParameterContainer& parameters ) 
  std::cout << "Setting index type to  ... " << indexType << std::endl;

   if( indexType == "int" )

      return setupGrid< RealType, int >( parameters );

   if( indexType == "long int" )

   if( indexType == "long-int" )

      return setupGrid< RealType, long int >( parameters );

   std::cerr << "The index type '" << indexType << "' is not defined. " << std::endl;

   return false;

src/UnitTests/Mpi/CutDistributedGridTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ TEST(NoMPI, NoTest) 
    // Called after a test ends.

    virtual void OnTestEnd(const ::testing::TestInfo& test_info) 

    {

        int rank=MPI::COMM_WORLD.Get_rank();

        int rank=CommunicatorType::GetRank(CommunicatorType::AllGroup);

        sout<< test_info.test_case_name() <<"." << test_info.name() << " End." <<std::endl;

        std::cout << rank << ":" << std::endl << sout.str()<< std::endl;

        sout.str( std::string() );

src/UnitTests/Mpi/CutDistributedMeshFunctionTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ TEST(NoMPI, NoTest) 
    // Called after a test ends.

    virtual void OnTestEnd(const ::testing::TestInfo& test_info) 

    {

        int rank=MPI::COMM_WORLD.Get_rank();

        int rank=CommunicatorType::GetRank(CommunicatorType::AllGroup);

        sout<< test_info.test_case_name() <<"." << test_info.name() << " End." <<std::endl;

        std::cout << rank << ":" << std::endl << sout.str()<< std::endl;

        sout.str( std::string() );