OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

some minor cleaning up

Browse Source
This commit is contained in:
Kai Bao
2019-04-12 10:43:30 +02:00
parent af9a500b98
commit 1d7089fca8
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/autodiff/BlackoilWellModel_impl.hpp
+3 -5
View File
@@ -687,8 +687,6 @@ namespace Opm {
// Set the well primary variables based on the value of well solutions // Set the well primary variables based on the value of well solutions
initPrimaryVariablesEvaluation(); initPrimaryVariablesEvaluation();
std::vector< Scalar > B_avg(numComponents(), Scalar() ); std::vector< Scalar > B_avg(numComponents(), Scalar() );
computeAverageFormationFactor(B_avg); computeAverageFormationFactor(B_avg);
@@ -708,8 +706,9 @@ namespace Opm {
// basically, this is a more updated state from the solveWellEq based on fixed // basically, this is a more updated state from the solveWellEq based on fixed
// reservoir state, will tihs be a better place to inialize the explict information? // reservoir state, will tihs be a better place to inialize the explict information?
} }
assembleWellEq(B_avg, dt, local_deferredLogger);
assembleWellEq(B_avg, dt, local_deferredLogger);
} catch (std::exception& e) { } catch (std::exception& e) {
exception_thrown = 1; exception_thrown = 1;
} }
@@ -889,7 +888,6 @@ namespace Opm {
bool converged; bool converged;
int exception_thrown = 0; int exception_thrown = 0;
do { do {
try { try {
assembleWellEq(B_avg, dt, deferred_logger); assembleWellEq(B_avg, dt, deferred_logger);
} catch (std::exception& e) { } catch (std::exception& e) {
opm/autodiff/MultisegmentWell.hpp
+1 -1
View File
@@ -272,7 +272,7 @@ namespace Opm
// updating the well_state based on well solution dwells // updating the well_state based on well solution dwells
void updateWellState(const BVectorWell& dwells, void updateWellState(const BVectorWell& dwells,
WellState& well_state, WellState& well_state,
Opm::DeferredLogger& deferred_logger, Opm::DeferredLogger& deferred_logger,
const double relaxation_factor=1.0) const; const double relaxation_factor=1.0) const;
opm/autodiff/MultisegmentWell_impl.hpp
+4 -6
View File
@@ -54,9 +54,9 @@ namespace Opm
OPM_THROW(std::runtime_error, "polymer is not supported by multisegment well yet"); OPM_THROW(std::runtime_error, "polymer is not supported by multisegment well yet");
} }
if (Base::has_energy) { if (Base::has_energy) {
OPM_THROW(std::runtime_error, "energy is not supported by multisegment well yet"); OPM_THROW(std::runtime_error, "energy is not supported by multisegment well yet");
} }
// since we decide to use the WellSegments from the well parser. we can reuse a lot from it. // since we decide to use the WellSegments from the well parser. we can reuse a lot from it.
// for other facilities needed but not available from parser, we need to process them here // for other facilities needed but not available from parser, we need to process them here
@@ -556,7 +556,6 @@ namespace Opm
{ {
BVectorWell xw(1); BVectorWell xw(1);
recoverSolutionWell(x, xw); recoverSolutionWell(x, xw);
updateWellState(xw, well_state, deferred_logger); updateWellState(xw, well_state, deferred_logger);
} }
@@ -769,7 +768,7 @@ namespace Opm
MultisegmentWell<TypeTag>:: MultisegmentWell<TypeTag>::
updateWellState(const BVectorWell& dwells, updateWellState(const BVectorWell& dwells,
WellState& well_state, WellState& well_state,
Opm::DeferredLogger& deferred_logger, Opm::DeferredLogger& deferred_logger,
const double relaxation_factor) const const double relaxation_factor) const
{ {
const double dFLimit = param_.dwell_fraction_max_; const double dFLimit = param_.dwell_fraction_max_;
@@ -1333,8 +1332,7 @@ namespace Opm
const bool upwinding, const bool upwinding,
int& seg_upwind) const int& seg_upwind) const
{ {
// not considering the injectors for now // not considering upwinding for the injectors for now
if ((!upwinding) || (well_type_ == INJECTOR) || (primary_variables_evaluation_[seg][GTotal] <= 0.) ) { if ((!upwinding) || (well_type_ == INJECTOR) || (primary_variables_evaluation_[seg][GTotal] <= 0.) ) {
seg_upwind = seg; // using the composition from the seg seg_upwind = seg; // using the composition from the seg