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

Merge pull request #226 from gbalduzz/json_writer 

Json writer
parents 99b884ac b57103fe

CMakeLists.txt

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

  symmetrization

  coarsegraining

  stdc++fs # std::filesystem

  ${DCA_CONCURRENCY_LIB}

  ${DCA_THREADING_LIBS}

  lapack

applications/dca/main_dca.cpp

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ int main(int argc, char** argv) { 
    }

  }

  catch (const std::exception& err) {

    std::cout << "Unhandled exception in main function:\n\t" << err.what();

    std::cout << "Unhandled exception in main function:\n\t" << err.what() << std::endl;

    concurrency.abort();

  }

include/dca/function/function.hpp

+7 −0
Original line number Diff line number Diff line
@@ -126,6 +126,13 @@ public: 
    return size_sbdm[index];

  }



  const auto& getDomainSizes() const noexcept {

    return size_sbdm;

  }

  const std::vector<scalartype>& getValues() const noexcept {

    return fnc_values_;

  }



  // Begin and end methods for compatibility with range for loop.

  auto begin() {

    return fnc_values_.begin();

include/dca/io/buffer.hpp

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include <algorithm>

#include <memory>

#include <stdexcept>

#include <vector>



namespace dca {

include/dca/io/hdf5/hdf5_reader.hpp

+2 −6
Original line number Diff line number Diff line
@@ -38,12 +38,8 @@ public: 


  ~HDF5Reader();



  bool is_reader() {

    return true;

  }

  bool is_writer() {

    return false;

  }

  constexpr static bool is_reader = true;

  constexpr static bool is_writer = false;



  void open_file(std::string file_name);

  void close_file();