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

Merge remote-tracking branch 'opm/master' into fim

Browse Source 
Conflicts:
	cmake/Modules/Findopm-autodiff.cmake
This commit is contained in:
Liu Ming
2014-09-23 16:04:15 +08:00
parent 06bed8d945 42e6020b9e
commit 9a41199bd4
15 changed files with 200 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
opm/polymer/PolymerBlackoilState.hpp
View File

@@ -35,9 +35,14 @@ namespace Opm
public:
void init(const UnstructuredGrid& g, int num_phases)
{
state_blackoil_.init(g, num_phases);
concentration_.resize(g.number_of_cells, 0.0);
cmax_.resize(g.number_of_cells, 0.0);
this->init(g.number_of_cells, g.number_of_faces, num_phases);
}
void init(int number_of_cells, int number_of_faces, int num_phases)
{
state_blackoil_.init(number_of_cells, number_of_faces, num_phases);
concentration_.resize(number_of_cells, 0.0);
cmax_.resize(number_of_cells, 0.0);
}
int numPhases() const
{