Tor Harald Sandve
03d6dde203
Convergence improvment in the TL model
...
-- division on zero is avoided
-- if no solvent is present, pure values are used for the density and
visocity
2016-05-19 10:49:22 +02:00
Tor Harald Sandve
8be3ca7557
Support for liveoil in combination with solvent
...
- a solvent specific updateState is used to assure that the correct oil
saturation is used to detect phase transision
- presence of gas is compensated for in the oil phase
2016-05-19 10:49:22 +02:00
Joakim Hove
3729f91b6d
Some checks for file open and file has keyword.
...
Using type 'const char*' instead of auto to guarantee C
interoperability.
2016-05-19 10:02:28 +02:00
Liu Ming
b134455a4d
use OpmLog to control terminal output limits.
2016-05-19 10:51:52 +08:00
Atgeirr Flø Rasmussen
1f4b9e56f8
Merge pull request #690 from pgdr/try-to-disable-async-output
...
WIP trying disabling async output default setting
2016-05-18 22:42:33 +02:00
Pål Grønås Drange
d995582f46
trying disabling async output default setting
2016-05-18 16:11:57 +02:00
Atgeirr Flø Rasmussen
9c771ab6b1
Merge pull request #687 from totto82/hydrocarbonstate
...
Use stored hydrocarbonstate to get primal variables
2016-05-18 14:16:58 +02:00
Arne Morten Kvarving
fbb573947b
fixed: specifying pr's in jenkins trigger was broken
...
invalid loop over array.
2016-05-18 10:29:08 +02:00
Tor Harald Sandve
cd91444bc9
Compute the hydroCarbonState after initializing from restart files
2016-05-13 14:09:51 +02:00
Tor Harald Sandve
5757ef8ad0
Adjust to upstream changes
...
Change from std::vector<int> to std::vector<HydroCarbonState> for the
hydroCarbonState
2016-05-13 12:40:50 +02:00
Tor Harald Sandve
01c782dbf3
Remove primalvariable_ and use hydroCarbonState instead
...
the hydrocarbonstate is stored in the reservoir state and
used instead of the primalvariable_
The initial hydrocarbonstate is computed using
initHydroCarbonState(...);
2016-05-13 09:04:48 +02:00
Atgeirr Flø Rasmussen
ca40a31e7b
Merge pull request #681 from dr-robertk/PR/use_have_pthread
...
Use HAVE_PTHREAD to enable async output.
2016-05-12 12:20:09 +02:00
Tor Harald Sandve
e8fcf9259c
Use stored hydrocarbonstate to get primal variables
...
If hydrocarbonstate is not provided by the state fall back to
the old behaviour of computing the hydrocarbonstate from the saturations
2016-05-12 10:38:49 +02:00
Atgeirr Flø Rasmussen
3074a043b4
Merge pull request #686 from totto82/sparsity_pattern
...
Add the option of computing the full sparity pattern based on all phases
2016-05-11 17:38:54 +02:00
Tor Harald Sandve
09ab530674
Add the option of computing the full sparity pattern based on all phases
...
- For some cases (for instance involving solvent flow) the reasoning for
only adding the pressure derivatives seems to fail. As getting the
sparsity pattern is non-trivial, in terms of work, the full sparsity
pattern is only added when specified by the parameter
"require_full_sparsity_pattern"
- For solvent runs "require_full_sparsity_pattern" defaults to true for
all other runs the default is to only extract the sparsity pattern from
the pressure derivatives.
2016-05-11 15:13:52 +02:00
Atgeirr Flø Rasmussen
d3192028b6
Merge pull request #683 from atgeirr/check-dir-exists
...
Check if dir already exists before creating.
2016-05-10 10:10:57 +02:00
Atgeirr Flø Rasmussen
5fabce7c2c
Check if dir already exists before creating.
...
May be necessary on some platforms for the current dir (".").
2016-05-10 09:22:31 +02:00
Liu Ming
f5a57b8a26
Let OpmLog control output.
2016-05-10 13:51:10 +08:00
Robert Kloefkorn
42a76e3da6
SimulatorFullyImplicitBlackoilOutput: use HAVE_PTHREAD to enable async_output by
...
default.
2016-05-09 16:58:07 +02:00
Atgeirr Flø Rasmussen
1671d493ea
Merge pull request #670 from GitPaean/well_refactoring_multi_segment
...
Well refactoring multi segment
2016-05-09 14:49:38 +02:00
Kai Bao
f5fcbb03b5
adding test_multisegmentwells
2016-05-09 10:33:53 +02:00
Kai Bao
28e65283d9
initializing top_well_segments_ when constructing MultisegmentWells
...
not wait until BlackoilMultiSegmentModel.
2016-05-09 10:33:53 +02:00
Kai Bao
9bdf1d5b93
removing unhelpful public functions in MultisegmentWells
2016-05-09 10:33:53 +02:00
Kai Bao
edf29c322c
adding several wells related _impl.hpp files to CMakeLists_files
...
StandardWells_impl.hpp
MultisegmentWells_impl.hpp
StandardWellsSolvent_impl.hpp
2016-05-09 10:33:53 +02:00
Kai Bao
f8a6ae4f8c
adding num_phases_ to MultisegmentWells
...
and removing all the np in the argument of the public methods.
2016-05-09 10:33:53 +02:00
Kai Bao
40baf3b720
moving updateWellControls to MultisegmentWells
2016-05-09 10:33:53 +02:00
Kai Bao
868efa97a0
moving addWellControlEq to MultisegmentWells
2016-05-09 10:33:53 +02:00
Kai Bao
5ba53a7a39
moving addWellFluxEq to MultisegmentWells
2016-05-09 10:33:53 +02:00
Kai Bao
89117c0294
moving computeSegmentPressuresDelta to MultisegmentWells
2016-05-09 10:33:53 +02:00
Kai Bao
580ac7df6b
moving computeSegmentFluidProperties to MultisegmentWells
2016-05-09 10:33:53 +02:00
Kai Bao
944ebec4c0
moving computeWellFlux to MultisegmentWells
2016-05-09 10:33:53 +02:00
Kai Bao
484c48e0fe
moving onlyWellDerivs() to MultisegmentWells
...
it is only used for MultisegmentWells
2016-05-09 10:33:53 +02:00
Kai Bao
ec3b50d092
adding updateWellState to MultisegmentWells
2016-05-09 10:33:53 +02:00
Kai Bao
15ff16efd2
removing multi-segment member variables from BlackoilMultiSegmentModel
2016-05-09 10:33:53 +02:00
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
Liu Ming
431a21d632
write simulation details to log file.
2016-05-09 13:33:44 +08:00
Atgeirr Flø Rasmussen
49d7cadaa5
Merge pull request #678 from GitPaean/remove-warnings
...
silencing a few shadowing warnings.
2016-05-07 09:51:45 +02:00
Kai Bao
8236a32aee
sliencing a few shadowing warnings.
2016-05-06 17:59:00 +02:00
Atgeirr Flø Rasmussen
60b00a0ddf
Merge pull request #673 from akva2/simplify_jenkins_build_scripts
...
simplify jenkins build scripts a little
2016-05-04 10:17:26 +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
e02927dbf5
Merge pull request #676 from pgdr/nnc-simple-fixup
...
The getNNC API in Parser changed; remove *
2016-05-04 08:57:04 +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
Atgeirr Flø Rasmussen
e4f3622ee1
Merge pull request #675 from atgeirr/bump-version
...
dune.module: change version to 2016.10-pre
2016-05-03 14:36:54 +02:00
Atgeirr Flø Rasmussen
ac6a8f7229
dune.module: change version to 2016.10-pre
2016-05-03 14:31:32 +02:00
Atgeirr Flø Rasmussen
7b85cb306a
Merge pull request #674 from akva2/add_flow_mpi_installation
...
Add flow mpi installation
2016-05-02 10:59:47 +02:00