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

fixing of some comments

Browse Source 
no functional change.
This commit is contained in:
Kai Bao 2017-08-18 16:25:05 +02:00
parent a04d1a9393
commit f9b7094075
6 changed files with 10 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists_files.cmake
View File

@ -240,7 +240,9 @@ list (APPEND PUBLIC_HEADER_FILES
opm/autodiff/StandardWells.hpp
opm/autodiff/StandardWells_impl.hpp
opm/autodiff/WellInterface.hpp
opm/autodiff/WellInterface_impl.hpp
opm/autodiff/StandardWell.hpp
opm/autodiff/StandardWell_impl.hpp
opm/autodiff/StandardWellsDense.hpp
opm/autodiff/StandardWellsSolvent.hpp
opm/autodiff/StandardWellsSolvent_impl.hpp

8
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -154,7 +154,7 @@ namespace Opm {
/// \param[in] terminal_output request output to cout/cerr
BlackoilModelEbos(Simulator& ebosSimulator,
const ModelParameters& param,
const StandardWellsDense<TypeTag>& well_model,
StandardWellsDense<TypeTag>& well_model,
RateConverterType& rate_converter,
const NewtonIterationBlackoilInterface& linsolver,
const bool terminal_output
@ -800,9 +800,9 @@ namespace Opm {
R_sum[ compIdx ] = sumBuffer[ buffIdx ];
}
for( int compIdx = 0, buffIdx = 0; compIdx < numComp; ++compIdx, ++buffIdx )
for( int compIdx = 0; compIdx < numComp; ++compIdx )
{
maxCoeff[ compIdx ] = maxBuffer[ buffIdx ];
maxCoeff[ compIdx ] = maxBuffer[ compIdx ];
}
// restore global pore volume
@ -1501,7 +1501,7 @@ namespace Opm {
SimulatorReport failureReport_;
// Well Model
StandardWellsDense<TypeTag> well_model_;
StandardWellsDense<TypeTag>& well_model_;
/// \brief Whether we print something to std::cout
bool terminal_output_;

3
opm/autodiff/StandardWell.hpp
View File

@ -240,9 +240,6 @@ namespace Opm
EvalWell extendEval(const Eval& in) const;
// TODO: maybe this type of function can go to some helper file.
void localInvert(DiagMatWell& istlA) const;
// xw = inv(D)*(rw - C*x)
void recoverSolutionWell(const BVector& x, BVectorWell& xw) const;

19
opm/autodiff/StandardWell_impl.hpp
View File

@ -636,7 +636,7 @@ namespace Opm
}
// do the local inversion of D.
localInvert( invDuneD_ );
invDuneD_[0][0].invert();
}
@ -1034,23 +1034,6 @@ namespace Opm
template<typename TypeTag>
void
StandardWell<TypeTag>::
localInvert(DiagMatWell& istlA) const
{
for (auto row = istlA.begin(), rowend = istlA.end(); row != rowend; ++row ) {
for (auto col = row->begin(), colend = row->end(); col != colend; ++col ) {
//std::cout << (*col) << std::endl;
(*col).invert();
}
}
}
template<typename TypeTag>
void
StandardWell<TypeTag>::

7
opm/autodiff/StandardWellsDense.hpp
View File

@ -57,8 +57,6 @@
#include <opm/simulators/WellSwitchingLogger.hpp>
#include <math.h>
namespace Opm {
@ -130,8 +128,6 @@ namespace Opm {
int numWells() const;
const Wells* wellsPointer() const;
/// return true if wells are available in the reservoir
bool wellsActive() const;
@ -169,8 +165,7 @@ namespace Opm {
// eventually, the wells_ above should be gone.
// the name is just temporary
// later, might make share_ptr const later.
// TODO: forget why make it share_ptr instead of unique_ptr
std::vector<std::shared_ptr<WellInterface<TypeTag> > > well_container_;
std::vector<std::unique_ptr<WellInterface<TypeTag> > > well_container_;
// TODO: forgot why returning a vector here
void createWellContainer(const Wells* wells_arg);

17
opm/autodiff/StandardWellsDense_impl.hpp
View File

@ -147,8 +147,7 @@ namespace Opm {
}
// Basically, we are handling all the wells as StandardWell for the moment
// TODO: to be changed when we begin introducing MultisegmentWell
well_container_.push_back(std::make_shared<StandardWell<TypeTag> >(well_ecl, current_timeIdx_, wells_arg) );
well_container_.emplace_back(new StandardWell<TypeTag>(well_ecl, current_timeIdx_, wells_arg) );
}
}
}
@ -336,18 +335,6 @@ namespace Opm {
template<typename TypeTag>
const Wells*
StandardWellsDense<TypeTag>::
wellsPointer() const
{
return wells_;
}
template<typename TypeTag>
bool
StandardWellsDense<TypeTag>::
@ -658,7 +645,7 @@ namespace Opm {
// update/setup guide rates for each well based on the well_potentials
// TODO: this is one of two places that still need Wells struct. In this function, only the well names
// well types are used, probably the order of the wells to locate the correct values in well_potentials.
well_collection_->setGuideRatesWithPotentials(wellsPointer(), phase_usage_, well_potentials);
well_collection_->setGuideRatesWithPotentials(wells_, phase_usage_, well_potentials);
}
applyVREPGroupControl(well_state);