Unverified Commit 221688ea authored by Peter Doak's avatar Peter Doak Committed by GitHub
Browse files

Merge pull request #271 from PDoakORNL/readSigmaFile_bug 

partial fix of #273
parents 53afb8dd 96b76e5b

include/dca/phys/dca_algorithms/compute_free_greens_function.hpp

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ void compute_G0_k_t( 


  compute_G0_k_t(H0_k, mu, beta, f_cmplx);



  G0_k_t = std::move(func::util::real(f_cmplx, ImagCheck::FAIL));

  G0_k_t = std::move(func::util::real(f_cmplx, ImagCheck::WARN));

}



}  // namespace phys

include/dca/phys/dca_data/dca_data.hpp

+4 −3
Original line number Diff line number Diff line
@@ -605,6 +605,8 @@ void DcaData<Parameters, DT>::initializeSigma(adios2::ADIOS& adios [[maybe_unuse 
    reader.open_file(filename);

    readSigmaFile(reader);

  }

  concurrency_.broadcast(parameters_.get_chemical_potential());

  concurrency_.broadcast(Sigma);

}

#endif
@@ -615,6 +617,8 @@ void DcaData<Parameters, DT>::initializeSigma(const std::string& filename) { 
    reader.open_file(filename);

    readSigmaFile(reader);

  }

  concurrency_.broadcast(parameters_.get_chemical_potential());

  concurrency_.broadcast(Sigma);

}



template <class Parameters, DistType DT>
@@ -630,9 +634,6 @@ void DcaData<Parameters, DT>::readSigmaFile(io::Reader<Concurrency>& reader) { 
  reader.open_group("functions");

  reader.execute(Sigma);

  reader.close_group();



  concurrency_.broadcast(parameters_.get_chemical_potential());

  concurrency_.broadcast(Sigma);

}



template <class Parameters, DistType DT>

include/dca/phys/dca_loop/dca_loop.hpp

+4 −4
Original line number Diff line number Diff line
@@ -212,12 +212,12 @@ void DcaLoop<ParametersType, DDT, MCIntegratorType, DIST>::initialize() { 
    // do we want to decide what format we are reading?  Just from output format?

#ifdef DCA_HAVE_ADIOS2

    if (iotype == io::IOType::ADIOS2)

      last_completed = DCA_info_struct.readData(

          autoresume_filename, parameters.get_output_format(), concurrency, adios_);

      last_completed = DCA_info_struct.readData(autoresume_filename, parameters.get_output_format(),

                                                concurrency, adios_);

    else

#endif

      last_completed = DCA_info_struct.readData(autoresume_filename,

                                                parameters.get_output_format(), concurrency);

      last_completed =

          DCA_info_struct.readData(autoresume_filename, parameters.get_output_format(), concurrency);

    if (last_completed >= 0) {

      if (concurrency.id() == concurrency.first())

        std::cout << "\n   *******  Resuming DCA from iteration " << last_completed + 1