Skip to content
Snippets Groups Projects
Commit 441a8fbf authored by Norbert Grunwald's avatar Norbert Grunwald Committed by Dmitri Naumov
Browse files

[TH2M/PTM] rename phase transition compute variables function

parent 2cf1bfdc
No related branches found
No related tags found
No related merge requests found
Showing
with 33 additions and 26 deletions
......@@ -20,14 +20,14 @@ PhaseTransitionDissolution::PhaseTransitionDissolution(
DBUG("Create PhaseTransitionDissolution constitutive model.");
}
void PhaseTransitionDissolution::getConstitutiveVariables(
void PhaseTransitionDissolution::computeConstitutiveVariables(
const MaterialPropertyLib::Medium* /*medium*/,
MaterialPropertyLib::VariableArray /*variables*/,
ParameterLib::SpatialPosition /*pos*/, double const /*t*/,
const double /*dt*/)
{
OGS_FATAL(
"PhaseTransitionDissolution::getConstitutiveVariables is not "
"PhaseTransitionDissolution::computeConstitutiveVariables is not "
"implemented.");
}
......
......@@ -27,10 +27,11 @@ struct PhaseTransitionDissolution : PhaseTransitionModels
std::map<int, std::shared_ptr<MaterialPropertyLib::Medium>> const&
media);
void getConstitutiveVariables(const MaterialPropertyLib::Medium* medium,
MaterialPropertyLib::VariableArray variables,
ParameterLib::SpatialPosition pos,
double const t, double const dt) override;
void computeConstitutiveVariables(
const MaterialPropertyLib::Medium* medium,
MaterialPropertyLib::VariableArray variables,
ParameterLib::SpatialPosition pos, double const t,
double const dt) override;
};
} // namespace TH2M
......
......@@ -108,7 +108,7 @@ PhaseTransitionEvaporation::PhaseTransitionEvaporation(
checkRequiredProperties(liquid_phase, required_liquid_properties);
}
void PhaseTransitionEvaporation::getConstitutiveVariables(
void PhaseTransitionEvaporation::computeConstitutiveVariables(
const MaterialPropertyLib::Medium* medium,
MaterialPropertyLib::VariableArray variables,
ParameterLib::SpatialPosition pos, double const t, const double dt)
......
......@@ -24,10 +24,11 @@ struct PhaseTransitionEvaporation : PhaseTransitionModels
std::map<int, std::shared_ptr<MaterialPropertyLib::Medium>> const&
media);
void getConstitutiveVariables(const MaterialPropertyLib::Medium* medium,
MaterialPropertyLib::VariableArray variables,
ParameterLib::SpatialPosition pos,
double const t, double const dt) override;
void computeConstitutiveVariables(
const MaterialPropertyLib::Medium* medium,
MaterialPropertyLib::VariableArray variables,
ParameterLib::SpatialPosition pos, double const t,
double const dt) override;
private:
int const n_components_gas_;
......
......@@ -22,14 +22,15 @@ PhaseTransitionFull::PhaseTransitionFull(
DBUG("Create PhaseTransitionFull constitutive model.");
}
void PhaseTransitionFull::getConstitutiveVariables(
void PhaseTransitionFull::computeConstitutiveVariables(
const MaterialPropertyLib::Medium* /*medium*/,
MaterialPropertyLib::VariableArray /*variables*/,
ParameterLib::SpatialPosition /*pos*/, double const /*t*/,
const double /*dt*/)
{
OGS_FATAL(
"PhaseTransitionFull::getConstitutiveVariables is not implemented.");
"PhaseTransitionFull::computeConstitutiveVariables is not "
"implemented.");
}
} // namespace TH2M
......
......@@ -28,10 +28,11 @@ struct PhaseTransitionFull : PhaseTransitionModels
std::map<int, std::shared_ptr<MaterialPropertyLib::Medium>> const&
media);
void getConstitutiveVariables(const MaterialPropertyLib::Medium* medium,
MaterialPropertyLib::VariableArray variables,
ParameterLib::SpatialPosition pos,
double const t, double const dt) override;
void computeConstitutiveVariables(
const MaterialPropertyLib::Medium* medium,
MaterialPropertyLib::VariableArray variables,
ParameterLib::SpatialPosition pos, double const t,
double const dt) override;
};
} // namespace TH2M
......
......@@ -45,7 +45,7 @@ struct PhaseTransitionModels
virtual ~PhaseTransitionModels() = default;
virtual void getConstitutiveVariables(
virtual void computeConstitutiveVariables(
const MaterialPropertyLib::Medium* medium,
MaterialPropertyLib::VariableArray variables,
ParameterLib::SpatialPosition pos, double const t, double const dt) = 0;
......
......@@ -37,7 +37,7 @@ PhaseTransitionNone::PhaseTransitionNone(
}
}
void PhaseTransitionNone::getConstitutiveVariables(
void PhaseTransitionNone::computeConstitutiveVariables(
const MaterialPropertyLib::Medium* medium,
MaterialPropertyLib::VariableArray variables,
ParameterLib::SpatialPosition pos, double const t, double const dt)
......
......@@ -24,10 +24,11 @@ struct PhaseTransitionNone : PhaseTransitionModels
std::map<int, std::shared_ptr<MaterialPropertyLib::Medium>> const&
media);
void getConstitutiveVariables(const MaterialPropertyLib::Medium* medium,
MaterialPropertyLib::VariableArray variables,
ParameterLib::SpatialPosition pos,
double const t, double const dt) override;
void computeConstitutiveVariables(
const MaterialPropertyLib::Medium* medium,
MaterialPropertyLib::VariableArray variables,
ParameterLib::SpatialPosition pos, double const t,
double const dt) override;
};
} // namespace TH2M
......
......@@ -236,7 +236,7 @@ void TH2MLocalAssembler<ShapeFunctionDisplacement, ShapeFunctionPressure,
// constitutive model object as specified in process creation
auto& c = *_process_data.phase_transition_model_;
c.getConstitutiveVariables(&medium, vars, pos, t, dt);
c.computeConstitutiveVariables(&medium, vars, pos, t, dt);
auto const phi_L = ip_data.s_L * ip_data.phi;
auto const phi_G = (1. - ip_data.s_L) * ip_data.phi;
......
......@@ -126,7 +126,8 @@ TEST(ProcessLib, TH2MPhaseTransitionEvaporation)
variable_array[static_cast<int>(
MaterialPropertyLib::Variable::temperature)] = T;
ptm->getConstitutiveVariables(medium.get(), variable_array, pos, time, dt);
ptm->computeConstitutiveVariables(medium.get(), variable_array, pos, time,
dt);
// reference values
double const rhoCGR = 1.185858524394711;
......
......@@ -98,7 +98,8 @@ TEST(ProcessLib, TH2MPhaseTransitionNone)
variable_array[static_cast<int>(
MaterialPropertyLib::Variable::temperature)] = T;
ptm->getConstitutiveVariables(medium.get(), variable_array, pos, time, dt);
ptm->computeConstitutiveVariables(medium.get(), variable_array, pos, time,
dt);
// reference values
double const rhoCGR = density_air;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment