Commit 2ee92518 authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

fix chi_q_omega

parent 6dc40f54

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
# Build directories (exclude build-aux)

build*

!build-aux

cmake-build*





# Bin directories

bin*

applications/analysis/chi_q_omega.cpp

+41 −47
Original line number Diff line number Diff line
@@ -74,23 +74,18 @@ int main(int argc, char** argv) { 
#ifdef DCA_HAVE_ADIOS2

  adios2::ADIOS adios;



  if (dca::io::stringToIOType(parameters.get_output_format()) == dca::io::IOType::ADIOS2) {

  int rank = concurrency.id();

  std::cout << "\nProcessor " << concurrency.id() << " is writing data." << std::endl;

    dca::io::Writer writer(adios, concurrency, parameters.get_output_format(), true);

  dca::io::Writer writer(adios, concurrency, "ADIOS2", true);

  std::string filename_bse(parameters.get_directory() + parameters.getAppropriateFilenameAnalysis());

  writer.open_file(filename_bse);



  std::string filename(parameters.get_directory() + parameters.get_filename_dca());

    dca::io::Reader reader(concurrency, parameters.get_output_format());

  dca::io::Reader reader(concurrency, "HDF5");

  reader.open_file(filename);

    auto& adios2_reader = std::get<dca::io::ADIOS2Reader<Concurrency>>(reader.getUnderlying());

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



  int ranks = concurrency.get_size();



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

  int current_step = 0;



  while (true) {

    if (current_step >= step_count - 1)

      break;
@@ -100,12 +95,12 @@ int main(int argc, char** argv) { 
      // cut off the last weird step dca is saving

      if (current_step >= step_count - 1)

        goto end_steps;

        adios2_reader.begin_step();

      reader.begin_step();

      if (rank == ir) {

        dca_data.read(reader);

        got_step_num = current_step;

      }

        adios2_reader.end_step();

      reader.end_step();

      ++current_step;

    }

    if (got_step_num >= 0) {
@@ -125,7 +120,6 @@ int main(int argc, char** argv) { 
    parameters.write(writer);

  writer.end_step();

  writer.close_file();

  }

#endif

  std::cout << "\nFinish time: " << dca::util::print_time() << "\n" << std::endl;

  return 0;

dockerfiles/Dockerfile.cpu

+4 −4
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ RUN apt-get update \ 
      git \

  && apt-get clean



RUN wget https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0.tar.gz \

 && tar -zxvf cmake-3.20.0.tar.gz \

 && cd cmake-3.20.0 \

 && ./bootstrap -- -DCMAKE_USE_OPENSSL=OFF && make && make install && cd .. && rm -rf cmake-3.20.0

RUN wget https://github.com/Kitware/CMake/releases/download/v3.21.0/cmake-3.21.0.tar.gz \

 && tar -zxvf cmake-3.21.0.tar.gz \

 && cd cmake-3.21.0 \

 && ./bootstrap -- -DCMAKE_USE_OPENSSL=OFF && make && make install && cd .. && rm -rf cmake-3.21.0



ENV ADIOS2_DIR=/opt/adios2

RUN mkdir -p $ADIOS2_DIR

include/dca/phys/dca_data/dca_data.hpp

+4 −4
Original line number Diff line number Diff line
@@ -394,10 +394,10 @@ 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();

  }

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

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

//    reader.begin_step();

//  }



  reader.open_group("parameters");