Skip to content
Open
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: 2 additions & 0 deletions GridKit/Model/PhasorDynamics/Bus/Bus.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ namespace GridKit
}

// Available template instantiations
template class BusBase<double, long int>;
template class BusBase<double, size_t>;
template class Bus<double, long int>;
template class Bus<double, size_t>;

Expand Down
2 changes: 2 additions & 0 deletions GridKit/Model/PhasorDynamics/Bus/BusDependencyTracking.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ namespace GridKit
}

// Available template instantiations
template class BusBase<DependencyTracking::Variable, long int>;
template class BusBase<DependencyTracking::Variable, size_t>;
template class Bus<DependencyTracking::Variable, long int>;
template class Bus<DependencyTracking::Variable, size_t>;

Expand Down
2 changes: 2 additions & 0 deletions GridKit/Model/PhasorDynamics/Bus/BusEnzyme.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ namespace GridKit
}

// Available template instantiations
template class BusBase<double, long int>;
template class BusBase<double, size_t>;
template class Bus<double, long int>;
template class Bus<double, size_t>;

Expand Down
2 changes: 1 addition & 1 deletion GridKit/Model/PhasorDynamics/SystemModelDataJSONParser.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ namespace GridKit
auto delim = raw_mon.value("delim", std::string(","));
if (format.has_value())
{
sm.monitor_sink.emplace_back(file_name, format.value(), delim);
sm.monitor_sink.emplace_back(format.value(), file_name, delim);
}
else
{
Expand Down
50 changes: 39 additions & 11 deletions GridKit/Model/VariableMonitor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <algorithm>
#include <array>
#include <charconv>
#include <fstream>
#include <functional>
#include <iomanip>
Expand All @@ -11,6 +12,7 @@
#include <set>
#include <sstream>
#include <string>
#include <system_error>
#include <type_traits>
#include <variant>
#include <vector>
Expand All @@ -24,6 +26,32 @@ namespace GridKit
template <typename ScalarT>
class VariableMonitorController;

namespace VariableMonitorDetail
{
template <typename RealT>
std::string formatReal(RealT value)
{
std::array<char, 128> buffer{};
constexpr auto precision = std::numeric_limits<RealT>::digits10 + 1;

auto [ptr, ec] = std::to_chars(buffer.data(),
buffer.data() + buffer.size(),
value,
std::chars_format::scientific,
precision);

if (ec == std::errc{})
{
return std::string(buffer.data(), ptr);
}

std::ostringstream os;
os.precision(precision);
os << std::scientific << value;
return os.str();
}
} // namespace VariableMonitorDetail

/**
* @enum VariableMonitorFormat
* Available formats for monitor output
Expand Down Expand Up @@ -74,10 +102,10 @@ namespace GridKit
*/
struct SinkSpec
{
/// Output file name (empty for stdout)
std::string file_name;
/// Output format
Format format;
/// Output file name (empty for stdout)
std::string file_name{};
/// Delimiter (used only with CSV format currently)
std::string delim{","};
};
Expand All @@ -96,13 +124,13 @@ namespace GridKit
/**
* @brief Print items relevant to the start of a file
*/
virtual void printHeader(std::ostream&, Csv) const = 0;
virtual void appendHeader(std::string&, Csv) const = 0;

virtual void printHeader(std::ostream&, Json) const
virtual void appendHeader(std::string&, Json) const
{
}

virtual void printHeader(std::ostream&, Yaml) const
virtual void appendHeader(std::string&, Yaml) const
{
}

Expand All @@ -112,25 +140,25 @@ namespace GridKit
/**
* @brief Print monitored variables at current state
*/
virtual void print(std::ostream&, Csv) const = 0;
virtual void print(std::ostream&, Json) const = 0;
virtual void print(std::ostream&, Yaml) const = 0;
virtual void append(std::string&, Csv) const = 0;
virtual void append(std::string&, Json) const = 0;
virtual void append(std::string&, Yaml) const = 0;

///@}

///@{
/**
* @brief Print items relevant to the end of a file
*/
virtual void printFooter(std::ostream&, Csv) const
virtual void appendFooter(std::string&, Csv) const
{
}

virtual void printFooter(std::ostream&, Json) const
virtual void appendFooter(std::string&, Json) const
{
}

virtual void printFooter(std::ostream&, Yaml) const
virtual void appendFooter(std::string&, Yaml) const
{
}

Expand Down
Loading
Loading