Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,6 @@ set(BASIC_LINK_LIBS
classes
kernels
potentials
io
export
neta
analyser
generator
Expand Down
1 change: 0 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ add_subdirectory(items)
add_subdirectory(generator)
add_subdirectory(kernels)
add_subdirectory(keywords)
add_subdirectory(io)
add_subdirectory(main)
add_subdirectory(math)
add_subdirectory(neta)
Expand Down
8 changes: 4 additions & 4 deletions src/classes/partialSet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
#include "classes/box.h"
#include "classes/configuration.h"
#include "classes/species.h"
#include "io/export/data1D.h"
#include "items/deserialisers.h"
#include "math/interpolator.h"
#include "nodes/exportData.h"
#include "templates/algorithms.h"
#include <filesystem>

Expand Down Expand Up @@ -311,15 +311,15 @@ bool PartialSet::save(std::string_view prefix, std::string_view tag, std::string
triangular_);

Messenger::printVerbose("Writing total file '{}'...\n", total_.tag());
if (!Data1DExportFileFormat(std::format("{}-{}-total.{}", prefix, tag, suffix)).exportData(total_))
if (!ExportDataNode::write(total_, std::format("{}-{}-total.{}", prefix, tag, suffix)))
return false;

Messenger::printVerbose("Writing bound total file '{}'...\n", boundTotal_.tag());
if (!Data1DExportFileFormat(std::format("{}-{}-bound.{}", prefix, tag, suffix)).exportData(boundTotal_))
if (!ExportDataNode::write(boundTotal_, std::format("{}-{}-bound.{}", prefix, tag, suffix)))
return false;

Messenger::printVerbose("Writing unbound total file '{}'...\n", unboundTotal_.tag());
if (!Data1DExportFileFormat(std::format("{}-{}-unbound.{}", prefix, tag, suffix)).exportData(unboundTotal_))
if (!ExportDataNode::write(unboundTotal_, std::format("{}-{}-unbound.{}", prefix, tag, suffix)))
return false;

return true;
Expand Down
6 changes: 2 additions & 4 deletions src/classes/partialSetAccumulator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "classes/partialSetAccumulator.h"
#include "base/lineParser.h"
#include "base/sysFunc.h"
#include "io/export/data1D.h"
#include "nodes/exportData.h"
#include <format>

void PartialSetAccumulator::operator+=(const PartialSet &source)
Expand Down Expand Up @@ -100,9 +100,7 @@ bool PartialSetAccumulator::save(std::string_view prefix, std::string_view tag,
parser.closeFiles();
}

Data1DExportFileFormat exportFormat(std::format("{}-{}-total.{}", prefix, tag, suffix));
Messenger::printVerbose("Writing total file '{}'...\n", exportFormat.filename());
return exportFormat.exportData(total_);
return ExportDataNode::write(total_, std::format("{}-{}-total.{}", prefix, tag, suffix));
}

/*
Expand Down
1 change: 0 additions & 1 deletion src/generator/coordinateSets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "classes/configuration.h"
#include "classes/species.h"
#include "keywords/bool.h"
#include "keywords/fileAndFormat.h"
#include "keywords/node.h"
#include "keywords/nodeValue.h"
#include "keywords/species.h"
Expand Down
7 changes: 0 additions & 7 deletions src/io/CMakeLists.txt

This file was deleted.

20 changes: 0 additions & 20 deletions src/io/export/CMakeLists.txt

This file was deleted.

70 changes: 0 additions & 70 deletions src/io/export/data1D.cpp

This file was deleted.

50 changes: 0 additions & 50 deletions src/io/export/data1D.h

This file was deleted.

91 changes: 0 additions & 91 deletions src/io/export/data2D.cpp

This file was deleted.

54 changes: 0 additions & 54 deletions src/io/export/data2D.h

This file was deleted.

Loading
Loading