Skip to content

statistics-mtg2 configuration/options cleanup #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Oct 7, 2025
Merged

statistics-mtg2 configuration/options cleanup #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
96bfcf2
Remove unused arguments
tweska Oct 2, 2025
df4d183
Remove duplicate logPrefix method from statistics config
tweska Oct 2, 2025
0914a03
Make values read from metadata const
tweska Oct 2, 2025
8adca92
Remove unused beginning of ... functionality
tweska Oct 2, 2025
5cafd25
Simplify time utils in statistics config
tweska Oct 2, 2025
c733059
Throw exception when missing value is requested, but undefined
tweska Oct 2, 2025
0f8e3c1
Remove unused compConf arguments
tweska Oct 2, 2025
2c7441e
Make values read from config options const
tweska Oct 2, 2025
1c3d2c5
Rename variables and methods
tweska Oct 2, 2025
1bf6676
Clean imports in config and options
tweska Oct 2, 2025
a46a964
Use const reference as return type
tweska Oct 2, 2025
da41f89
replace long -> std::int64_t
tweska Oct 2, 2025
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
4 changes: 2 additions & 2 deletions src/multio/action/statistics-mtg2/OperationWindow.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ eckit::DateTime yyyymmdd_hhmmss2DateTime(uint64_t yyyymmdd, uint64_t hhmmss) {

OperationWindow make_window(const std::unique_ptr<PeriodUpdater>& periodUpdater, const StatisticsConfiguration& cfg) {
eckit::DateTime epochPoint{cfg.epoch()};
eckit::DateTime startPoint{periodUpdater->computeWinStartTime(cfg.winStart())};
eckit::DateTime creationPoint{periodUpdater->computeWinCreationTime(cfg.winStart())};
eckit::DateTime startPoint{periodUpdater->computeWinStartTime(cfg.curr())};
eckit::DateTime creationPoint{periodUpdater->computeWinCreationTime(cfg.curr())};
eckit::DateTime endPoint{periodUpdater->computeWinEndTime(startPoint)};
long windowType = 0;
if (cfg.options().windowType() == "forward-offset") {
Expand Down
2 changes: 1 addition & 1 deletion src/multio/action/statistics-mtg2/Operations.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ std::vector<std::unique_ptr<Operation>> make_operations(const std::vector<std::s
std::vector<std::unique_ptr<Operation>> stats;
for (const auto& op : opNames) {
stats.push_back(make_operation<Precision>(op, msg.size(), IOmanager, win, cfg));
if (cfg.options().solver_send_initial_condition()) {
if (cfg.options().initialConditionPresent()) {
stats.back()->init(msg.payload().data(), msg.size(), msg, cfg);
}
else {
Expand Down
4 changes: 2 additions & 2 deletions src/multio/action/statistics-mtg2/Statistics.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Statistics::Statistics(const ComponentConfiguration& compConf) :
ChainedAction{compConf},
needRestart_{false},
lastDateTime_{""},
opt_{compConf},
opt_{compConf.parsedConfig().getSubConfiguration("options")},
operations_{compConf.parsedConfig().getStringVector("operations")},
outputFrequency_{compConf.parsedConfig().getString("output-frequency")},
paramMapping_{StatisticsParamMapping::makeStatisticsParamMapping()},
Expand Down Expand Up @@ -387,7 +387,7 @@ void Statistics::executeImpl(message::Message msg) {
// This can happen when the solver is sending the initial condition
// and and the same point is already present in the restart
auto& ts = *(stat->second);
if (cfg.curr() == ts.cwin().currPoint() && opt_.solver_send_initial_condition()) {
if (cfg.curr() == ts.cwin().currPoint() && opt_.initialConditionPresent()) {
return;
}

Expand Down
10 changes: 5 additions & 5 deletions src/multio/action/statistics-mtg2/SynopticCollection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ SynopticCollection::SynopticCollection(const std::string& operation, const messa
filter_{op_[0] == op_[1] ? make_filter(op_[1], cfg) : make_filter(op_[1], filterConf.at(op_[0]), cfg)} //,
// statistics_{make_operations(op_[2], msg, filter_->size(), IOmanager, win, cfg)}
{
LOG_DEBUG_LIB(::multio::LibMultio) << cfg.logPrefix() << " *** SynopticCollection standard constructor "
LOG_DEBUG_LIB(::multio::LibMultio) << cfg.options().logPrefix() << " *** SynopticCollection standard constructor "
<< std::endl;
};

Expand All @@ -132,7 +132,7 @@ SynopticCollection::SynopticCollection(const std::string& operation, const std::
filter_{op_[0] == op_[1] ? make_filter(op_[1], cfg) : make_filter(op_[1], filterConf.at(op_[0]), cfg)} //,
// statistics_{load_operations(op_[2], precision, filter_->size(), IOmanager, win, cfg)}
{
LOG_DEBUG_LIB(::multio::LibMultio) << cfg.logPrefix() << " *** SynopticCollection load constructor " << std::endl;
LOG_DEBUG_LIB(::multio::LibMultio) << cfg.options().logPrefix() << " *** SynopticCollection load constructor " << std::endl;
};


Expand All @@ -144,7 +144,7 @@ size_t SynopticCollection::size() const {


void SynopticCollection::resetWindow(const message::Message& msg, const StatisticsConfiguration& cfg) {
LOG_DEBUG_LIB(::multio::LibMultio) << cfg.logPrefix() << " *** SynopticCollection::updateWindow " << std::endl;
LOG_DEBUG_LIB(::multio::LibMultio) << cfg.options().logPrefix() << " *** SynopticCollection::updateWindow " << std::endl;
for (auto& stat : statistics_) {
// TODO: Just set to zero all the data of the window
// stat.resetWindow();
Expand All @@ -161,7 +161,7 @@ void SynopticCollection::resetWindow(const message::Message& msg, const Statisti


void SynopticCollection::updateData(const message::Message& msg, const StatisticsConfiguration& cfg) {
LOG_DEBUG_LIB(::multio::LibMultio) << cfg.logPrefix() << " *** SynopticCollection::updateData " << std::endl;
LOG_DEBUG_LIB(::multio::LibMultio) << cfg.options().logPrefix() << " *** SynopticCollection::updateData " << std::endl;
size_t key;
if (filter_->match(msg, cfg, key)) {
// TODO: add profiling code
Expand All @@ -181,7 +181,7 @@ void SynopticCollection::fillMetadata(size_t idx, message::Metadata& metadata) c


void SynopticCollection::dump(std::shared_ptr<StatisticsIO>& IOmanager, const StatisticsConfiguration& cfg) const {
LOG_DEBUG_LIB(::multio::LibMultio) << cfg.logPrefix() << " *** SynopticCollection::dump " << std::endl;
LOG_DEBUG_LIB(::multio::LibMultio) << cfg.options().logPrefix() << " *** SynopticCollection::dump " << std::endl;
std::ostringstream os;
size_t cnt = 0;
for (auto& stat : statistics_) {
Expand Down
6 changes: 3 additions & 3 deletions src/multio/action/statistics-mtg2/TemporalStatistics.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void TemporalStatistics::dump(std::shared_ptr<StatisticsIO>& IOmanager, const St
}

void TemporalStatistics::updateData(message::Message& msg, const StatisticsConfiguration& cfg) {
LOG_DEBUG_LIB(multio::LibMultio) << cfg.logPrefix() << " *** Update Data" << std::endl;
LOG_DEBUG_LIB(multio::LibMultio) << cfg.options().logPrefix() << " *** Update Data" << std::endl;
window_.updateData(currentDateTime(msg, cfg));
for (auto& stat : statistics_) {
// Truncation is always present when we are dealing with Spherical Harmonics
Expand All @@ -86,7 +86,7 @@ void TemporalStatistics::updateData(message::Message& msg, const StatisticsConfi
}

void TemporalStatistics::updateWindow(const message::Message& msg, const StatisticsConfiguration& cfg) {
LOG_DEBUG_LIB(multio::LibMultio) << cfg.logPrefix() << " *** Update Window " << std::endl;
LOG_DEBUG_LIB(multio::LibMultio) << cfg.options().logPrefix() << " *** Update Window " << std::endl;
window_.updateWindow(window_.endPoint(), periodUpdater_->updateWinEndTime(window_.endPoint()));
for (auto& stat : statistics_) {
stat->updateWindow(msg.payload().data(), msg.size(), msg, cfg);
Expand All @@ -96,7 +96,7 @@ void TemporalStatistics::updateWindow(const message::Message& msg, const Statist
}

bool TemporalStatistics::isOutsideWindow(message::Message& msg, const StatisticsConfiguration& cfg) {
LOG_DEBUG_LIB(::multio::LibMultio) << cfg.logPrefix() << " *** Check outside Window " << std::endl;
LOG_DEBUG_LIB(::multio::LibMultio) << cfg.options().logPrefix() << " *** Check outside Window " << std::endl;
return !window_.isWithin(currentDateTime(msg, cfg));
}

Expand Down
Loading
Loading