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

Merge pull request #310 from PDoakORNL/MHM_merge_no_mixed 

Candidate for ComplexG0 merge
parents b825e4f6 f4e2acf0

CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ set(DCA_LIBS 
  quantum_domains

  time_and_frequency_domains

  signals

  symmetrization

  coarsegraining

  ${DCA_CONCURRENCY_LIB}

  ${DCA_THREADING_LIBS}

applications/analysis/chi_q_omega.cpp

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <string>



// Defines Concurrency, Threading, ParametersType, DcaData, and BseSolver.

#include "dca/config/mc_options.hpp"

#include "dca/config/analysis.hpp"

#include "dca/config/cmake_options.hpp"

#include "dca/io/json/json_reader.hpp"

applications/analysis/main_analysis.cpp

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ 


#include <iostream>

#include <string>



// Defined Precision and Scalar Type

#include "dca/config/mc_options.hpp"

// Defines Concurrency, Threading, ParametersType, DcaData, and BseSolver.

#include "dca/config/analysis.hpp"

#include "dca/config/cmake_options.hpp"
@@ -63,7 +64,6 @@ int main(int argc, char** argv) { 
  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);

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

applications/dca/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ if (DCA_BUILD_DCA) 
  target_include_directories(main_dca PRIVATE ${DCA_INCLUDE_DIRS})



  if (DCA_HAVE_GPU)

    target_link_libraries(main_dca PRIVATE ${DCA_GPU_LIBS})

    target_link_libraries(main_dca PRIVATE ${DCA_GPU_LIBS} mc_kernels g0_interpolation mc_kernels ctint mc_kernels)

  endif()

  

  target_link_libraries(main_dca PUBLIC FFTW::Double signals  ${DCA_LIBS})

applications/dca/main_dca.cpp

+6 −0
Original line number Diff line number Diff line
@@ -64,8 +64,14 @@ int dca_main(int argc, char** argv) { 
    // Create the parameters object from the input file.

    ParametersType parameters(dca::util::GitVersion::string(), concurrency);

    parameters.read_input_and_broadcast<dca::io::JSONReader>(input_file);

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

      std::cout << "Input read and broadcast.\n";

    parameters.update_model();

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

      std::cout << "Model updated.\n";

    parameters.update_domains();

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

      std::cout << "Domains updated.\n";



    dca::DistType distribution = parameters.get_g4_distribution();

    {