OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,967 Commits 9 Branches 35 Tags 15 MiB
a8261b62da
Commit Graph

5967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
cc72693348 Merge pull request #1090 from atgeirr/convergence-failure-problem-not-error 
Convergence failure is "problem" not "error"
 2016-10-21 12:49:10 +02:00
Robert Kloefkorn
044d47b9fb [bugfix] Make WellsManager compile with c++-11. 2016-10-21 10:43:32 +02:00
Andreas Lauser
c884b5c1d5 Merge pull request #1087 from andlaus/implement_JFUNC 
RelpermDiagnostics: fix the build
 2016-10-21 10:05:54 +02:00
Atgeirr Flø Rasmussen
069b65a635 Add option to enable logging (default true). 
This makes it possible to avoid logging from this class in a parallel setting.
 2016-10-20 22:39:08 +02:00
Atgeirr Flø Rasmussen
e38b9ffcb7 Classify convergence failure as a "problem" not "error". 2016-10-20 22:36:20 +02:00
Atgeirr Flø Rasmussen
8e8b624d4c Ensure logging only on first rank. 2016-10-20 22:36:20 +02:00
Andreas Lauser
7d9097490b RelpermDiagnostics: fix the build 
this broke because EclEpsScalingPointsInfo::extractScaled() now
requires the deck and the EclipseState as additional parameters.
 2016-10-20 20:01:03 +02:00
jokva
f4586f5380 Merge pull request #1089 from jokva/remove-shared-ptr 
The great shared_ptr purge
 2016-10-20 19:18:41 +02:00
Jørgen Kvalsvik
e98d6204ad Restore from data::Wells without vector dumps 
opm-output's data::Wells interface changed to no longer just accept a
dump of opm-core's WellState object. Update WellState to restore itself
from this new interface rather than reading the dumped vectors as-is.
 2016-10-20 16:36:47 +02:00
Jørgen Kvalsvik
1057e6d3d0 Update to shared_ptr-less parser interface. 2016-10-20 10:14:41 +02:00
Atgeirr Flø Rasmussen
518c9849ff Merge pull request #1092 from andlaus/fix_make_install 
fix `make install`
 2016-10-20 09:44:16 +02:00
Andreas Lauser
4ae5f16cb3 fix make install 
some CMakeLists_files.txt needed some adaptation after the recent unit
changes. this is analogous to OPM/opm-parser#943
 2016-10-19 15:22:41 +02:00
Atgeirr Flø Rasmussen
1fe0ee77c6 Merge pull request #1091 from atgeirr/fix-compile 
Undo premature API change adaption.
 2016-10-18 15:37:40 +02:00
Atgeirr Flø Rasmussen
33872cfb4a Undo premature API change adaption. 2016-10-18 15:34:53 +02:00
Atgeirr Flø Rasmussen
f72832dbd6 Merge pull request #1085 from andlaus/opm-parser_units 
consolidate the units code to opm-parser
 2016-10-18 15:25:20 +02:00
Joakim Hove
99d8ab73f4 Merge pull request #1081 from joakim-hove/celldata-container 
Header file moved in opm-output.
 2016-10-17 11:46:33 +02:00
Arne Morten Kvarving
35ffd9b647 Merge pull request #1086 from akva2/update_packaging_devtoolset 
update redhat6 packaging
 2016-10-12 15:53:47 +02:00
Arne Morten Kvarving
d25cefa011 update redhat6 packaging 
build using devtoolset-3
 2016-10-12 14:15:15 +02:00
Arne Morten Kvarving
7a295747de Merge pull request #1084 from akva2/update_packaging_dep_tree 
update packaging to reflect new dependency tree
 2016-10-12 14:14:48 +02:00
Andreas Lauser
07707ecc30 consolidate the unit system to opm-parser 
since the unit code within opm-parser is now a drop-in replacement,
this simplifies things and make them less error-prone.

unfortunately, this requires quite a few PRs. (most are pretty
trivial, though.)
 2016-10-10 17:50:26 +02:00
Arne Morten Kvarving
f91cb76086 update packaging to reflect new dependency tree 2016-10-10 09:39:24 +02:00
Joakim Hove
5fdb868526 Header file moved in opm-output. 2016-10-06 14:23:47 +02:00
Pål Grønås Drange
edb57704f9 Merge pull request #1082 from jokva/remove-shared-ptrs-from-schedule 
Schedule::getGroup returns reference, not pointer
 2016-10-06 13:01:19 +02:00
Jørgen Kvalsvik
29ba3465b4 Schedule::getGroup returns reference, not pointer 2016-10-05 15:24:14 +02:00
Atgeirr Flø Rasmussen
df24d28671 Merge pull request #1077 from blattms/quiet-opm-throw 
Log the message of exceptions in the catch clause of adaptive time stepper
 2016-10-04 12:34:26 +02:00
Markus Blatt
a44500623a Log the message of exceptions in the catch clause of adaptive time stepper. 2016-10-04 10:33:56 +02:00
Atgeirr Flø Rasmussen
22f7d1ec32 Merge pull request #1078 from andlaus/fix_initial_rs_and_rv 
set the Rv and Rs factors to the saturated values for cells which have no gas and no oil
 2016-09-30 14:40:06 +02:00
