Commit bff0aad0 authored by Doak, Peter W.'s avatar Doak, Peter W.
Browse files

post merge fixes

parent a516b813

include/dca/io/reader.hpp

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public: 
      reader_.template emplace<io::JSONReader>(verbose);

    }

    else if (format == "ADIOS2") {

      throw(std::logic_error("ADIOS2 reader requires an adios reference"));

      reader_.template emplace<io::ADIOS2Reader<Concurrency>>(&concurrency, verbose);

    }

    else {

      throw(std::logic_error("Invalid input format"));

include/dca/phys/dca_data/dca_data.hpp

+4 −4
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ public: 
#ifdef DCA_HAVE_ADIOS2

  /** read initializeSigma from adios file, it is probably already open.

   */

  void initializeSigma(const adios2::ADIOS& adios, const std::string& filename);

  void initializeSigma(adios2::ADIOS& adios, const std::string& filename);

#endif

  void initializeSigma(const std::string& filename);

  void readSigmaFile(io::Reader<Concurrency>& reader);
@@ -598,10 +598,10 @@ void DcaData<Parameters, DT>::initialize_G0() { 


#ifdef DCA_HAVE_ADIOS2

template <class Parameters, DistType DT>

void DcaData<Parameters, DT>::initializeSigma(const adios2::ADIOS& adios,

void DcaData<Parameters, DT>::initializeSigma(adios2::ADIOS& adios,

                                              const std::string& filename) {

  if (concurrency_.id() == concurrency_.first()) {    

    io::Reader reader(adios, concurrency_, parameters_.get_output_format());

    io::Reader reader(concurrency_, parameters_.get_output_format());

    reader.open_file(filename);

    readSigmaFile(reader);

  }

include/dca/phys/dca_loop/dca_loop_data.hpp

+0 −4
Original line number Diff line number Diff line
@@ -90,11 +90,7 @@ public: 
};



template <typename ParametersType>

#ifdef DCA_HAVE_ADIOS2

DcaLoopData<ParametersType>::DcaLoopData(adios2::ADIOS& adios)

#else

DcaLoopData<ParametersType>::DcaLoopData()

#endif

    :

      Gflop_per_mpi_task("Gflop_per_mpi_task"),

      times_per_mpi_task("times_per_mpi_task"),

include/dca/phys/dca_step/cluster_solver/ctint/walker/ctint_walker_gpu_submatrix.hpp

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public: 
  using BaseClass::order;

  using RootClass::get_stream;



  std::size_t deviceFingerprint() const;

  std::size_t deviceFingerprint() const override;



protected:

  // For testing purposes:

src/io/adios2/adios2_reader.cpp

+0 −2
Original line number Diff line number Diff line
@@ -40,13 +40,11 @@ ADIOS2Reader<CT>::~ADIOS2Reader() { 
    close_file();

}





template <class CT>

void ADIOS2Reader<CT>::open_file(const std::string& file_name) {

  if (verbose_) {

    std::cout << "\t ADIOS2Reader: Open for Read file : " << file_name << "\n";

  }



  io_name_ = file_name;

  file_name_ = file_name;

  io_ = adios_.DeclareIO(io_name_);