Kai Bao
a07843a896
adding the member variables to MultisegmentWells
...
and ther public interfaces. Probably the mutable interfaces can be
removed after moving the functions to the Wells class.
2016-05-09 10:33:53 +02:00
Kai Bao
05e164b609
adding number of segment and performation to MultisegmentWells
2016-05-09 10:33:52 +02:00
Kai Bao
f319514581
using the MultisegmentWells class in BlackoilMultiSegmentModel
2016-05-09 10:33:52 +02:00
Kai Bao
aa6065a70c
introducing a new class MultisegmentWells
...
which will handle the multi-segment wells related.
2016-05-09 10:33:52 +02:00
Kai Bao
8236a32aee
sliencing a few shadowing warnings.
2016-05-06 17:59:00 +02:00
Atgeirr Flø Rasmussen
8e550bf98c
Merge pull request #668 from qilicun/get-messages-from-parser
...
extract messages from parser.
2016-05-04 10:16:57 +02:00
Pål Grønås Drange
96d073a13e
set default output directory to .
2016-05-03 17:38:29 +02:00
Pål Grønås Drange
c5d68f802a
one line shared_ptr to ref fix
2016-05-03 15:38:04 +02:00
Joakim Hove
58851e8c02
Merge pull request #666 from kjellkongsvik/clean_EclipseWriter
...
Remove parameters from EclipseWriter constructor
2016-05-03 15:37:30 +02:00
Arne Morten Kvarving
5bc252c4ab
fixed: build with g++ 5.3
...
this partially fixes the build on ubuntu xenial.
it also breaks due to an updated eigen, but with this
you can build with the old eigen instead of the distro
supplied eigen.
2016-04-29 19:02:56 +02:00
Atgeirr Flø Rasmussen
34bc69c257
Move helpers to the detail namespace, layout changes.
...
The helpers were moved to the bottom of the file for clarity.
Misc. layout and whitespace changes, also fix two minor
errors in comments.
2016-04-29 14:59:18 +02:00
Atgeirr Flø Rasmussen
8ea71e2f15
Use a small lambda to avoid repeating code.
2016-04-29 14:58:44 +02:00
Kjell W. Kongsvik
be1ffec94f
Remove phaseUsage parameter as it can be found internally
2016-04-29 13:12:43 +02:00
Kjell W. Kongsvik
e4688c32ce
Reverted back parameters so that output grid is not unsafely recreated
2016-04-29 13:06:36 +02:00
Kjell W. Kongsvik
c7bbd2489e
Use output_dir_ member instead of querying the parameters again.
2016-04-29 13:06:36 +02:00
Kjell W. Kongsvik
385c7e74d2
Remove parameters from EclipseWriter constructor
2016-04-29 13:06:36 +02:00
Kai Bao
08e691e262
moving variableWellStateInitials to StandardWells.
2016-04-29 10:07:10 +02:00
Kai Bao
15380fd370
moving variableWellStateIndices to StandardWells
...
Probably it is the time to introduce SeqQs and SeqP for the
multi-segment wells.
2016-04-29 10:07:10 +02:00
Kai Bao
e7d00f4f99
adding variableStateWellIndices to StandardWells
...
to handle different types of variables later for different types of
wells.
2016-04-29 10:07:10 +02:00
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
Liu Ming
c23fa6f359
correct spelling.
2016-04-29 14:16:48 +08:00
Liu Ming
f29f087435
extract messages from parser.
2016-04-29 14:13:21 +08: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
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
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
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
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
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
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