Atgeirr Flø Rasmussen
dda280fcf9 Merge pull request #1080 from akva2/units_constexpr 
changed: generate unit type conversion constants on compile-time
 2016-09-30 13:42:37 +02:00
Atgeirr Flø Rasmussen
227b5851b8 Merge pull request #1076 from totto82/start_using_TUNING2 
Add contructor for adaptiveTimeStepper that uses values from TUNING
 2016-09-30 13:02:50 +02:00
Arne Morten Kvarving
04fe79aa23 changed: generate unit type conversion constants on compile-time 
as a bonus it avoids unused variable warnings in compile
units only using parts of the conversion units.
 2016-09-30 11:35:28 +02:00
Tor Harald Sandve
f202f2948c Add initalizer for adaptiveTimeStepper that uses values from TUNING 
Some of the tuning values from the TUNING keywords is used to tune the
timestepping.
 2016-09-30 10:36:30 +02:00
Atgeirr Flø Rasmussen
a6995fdf3e Merge pull request #1073 from blattms/only-write-substeps-in-adaptive-time-stepper 
Only call writeTimeStep for real sub steps.
 2016-09-29 17:48:12 +02:00
Atgeirr Flø Rasmussen
fe19c589c4 Merge pull request #1071 from totto82/moveBlackoilstate 
Remove Compat.hpp
 2016-09-29 17:32:57 +02:00
Atgeirr Flø Rasmussen
98402c2e8d Merge pull request #1079 from akva2/update_petsc 
update petsc code
 2016-09-29 16:49:03 +02:00
Arne Morten Kvarving
e8c3389b80 update petsc code 
- api changes in newer versions
- do not manually destroy the preconditioner. this is, and has always
  been, owned by the ksp object and dies with its destruction.
 2016-09-29 14:19:48 +02:00
Andreas Lauser
3647834b96 set the Rv and Rs factors to the saturated values for cells which have no gas and no oil 
the purpose of this is to get a more defined behaviour when doing the
gravity correction/upstream cell determination in the flux term.

I consider this to be just a kludge, so if anyone has a better idea of
what the composition for the non-existing gas and oil phases is,
please tell me. (note that generic compositional models do not exhibit
this issue because the composition of all fluids is always fully
defined because each component is assumed to dissolve in every phase.)
 2016-09-28 16:38:40 +02:00
Tor Harald Sandve
60da3d9213 Remove Compat.hpp 
Compat.hpp is moved to opm-simulators
 2016-09-27 08:39:26 +02:00
Markus Blatt
ac37eef547 Only call writeTimeStep for real sub steps. 
Previously, we also called it when the full time step was done.
As the simulator writes that information anyway and we cannot call
it a sub step, we omit the final write in the adaptive time stepper.
 2016-09-26 11:51:17 +02:00
Atgeirr Flø Rasmussen
08b90e8acd Merge pull request #1064 from totto82/hardcodedTimestepping 
Timestepper based on user input
 2016-09-26 08:53:36 +02:00
Joakim Hove
7f1026551a Merge pull request #1072 from atgeirr/fix-warnings 
Fix a few warnings
 2016-09-25 21:06:33 +02:00
Atgeirr Flø Rasmussen
74e9925769 Avoid shadowing warning by using explicit scope. 2016-09-23 15:15:17 +02:00
Atgeirr Flø Rasmussen
cd75174650 Forward declare structs as same to avoid warning. 2016-09-23 15:14:36 +02:00
Atgeirr Flø Rasmussen
040e3f9872 Merge pull request #1067 from blattms/zero-initialize-wells-with-no-perforations 
Zero initialize wells with no perforations.
 2016-09-22 10:08:55 +02:00
Tor Harald Sandve
ff81d48551 Guard against non-existing file 2016-09-21 13:46:31 +02:00
Markus Blatt
f426a03801 Zero initialize wells with no perforations. 
For these wells access its well_cells might read of the bounds
an array if they are the last wells in the struct. Therefore
we cannnot initialiue first_cell and the well control is uninitialized,
to.

With this commit theses wells are now detected and theor bhp, thp, and well_rates
are initialized to zero.
 2016-09-21 12:23:34 +02:00
Tor Harald Sandve
f1bdd67438 Small fixes hardcodedTimestepControl 
-- avoid using eof()
-- add comments
-- no longer assumes two lines of comments.
-- revert change to default value for timestep.initial_step_length
-- make contructer explicit
-- pass reference
 2016-09-21 09:39:36 +02:00
Tor Harald Sandve
6e9bb4cf0b Timestepper based on userInput 
A new timestepper that reads timesteps from a file generated using
ecl_summary "DECK" TIME
and applies it to the simulator

Also a parameter timestep.initial_step_length (default 1 day) is added
to controll the frist timestep.
 2016-09-21 09:39:36 +02:00
Atgeirr Flø Rasmussen
ce78dc5560 Merge pull request #1065 from ANerd/output_present_phases 
Pass PhaseUsage to WellState::report
 2016-09-20 11:03:35 +02:00
Anders Matheson
18a5c0b748 Remove unused parameter warning 2016-09-20 10:00:50 +02:00
Anders Matheson
4186a37563 Pass PhaseUsage to WellState::report 2016-09-20 09:41:20 +02:00