Skip to content

Only check if model supports mass balance checks if mass balance feature is enabled #916

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 1 commit into from
Nov 10, 2025
Merged

Only check if model supports mass balance checks if mass balance feature is enabled #916

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions src/utilities/bmi/mass_balance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,9 @@ auto NgenMassBalance::check_support(const ModelPtr& model) -> expected<void, Pro

auto NgenMassBalance::initialize(const ModelPtr& model, const Properties& properties) -> expected<void, ProtocolError>
{
//Ensure the model is capable of mass balance using the protocol
check_support(model).or_else( error_or_warning );

//now check if the user has requested to use mass balance
auto protocol_it = properties.find(CONFIGURATION_KEY);
if ( supported && protocol_it != properties.end() ) {
if ( protocol_it != properties.end() ) {
geojson::PropertyMap mass_bal = protocol_it->second.get_values();

auto _it = mass_bal.find(TOLERANCE_KEY);
Expand Down Expand Up @@ -184,11 +181,15 @@ auto NgenMassBalance::initialize(const ModelPtr& model, const Properties& proper
//no mass balance requested, or not supported, so don't check it
check = false;
}
if ( check ) {
//Ensure the model is capable of mass balance using the protocol
check_support(model).or_else( error_or_warning );
}
return {}; // important to return for the expected to be properly created!
}

bool NgenMassBalance::is_supported() const {
return this->supported;
}

}}} // end namespace models::bmi::protocols
}}} // end namespace models::bmi::protocols
Loading