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

fix merge damage

parent f49098fc

include/dca/phys/dca_data/dca_data.hpp

+23 −23
Original line number Diff line number Diff line
@@ -390,7 +390,6 @@ void DcaData<Parameters, DT>::read(adios2::ADIOS& adios, std::string filename) { 


template <class Parameters, DistType DT>

void DcaData<Parameters, DT>::read(dca::io::Reader<typename Parameters::concurrency_type>& reader) {



  std::size_t step_count = reader.getStepCount();

  for (std::size_t i = 0; i < step_count; ++i) {

    reader.begin_step();
@@ -662,7 +661,6 @@ void DcaData<Parameters, DT>::initializeSigma(const std::string& filename) { 
          reader.close_file();

          reader.open_file(filename);

          step_count = hdf5_last_iteration;

	goto find_step;	

        }

        reader.end_step();

      }
@@ -673,6 +671,7 @@ void DcaData<Parameters, DT>::initializeSigma(const std::string& filename) { 
    concurrency_.broadcast(parameters_.get_chemical_potential());

    concurrency_.broadcast(Sigma);

  }

}



template <class Parameters, DistType DT>

void DcaData<Parameters, DT>::readSigmaFile(io::Reader<Concurrency>& reader) {
@@ -682,7 +681,8 @@ void DcaData<Parameters, DT>::readSigmaFile(io::Reader<Concurrency>& reader) { 
  std::vector<int> completed_iterations;

  bool has_iteration = reader.execute("completed-iteration", completed_iterations);

  if (chemical_potential_present && has_iteration) {

    int completed_iteration = *std::max_element(completed_iterations.begin(), completed_iterations.end());

    int completed_iteration =

        *std::max_element(completed_iterations.begin(), completed_iterations.end());

    std::cout << "chemical-potential from Sigma file: " << chemical_potentials[completed_iteration]

              << '\n';

    parameters_.get_chemical_potential() = chemical_potentials[completed_iteration];

test/unit/phys/dca_data/dca_data_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -43,13 +43,13 @@ constexpr char dca_data_test_input[] = DCA_SOURCE_DIR "/test/unit/phys/dca_data/ 


template <typename Scalar, class Concurrency, class Lattice = LatticeSquare,

          ClusterSolverId solver_name = ClusterSolverId::CT_AUX,

          const char* input_name = dca_data_test_input, DistType DT = DistType::NONE>

          const char* input_name = dca_data_test_input, DistType DT = DistType::NONE, class NUMTRAITS = dca::NumericalTraits<dca::util::RealAlias<Scalar>, Scalar>>

struct DCADataSetup {

  using LatticeType = Lattice;

  using Model = phys::models::TightBindingModel<Lattice>;

  using RngType = testing::StubRng;

  using Parameters = phys::params::Parameters<Concurrency, parallel::NoThreading,

                                              profiling::NullProfiler, Model, RngType, solver_name>;

                                              profiling::NullProfiler, Model, RngType, solver_name, NUMTRAITS>;

  using Data = phys::DcaData<Parameters, DT>;

  using LoopData = phys::DcaLoopData<Parameters>;

test/unit/phys/dca_step/cluster_solver/shared_tools/accumulation/tp/tp_accumulator_test_baseline.hdf5

(28 MiB)

File changed.

No diff preview for this file type.

View original file
View changed file