Skip to content

converting std::vector<double> to std::vector<float> for BIC coefficients in GenericOilGasWaterFluidSystem #5178

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
bska merged 3 commits into from
Jun 3, 2026
Merged

converting std::vector<double> to std::vector<float> for BIC coefficients in GenericOilGasWaterFluidSystem #5178

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f10742
converting std::vector<double> to std::vector<float>
GitPaean May 21, 2026
577ae55
removing the unhelpful FluidSystem::printComponentParams()
GitPaean May 27, 2026
2ffc30f
addressing reviewing comments.
GitPaean Jun 3, 2026
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
12 changes: 10 additions & 2 deletions opm/material/fluidsystems/GenericOilGasWaterFluidSystem.hpp
View file
Open in desktop
Copy link
Copy Markdown
Member

@bska bska Jun 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we at least keep the current assignment if Scalar is double? For instance, something along the lines of

if constexpr (std::is_same_v<Scalar, double>) {
    this->interaction_coefficients_ = ...;
}
else {
    const auto& bic = ...;
    this->interaction_coefficients_.assign(bic.begin(), bic.end());
}

with std::is_same_v<> from the <type_traits> header.

Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,12 @@
#include <opm/material/fluidsystems/PTFlashParameterCache.hpp> // TODO: this is something else need to check
#include <opm/material/viscositymodels/LBC.hpp>

#include <algorithm>
#include <cassert>
#include <cstddef>
#include <string>
#include <string_view>
#include <type_traits>

#include <fmt/format.h>

Expand Down Expand Up @@ -156,8 +158,14 @@ namespace Opm {
FluidSystem::addComponent(CompParm{names[c], molar_weight[c], critic_temp[c], critic_pressure[c],
critic_volume[c] * 1.e3, acentric_factor[c]});
}
FluidSystem::printComponentParams();
interaction_coefficients_ = comp_config.binaryInteractionCoefficient(0);

const auto& bic = comp_config.binaryInteractionCoefficient(0);
if constexpr (std::is_same_v<Scalar, double>) {
interaction_coefficients_ = bic;
} else {
interaction_coefficients_.resize(bic.size());
std::ranges::copy(bic, interaction_coefficients_.begin());
}

// Init. water pvt from deck
waterPvt_->initFromState(eclState, schedule);
Expand Down