Commit Graph

3536 Commits

Author SHA1 Message Date
Kai Bao
b87920e5e4 moving computeWellPotentials to StandardWells 2016-04-29 10:07:10 +02:00
Kai Bao
13acc8ee03 moving computeWellConnectionPressures to StandardWells
the results look okay, while the running for flow_solvent needs further
investigation even the results with flow_solvent actually look okay.

With two different version of
computePropertiesForWellConnectionPressures, flow_solvent produces the
same results. This is something needs further investigation.

The current implementation requires a copy of
computeWellConnectionPressure in StandardWells and StandardWellsSolvent.
That means probably we need to introduce the asImpl() for the Wells.
2016-04-29 10:07:10 +02:00
Kai Bao
dcca0b0b76 moving addWellControlEq to StandardWells 2016-04-29 10:07:10 +02:00
Kai Bao
eb278c3c9a moving addWellFluxEq() to StandardWells
Conflicts:
	opm/autodiff/BlackoilModelBase_impl.hpp
2016-04-29 10:07:10 +02:00
Joakim Hove
ef05a64a88 Merge pull request #664 from joakim-hove/remove-python
Removed stale test code
2016-04-29 08:01:42 +02:00
Joakim Hove
240e08733e Merge pull request #663 from joakim-hove/restart-refactor
Change method name -> IOConfig::restart()
2016-04-28 22:20:31 +02:00
Joakim Hove
ead88e9ee4 Change method name -> IOConfig::restartRequested() 2016-04-28 15:58:17 +02:00
Atgeirr Flø Rasmussen
ec04d7f33b Merge pull request #661 from babrodtk/two_phase_bugfixes
Two phase bugfixes
2016-04-28 15:42:55 +02:00
Joakim Hove
db3bbbe65e Removed stale test code 2016-04-26 17:51:11 +02:00
babrodtk
1846c4146d Merge branch 'atgeirr_twophase' into two_phase_bugfixes 2016-04-26 08:25:20 +02:00
Atgeirr Flø Rasmussen
0d85f3642c Access water/gas quantities only if active phase. 2016-04-26 08:24:54 +02:00
babrodtk
613052525b Code cleanup 2016-04-26 07:49:12 +02:00
babrodtk
a1504a2bff Runs first iterations of two-phase case plausibly 2016-04-26 07:49:12 +02:00
babrodtk
2ac514a1ea Checkpoint 2016-04-26 07:49:12 +02:00
Arne Morten Kvarving
70e13d1988 fixed: debian packaging
superlu package name changed in xenial
2016-04-22 17:00:29 +02:00
Atgeirr Flø Rasmussen
b436818439 Merge pull request #660 from GitPaean/fixing_polymer_running_without_polymer
fixing flow_polymer running cases without polymer.
2016-04-21 13:33:52 +02:00
Kai Bao
9afadffea9 fixing flow_polymer running cases without polymer. 2016-04-21 12:59:11 +02:00
Atgeirr Flø Rasmussen
cc8facc378 Merge pull request #659 from GitPaean/fixing_flow_solvent_running_without_solvent
adding the has_solvent_ flag to StandardWellsSolvent
2016-04-21 12:28:54 +02:00
Atgeirr Flø Rasmussen
fd75fbe4c9 Merge pull request #658 from atgeirr/master
Silence some recently introduced warnings.
2016-04-21 11:47:50 +02:00
Kai Bao
cc79dff708 adding the has_solvent_ flag to StandardWellsSolvent
flow_solvent is able to run cases without solvent.
2016-04-21 11:17:39 +02:00
Atgeirr Flø Rasmussen
4af2b4a915 Silence some recently introduced warnings. 2016-04-21 10:29:09 +02:00
Joakim Hove
1f64f79f6d Merge pull request #657 from pgdr/eclipsegrid-is-input
Using getInputGrid API from Parser
2016-04-20 15:50:33 +02:00
Atgeirr Flø Rasmussen
77ddff0cf7 Merge pull request #656 from GitPaean/wells_refactoring_adding_wellModelTemplate
Wells refactoring_adding WellModel as template class
2016-04-20 15:42:59 +02:00
Atgeirr Flø Rasmussen
07fec302f4 Cherry-pick Atgeirr's Remove Deck parameter patch
Remove Deck parameter from GridInit constructor.

