Commit 44761380 authored by gbalduzz's avatar gbalduzz
Browse files

Removed autoresume dependency on HDF5

parent 5deda10e

include/dca/phys/dca_loop/dca_loop.hpp

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ template <typename ParametersType, typename DcaDataType, typename MCIntegratorTy 
void DcaLoop<ParametersType, DcaDataType, MCIntegratorType, DIST>::logSelfEnergy(int i) {

  DCA_info_struct.last_completed_iteration = i;



  if (output_file_ && parameters.get_output_format() == "HDF5") {

  if (output_file_) {

    output_file_->open_group("functions");

    output_file_->execute(MOMS.Sigma);

    output_file_->close_group();

include/dca/phys/parameters/output_parameters.hpp

+0 −4
Original line number Diff line number Diff line
@@ -202,10 +202,6 @@ void OutputParameters::readWrite(ReaderOrWriter& reader_or_writer) { 
  }

  catch (const std::exception& r_e) {

  }



  if (autoresume_ && output_format_ != "HDF5") {

    throw(std::logic_error("Autoresume requires HDF5 output."));

  }

}



}  // namespace params

test/unit/phys/parameters/output_parameters/input_read_all.json

+1 −1
Original line number Diff line number Diff line 
{

    "output": {

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

        "output-format": "HDF5",

        "output-format": "JSON",

        "autoresume" : true,

        "directory-config-read" : "configuration",

        "directory-config-write" : "configuration",

test/unit/phys/parameters/output_parameters/output_parameters_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ TEST(OutputParametersTest, ReadAll) { 
  // HDF5 is the recommended output format. We use JSON in this test, since HDF5 is already the

  // default.

  EXPECT_EQ("./T=0.5", pars.get_directory());

  EXPECT_EQ("HDF5", pars.get_output_format()); // autoresume and JSON are incompatible.

  EXPECT_EQ("JSON", pars.get_output_format()); // autoresume and JSON are incompatible.

  EXPECT_EQ(true, pars.autoresume());

  EXPECT_EQ("configuration", pars.get_directory_config_read());

  EXPECT_EQ("configuration", pars.get_directory_config_write());