Skip to content
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

Jump to bottom

Gpu support brineco2pvt #4319

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Gpu support brineco2pvt #4319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
587adc2
WIP make brineco2pvt work on gpu
multitalentloes Oct 29, 2024
20f2d9b
brineco2pvt now works on gpu
multitalentloes Oct 30, 2024
d96a8fd
rebase code
multitalentloes Nov 6, 2024
e5fc182
reorder arguments to make instantiation simpler
multitalentloes Nov 6, 2024
9b03726
fix indentation
multitalentloes Nov 6, 2024
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
34 changes: 17 additions & 17 deletions opm/material/fluidsystems/blackoilpvt/BrineCo2Pvt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@

namespace Opm {

template<class Scalar, class Params>
BrineCo2Pvt<Scalar, Params>::
BrineCo2Pvt(const std::vector<Scalar>& salinity,
template<class Scalar, class Params, class ContainerT>
BrineCo2Pvt<Scalar, Params, ContainerT>::
BrineCo2Pvt(const ContainerT& salinity,
int activityModel,
int thermalMixingModelSalt,
int thermalMixingModelLiquid,
Expand All @@ -60,8 +60,8 @@ BrineCo2Pvt(const std::vector<Scalar>& salinity,
}

#if HAVE_ECL_INPUT
template<class Scalar, class Params>
void BrineCo2Pvt<Scalar, Params>::
template<class Scalar, class Params, class ContainerT>
void BrineCo2Pvt<Scalar, Params, ContainerT>::
initFromState(const EclipseState& eclState, const Schedule&)
{
bool co2sol = eclState.runspec().co2Sol();
Expand Down Expand Up @@ -150,17 +150,17 @@ initFromState(const EclipseState& eclState, const Schedule&)
}
#endif

template<class Scalar, class Params>
void BrineCo2Pvt<Scalar, Params>::
template<class Scalar, class Params, class ContainerT>
void BrineCo2Pvt<Scalar, Params, ContainerT>::
setNumRegions(std::size_t numRegions)
{
brineReferenceDensity_.resize(numRegions);
co2ReferenceDensity_.resize(numRegions);
salinity_.resize(numRegions);
}

template<class Scalar, class Params>
void BrineCo2Pvt<Scalar, Params>::
template<class Scalar, class Params, class ContainerT>
void BrineCo2Pvt<Scalar, Params, ContainerT>::
setReferenceDensities(unsigned regionIdx,
Scalar rhoRefBrine,
Scalar rhoRefCO2,
Expand All @@ -170,8 +170,8 @@ setReferenceDensities(unsigned regionIdx,
co2ReferenceDensity_[regionIdx] = rhoRefCO2;
}

template<class Scalar, class Params>
void BrineCo2Pvt<Scalar, Params>::
template<class Scalar, class Params, class ContainerT>
void BrineCo2Pvt<Scalar, Params, ContainerT>::
setActivityModelSalt(int activityModel)
{
switch (activityModel) {
Expand All @@ -182,8 +182,8 @@ setActivityModelSalt(int activityModel)
}
}

template<class Scalar, class Params>
void BrineCo2Pvt<Scalar, Params>::
template<class Scalar, class Params, class ContainerT>
void BrineCo2Pvt<Scalar, Params, ContainerT>::
setThermalMixingModel(int thermalMixingModelSalt, int thermalMixingModelLiquid)
{
switch (thermalMixingModelSalt) {
Expand All @@ -200,8 +200,8 @@ setThermalMixingModel(int thermalMixingModelSalt, int thermalMixingModelLiquid)
}
}

template<class Scalar, class Params>
void BrineCo2Pvt<Scalar, Params>::
template<class Scalar, class Params, class ContainerT>
void BrineCo2Pvt<Scalar, Params, ContainerT>::
setEzrokhiDenCoeff(const std::vector<EzrokhiTable>& denaqa)
{
if (denaqa.empty())
Expand All @@ -216,8 +216,8 @@ setEzrokhiDenCoeff(const std::vector<EzrokhiTable>& denaqa)
static_cast<Scalar>(denaqa[0].getC2("CO2"))};
}

template<class Scalar, class Params>
void BrineCo2Pvt<Scalar, Params>::
template<class Scalar, class Params, class ContainerT>
void BrineCo2Pvt<Scalar, Params, ContainerT>::
setEzrokhiViscCoeff(const std::vector<EzrokhiTable>& viscaqa)
{
if (viscaqa.empty())
Expand Down
Loading