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

Merge pull request #304 from PDoakORNL/remove_DCA_SYMMETRIZE 

remove unimplemented DCA_SYMMETRIZE, fix test_output_parameters
parents 33ced5f9 8d3f3151

cmake/dca_config.cmake

+0 −9
Original line number Diff line number Diff line
@@ -413,15 +413,6 @@ endif() 
configure_file("${PROJECT_SOURCE_DIR}/include/dca/config/mc_options.hpp.in"

        "${CMAKE_BINARY_DIR}/include/dca/config/mc_options.hpp" @ONLY)



################################################################################

# Symmetrization

option(DCA_SYMMETRIZE "Apply cluster, time and frequency symmetries to single particle functions."

       ON)



if(DCA_SYMMETRIZE)

  add_compile_definitions(DCA_WITH_SYMMETRIZATION)

endif()



################################################################################

# Workarounds

option(DCA_FIX_BROKEN_MPICH "Re-define MPI_CXX_* datatypes as the corresponding MPI_C_* datatypes when mpich is the mpi provider."

include/dca/phys/parameters/output_parameters.hpp

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ void OutputParameters::readWrite(ReaderOrWriter& reader_or_writer) { 
      case io::IOType::HDF5:

        break;

      case io::IOType::JSON:

        throw std::runtime_error("JSON output format support dump-ever-iteration.");

        throw std::runtime_error("JSON output format does not support dump-ever-iteration.");

    }

  }

}

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

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

    "output": {

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

        "output-format": "JSON",

	"g4-output-format": "JSON",

        "output-format": "HDF5",

        "autoresume" : true,

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

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

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

+1 −2
Original line number Diff line number Diff line
@@ -78,8 +78,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("JSON", pars.get_output_format());

  EXPECT_EQ("JSON", pars.get_g4_output_format());

  EXPECT_EQ("HDF5", pars.get_output_format());

  EXPECT_EQ(true, pars.autoresume());

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

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