Unverified Commit fccf1b8e authored by gbalduzz's avatar gbalduzz Committed by GitHub
Browse files

Merge pull request #223 from PDoakORNL/fix_pure_virtual_call_from_tests 

fix pure virtual function calls involving MPIConcurrency and gtest
parents 8e0bff07 908833d0

include/dca/parallel/mpi_concurrency/mpi_concurrency.hpp

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ namespace dca { 
namespace parallel {

// dca::parallel::



/** Extremely overengineered

 *

 *  \todo simplify

 */

class MPIConcurrency final : public virtual MPIInitializer,

                             public virtual MPIProcessorGrouping,

                             public MPIPacking,

include/dca/testing/dca_mpi_test_environment.hpp

+3 −3
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ namespace testing { 
struct DcaMpiTestEnvironment : public ::testing::Environment {

  using ConcurrencyType = dca::parallel::MPIConcurrency;



  DcaMpiTestEnvironment(int argc, char* argv[], std::string file_name)

      : concurrency(argc, argv), input_file_name(file_name) {}

  DcaMpiTestEnvironment(ConcurrencyType& con, std::string file_name)

      : concurrency(con), input_file_name(file_name) {}



  ConcurrencyType concurrency;

  ConcurrencyType& concurrency;

  std::string input_file_name;

};

test/integration/cluster_solver/ctaux/bilayer_lattice/Nc1_interband/bilayer_lattice_Nc1_interband.cpp

+2 −1
Original line number Diff line number Diff line
@@ -159,8 +159,9 @@ int main(int argc, char** argv) { 


  ::testing::InitGoogleTest(&argc, argv);



  dca::parallel::MPIConcurrency concurrency(argc, argv);

  dca_test_env = new dca::testing::DcaMpiTestEnvironment(

      argc, argv, DCA_SOURCE_DIR

      concurrency, DCA_SOURCE_DIR

      "/test/integration/cluster_solver/ctaux/bilayer_lattice/Nc1_interband/"

      "input.bilayer_lattice_Nc1_interband.json");

  ::testing::AddGlobalTestEnvironment(dca_test_env);

test/integration/cluster_solver/ctaux/bilayer_lattice/Nc1_intra_plus_interband/bilayer_lattice_Nc1_intra_plus_interband.cpp

+2 −1
Original line number Diff line number Diff line
@@ -154,8 +154,9 @@ int main(int argc, char** argv) { 


  ::testing::InitGoogleTest(&argc, argv);



  dca::parallel::MPIConcurrency concurrency(argc, argv);

  dca_test_env = new dca::testing::DcaMpiTestEnvironment(

      argc, argv, DCA_SOURCE_DIR

      concurrency, DCA_SOURCE_DIR

      "/test/integration/cluster_solver/ctaux/bilayer_lattice/Nc1_intra_plus_interband/"

      "input.bilayer_lattice_Nc1_intra_plus_interband.json");

  ::testing::AddGlobalTestEnvironment(dca_test_env);

test/integration/cluster_solver/ctaux/bilayer_lattice/Nc1_intraband/bilayer_lattice_Nc1_intraband.cpp

+2 −1
Original line number Diff line number Diff line
@@ -153,8 +153,9 @@ int main(int argc, char** argv) { 


  ::testing::InitGoogleTest(&argc, argv);



  dca::parallel::MPIConcurrency concurrency(argc, argv);

  dca_test_env = new dca::testing::DcaMpiTestEnvironment(

      argc, argv, DCA_SOURCE_DIR

      concurrency, DCA_SOURCE_DIR

      "/test/integration/cluster_solver/ctaux/bilayer_lattice/Nc1_intraband/"

      "input.bilayer_lattice_Nc1_intraband.json");

  ::testing::AddGlobalTestEnvironment(dca_test_env);