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

Fix some sign compare warnings.

Browse Source
This commit is contained in:
Håkon Hægland 2021-06-17 10:44:32 +02:00
parent fbb24e2a5a
commit 860cfd9fb5
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/simulators/wells/BlackoilWellModel_impl.hpp
View File

@ -892,7 +892,7 @@ namespace Opm {
GasLiftGroupInfo &group_info, GLiftWellStateMap &state_map) GasLiftGroupInfo &group_info, GLiftWellStateMap &state_map)
{ {
auto comm = ebosSimulator_.vanguard().grid().comm(); auto comm = ebosSimulator_.vanguard().grid().comm();
std::size_t num_procs = comm.size(); int num_procs = comm.size();
// NOTE: Gas lift optimization stage 1 seems to be difficult // NOTE: Gas lift optimization stage 1 seems to be difficult
// to do in parallel since the wells are optimized on different // to do in parallel since the wells are optimized on different
// processes and each process needs to know the current ALQ allocated // processes and each process needs to know the current ALQ allocated
@ -918,10 +918,10 @@ namespace Opm {
// processes could take ownership of all the wells. Then there // processes could take ownership of all the wells. Then there
// would be no need for synchronization here.. // would be no need for synchronization here..
// //
for (std::size_t i = 0; i< num_procs; i++) { for (int i = 0; i< num_procs; i++) {
int num_rates_to_sync = 0; // communication variable int num_rates_to_sync = 0; // communication variable
GLiftSyncGroups groups_to_sync; GLiftSyncGroups groups_to_sync;
if (comm.rank() == i) { if (comm.rank() == i) {
// Run stage1: Optimize single wells while also checking group limits // Run stage1: Optimize single wells while also checking group limits
for (const auto& well : well_container_) { for (const auto& well : well_container_) {
// NOTE: Only the wells in "group_info" needs to be optimized // NOTE: Only the wells in "group_info" needs to be optimized

5
opm/simulators/wells/GasLiftGroupInfo.hpp
View File

@ -75,6 +75,9 @@ public:
std::vector<std::pair<std::string,double>>& getWellGroups( std::vector<std::pair<std::string,double>>& getWellGroups(
const std::string& well_name); const std::string& well_name);
// TODO: See comment below for initializeGroupRatesRecursive_() for why
// the implementation of initialize() is kept here in the header file instead
// of in the .cpp file...
template<class Comm> template<class Comm>
void void
initialize(const Comm& comm) initialize(const Comm& comm)
@ -118,7 +121,7 @@ private:
// class since we are also constructing a GasLiftGroupInfo object in the // class since we are also constructing a GasLiftGroupInfo object in the
// test file test1_glift.cpp and when the linker tries to find a definition // test file test1_glift.cpp and when the linker tries to find a definition
// of the GasLiftGroupInfo(...) constructor in libopmsimulators.a, // of the GasLiftGroupInfo(...) constructor in libopmsimulators.a,
// the the template type of the MPI communicator (Dune::Communication<..>) // the template type of the MPI communicator (Dune::Communication<..>)
// is not of the same type as the one needed by the test case. // is not of the same type as the one needed by the test case.
// The test case needs Dune::Communication<ompi_communicator_t*>, whereas // The test case needs Dune::Communication<ompi_communicator_t*>, whereas
// the one in libopmsimulators.a is Dune::Communication<Dune::No_Comm>. // the one in libopmsimulators.a is Dune::Communication<Dune::No_Comm>.

1
opm/simulators/wells/WellInterface.hpp
View File

@ -41,7 +41,6 @@
namespace Opm { namespace Opm {
template<typename TypeTag> class GasLiftSingleWell; template<typename TypeTag> class GasLiftSingleWell;
template<typename TypeTag> class BlackoilWellModel; template<typename TypeTag> class BlackoilWellModel;
class GasLiftGroupInfo;
} }
#include <opm/simulators/wells/GasLiftGroupInfo.hpp> #include <opm/simulators/wells/GasLiftGroupInfo.hpp>
#include <opm/simulators/wells/GasLiftSingleWell.hpp> #include <opm/simulators/wells/GasLiftSingleWell.hpp>