Possible because we now use the EclipseGrid-taking
overload of processEclipseFormat() for CpGrid.
2016-04-20 15:30:45 +02:00
Kai Bao
be55efa484 fixing the compilation and running resulting from PR648 2016-04-20 14:42:56 +02:00
Kai Bao
e67e31171d adding one line comment for WellModel in BlackoilModelBase 2016-04-20 14:26:13 +02:00
Kai Bao
350a38164e fixing the compilation and running of flow_multisegment 2016-04-20 14:26:13 +02:00
Kai Bao
a72f04a564 fixing the compilation and running of flow_polymer 2016-04-20 14:26:13 +02:00
Kai Bao
b82e917b0d improving the initSolvent in StandardWellsSolvent 2016-04-20 14:26:13 +02:00
Kai Bao
ebe60bc5d7 puting WellModel before Implementation in the template. 2016-04-20 14:26:13 +02:00
Kai Bao
5bce482086 fixing the compilation and running of flow_solvent 2016-04-20 14:26:13 +02:00
Kai Bao
b464e4fb4a adding WellModel as template class for BlackoilModelBase
the compilation and running of flow are recovered.

Conflicts:
	opm/autodiff/BlackoilModelBase_impl.hpp
2016-04-20 14:26:13 +02:00
Atgeirr Flø Rasmussen
586f2cc962 Merge pull request #648 from totto82/fix_well_potentials
Fix well potential calculations
2016-04-20 11:39:33 +02:00
Tor Harald Sandve
18434e54ad Query the compute_well_potential parameter only once
-- and fix some comments
2016-04-20 08:32:57 +02:00
Pål Grønås Drange
18f6672df0 Using getInputGrid API from Parser 2016-04-19 17:03:41 +02:00
Tor Harald Sandve
e9b097cbf4 Only compute well potential if needed
A boolen user parameter is added to controll the computation of well
potential.

This is a temporary fix to assure that no extra computation time is used
on well potential calculation if it is not needed. The long term fix
will require a more thorough revising of the well group implementation.
2016-04-19 16:24:28 +02:00
Tor Harald Sandve
84972ac21e Fix bhp/thp logic in well potential calculation
Pick the most restrictive bhp (not the one that gives the largest
potential flow)
2016-04-19 15:58:05 +02:00
Tor Harald Sandve
4867e14f88 Fixes after rebase
-- remove some leftovers from merge process
-- start using stdWells()
2016-04-19 09:41:25 +02:00
Tor Harald Sandve
b216302895 Adapt to usage of stdWells() 2016-04-19 09:21:16 +02:00
Tor Harald Sandve
cc48e8a17e Add support for THP in well potential calculations 2016-04-19 09:21:15 +02:00
Tor Harald Sandve
18246263e9 Move computation of well potentials from simulator class ot model class
- the computation of well potentials in the model class calculates the
well potentials using computeWellFlux()
- in this way the well potential calculations also handle well where
some perforations are closed by the simulator due to cross-flow.
- the well potentials pr perforation and phase is stored in the well
state.
2016-04-19 09:21:15 +02:00
Atgeirr Flø Rasmussen
d9787f7593 Merge pull request #655 from akva2/updates_for_16.04_packaging
Updates for 16.04 packaging
2016-04-18 11:49:36 +02:00
Arne Morten Kvarving
0fe722068a update redhat packaging
- deal with module renaming
- deal upstream with module renaming and additions
- use boost 1.48 only on rhel6. rhel7 supplies a newer boost by default.
2016-04-18 11:44:26 +02:00
Arne Morten Kvarving
0155535079 update debian packaging
- deal with module renaming
- deal with upstream module renaming and additions
- enable MPI and add related dependencies
2016-04-18 11:26:25 +02:00
Andreas Lauser
4baf0f6acf Merge pull request #654 from andlaus/nested_ad
Fix build
2016-04-18 11:01:39 +02:00
dr-robertk
93f48d6ad9 Merge pull request #647 from GitPaean/wells_refactoring_onlytemplate_function
Moving more well related functions to StandardWells
2016-04-16 12:37:42 +02:00
Andreas Lauser
0405953a64 adapt code w.r.t. the removal of the tags for Opm::Evaluation 2016-04-15 18:49:29 +02:00
Atgeirr Flø Rasmussen
fbe7a2242b Merge pull request #653 from dr-robertk/PR/cleanup-backuprestore
BackupRestore: remove all specializations for BlackoilState.
2016-04-15 13:15:35 +02:00
Robert Kloefkorn
da0e725eb8 BackupRestore: remove all specializations for BlackoilState. This is now covered by
SimulationDataContainer.
2016-04-15 12:21:47 +02:00
Kai Bao
adb140a788 fixing the running of flow_multisegment 2016-04-14 16:05:19 +02:00