Commit d389ee2a authored by gbalduzz's avatar gbalduzz
Browse files

fixes for filesytem and parameter wiki.

parent 0aeda924

applications/dca/main_dca.cpp

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

#include <iostream>



#include "dca/config/cmake_options.hpp"

#include "dca/application/dca_loop_dispatch.hpp"

#include "dca/config/cmake_options.hpp"

// Defines Concurrency, Threading, ParametersType, DcaData, DcaLoop, and Profiler.

#include "dca/config/dca.hpp"

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

include/dca/io/writer.hpp

+3 −4
Original line number Diff line number Diff line 
// Copyright (C) 2018 ETH Zurich

// Copyright (C) 2018 UT-Battelle, LLC

// Copyright (C) 2020 ETH Zurich

// Copyright (C) 2020 UT-Battelle, LLC

// All rights reserved.

//

// See LICENSE for terms of usage.

// See CITATION.md for citation guidelines, if DCA++ is used for scientific publications.

//

// Author: Peter Staar (taa@zurich.ibm.com)

//         Giovanni Balduzzi (gbalduzz@itp.phys.ethz.ch)

// Author: Giovanni Balduzzi (gbalduzz@itp.phys.ethz.ch)

//

// Wrapper to an instance of HDF5Writer of JSONWriter.

misc/wiki/Parameters.md

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ Defined in <tt>output_parameters.hpp</tt>. 
`"directory":` string ("./")  

Directory to write the output to.



`"output-format":` string ("HDF5")  

File format of the output files. Options are: "HDF5" | "JSON".



`"autoresume":` bool (false)

If true, looks for a file named `<filename-dca>.tmp` generated from an aborted run, and starts 

the DCA loop from the last completed iteration. If the read is successful the parameter
@@ -57,6 +60,7 @@ Write out the &chi;<sub>0</sub> function of the BSE lattice solver. 
    {

        "output": {

            "directory": "./T=0.5",

            "output-format": "HDF5",

            "autoresume" : true,

            "filename-dca": "dca.hdf5",

            "filename-analysis": "analysis.hdf5",

src/io/hdf5/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ 


add_library(dca_hdf5 STATIC hdf5_reader.cpp hdf5_writer.cpp)

target_include_directories(dca_hdf5 PUBLIC ${HDF5_INCLUDE_DIRS})

target_link_libraries(dca_hdf5 PUBLIC ${HDF5_LIBRARIES})
 
target_link_libraries(dca_hdf5 PUBLIC ${HDF5_LIBRARIES}; stdc++fs)

test/system-level/dca/dca_sp_DCA+_mpi_cuda_test.cpp

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include "dca/config/cmake_options.hpp"

#include "dca/function/util/difference.hpp"

#include "dca/io/filesystem.hpp"

#include "dca/io/hdf5/hdf5_reader.hpp"

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

#include "dca/linalg/util/info_cuda.hpp"
@@ -57,9 +58,9 @@ TEST(dca_sp_DCAplus_mpi, Self_energy) { 


  if (dca_test_env->concurrency.id() == dca_test_env->concurrency.first()) {

    // Copy initial state from an aborted run.

    std::filesystem::copy_file(

    filesystem::copy_file(

        DCA_SOURCE_DIR "/test/system-level/dca/data.dca_sp_DCA+_mpi_test.hdf5.tmp",

        "./data.dca_sp_DCA+_mpi_test.hdf5.tmp", std::filesystem::copy_options::overwrite_existing);

        "./data.dca_sp_DCA+_mpi_test.hdf5.tmp", filesystem::copy_options::overwrite_existing);



    dca::util::GitVersion::print();

    dca::util::Modules::print();