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

5306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
64b83989d5 Correct comment. 2015-08-17 13:02:37 +02:00
Atgeirr Flø Rasmussen
e88e62a68d Catch MatrixBlockError in the adaptive time stepper. 
This can be thrown by the ILU0 preconditioner when using the
interleaved solver approach.
 2015-08-17 12:59:31 +02:00
Joakim Hove
a5f8921fff Merge pull request #850 from atgeirr/fix-groupcontrol-resv 
Use the correct (new) method from the Group class for group RESV.
 2015-08-14 13:47:38 +02:00
Atgeirr Flø Rasmussen
9c6cabcd9a Use the correct (new) method from the Group class for group RESV. 
Production controls now are no longer initialised from injection control data.
 2015-08-13 10:21:24 +02:00
Atgeirr Flø Rasmussen
0147d28257 Merge pull request #848 from atgeirr/fix-bugs-explicitarraysfluidstate 
Fix bugs related to ExplicitArraysFluidState
 2015-08-12 15:25:29 +02:00
Atgeirr Flø Rasmussen
f2572066b7 Merge pull request #849 from joakim-hove/memcmp_double 
Added small utility memcmp_double()
 2015-08-12 14:41:59 +02:00
Joakim Hove
20968d9c0a Added small utility memcmp_double() 2015-08-12 14:31:07 +02:00
Atgeirr Flø Rasmussen
6921bd2af9 Make saturation functions work with two phases again. 
Note that this changes ExplicitArraysFluidState to take
a run-time argument for the number of phases.
 2015-08-12 13:38:32 +02:00
Atgeirr Flø Rasmussen
6c821aef10 Bugfix: add forgotten setIndex() call. 2015-08-12 13:38:10 +02:00
Atgeirr Flø Rasmussen
547018d3c7 Merge pull request #845 from atgeirr/fix-abs-bug-and-warnings 
Fix abs bug and warnings
 2015-08-12 12:50:31 +02:00
Atgeirr Flø Rasmussen
8a0010527c Suppress warnings. 2015-08-10 16:07:45 +02:00
Atgeirr Flø Rasmussen
1ead8dd458 Fix bug in floating-point comparison. 
The function used integer abs() instead of fabs(), in C abs() only
takes integers so this is an error. Also needed to add comparison
with absolute tolerance to get reasonable behaviour (comparing 0 versus
0.0000000000001 is ok here).
 2015-08-10 16:05:00 +02:00
Joakim Hove
8820e80f4a Merge pull request #843 from chflo/opm-218-reverse 
Reverse changes that should not have been merged into master
 2015-08-10 15:26:28 +02:00
Atgeirr Flø Rasmussen
d8edb3db92 Merge pull request #838 from andlaus/initialize_SatHyst 
properly initialize the attributes of the SatHyst class
 2015-08-10 14:26:54 +02:00
chflo
0ee4ed6eab Reverse changes that should not have been merged into master 2015-08-10 14:17:59 +02:00
Joakim Hove
2b49064b01 Merge pull request #842 from atgeirr/move-warningutility-upstream 
Remove warning-suppression utility headers.
 2015-08-10 11:30:35 +02:00
Atgeirr Flø Rasmussen
2e4a8da02c Remove warning-suppression utility headers. 
They have been moved upstream to opm-parser.
 2015-08-10 10:52:52 +02:00
Atgeirr Flø Rasmussen
20c22294f1 Merge pull request #840 from dr-robertk/PR/remove-warnings 
TofDiscGalReorder and TofReader: remove warnings due to new boost version.
 2015-08-07 12:59:31 +02:00
Robert Kloefkorn
9b16794a56 TofDiscGalReorder and TofReader: remove warnings due to new boost version. 2015-08-07 12:02:59 +02:00
Atgeirr Flø Rasmussen
06c9d7d7e5 Merge pull request #839 from atgeirr/handle-new-umfpack 
Define the UF_long type if necessary.
 2015-08-07 11:11:23 +02:00
Joakim Hove
e1cf94dea1 Merge pull request #832 from joakim-hove/parsemode 
Updated tests to use ParseMode.
 2015-08-06 17:44:52 +02:00
Joakim Hove
7b6172a1f8 Updated to use ParseMode. 2015-08-06 15:56:51 +02:00
Andreas Lauser
feae6e393a properly initialize the attributes of the SatHyst class 
this caused the hysteresis saturation shifts to be initially wrong and
was probably the source of a lot of my confusion w.r.t. the saturation
scaling and hysteresis shift code. I guess this also fixes a valgrind
complaint, but I haven't checked...
 2015-08-06 11:34:22 +02:00
Atgeirr Flø Rasmussen
596eba610a Define the UF_long type if necessary. 
The UF_long type is deprecated in UMFPack, and actually seems
to be removed from the latest versions.
 2015-08-06 09:54:05 +02:00
Joakim Hove
6ea7677a59 Merge pull request #837 from joakim-hove/OPM-218 
Opm 218
 2015-08-05 15:11:21 +02:00
Joakim Hove
bc25ec87b7 Added RPTRST information to test deck. 2015-08-05 13:38:53 +02:00
chflo
a949d5a736 OPM-218: Write restart files at same interval as eclipse 2015-08-05 13:38:52 +02:00
chflo
5e9e472613 OPM-218: Fix Flow vs Eclipse restart interval write differences: Use new method for correct date in rsthead 2015-07-27 13:27:14 +02:00
chflo
338777f514 OPM-218: Fix Flow vs Eclipse restart interval write differences: Override method from SimulatorTimerInterface 2015-07-27 13:26:28 +02:00
chflo
0f064bea3e OPM-218: Fix Flow vs Eclipse restart interval write differences: Added new method to SimulatorTimerInterface 2015-07-27 13:25:33 +02:00
Joakim Hove
a6124d9a77 Merge pull request #831 from joakim-hove/TOPS-unittest 
Unittest creating UnstructuredGrid with TOPS.
 2015-07-24 14:20:41 +02:00
Joakim Hove
398724a053 Unittest creating UnstructuredGrid with TOPS. 2015-07-24 09:15:56 +02:00
Bård Skaflestad
db2dfbf047 Merge pull request #828 from atgeirr/fix-failing-test 
Do not use pressure() until after init() in BlackoilState.
 2015-07-08 18:02:12 +02:00
Atgeirr Flø Rasmussen
59c344204e Do not use pressure() until after init() in BlackoilState. 2015-07-08 17:58:38 +02:00
Atgeirr Flø Rasmussen
959e4e95b3 Merge pull request #825 from dr-robertk/PR/revise-simulator-states 
Revise SimulatorState and BlackoilState.
 2015-07-08 17:41:16 +02:00
Robert Kloefkorn
ae740adaf3 SimulatorState: use register{Cell/Face}Data also in SimulatorState. 2015-07-08 16:30:51 +02:00
Robert Kloefkorn
0ad5146b1f make ids protected. 2015-07-08 13:24:19 +02:00
Robert Kloefkorn
034f163d88 SimulatorState: clear memory on init. 2015-07-08 13:23:36 +02:00
Robert Kloefkorn
5ca0a0f788 SimulatorState: added copyright 
BlackoilState: added copyright

Also, small docu fix.
 2015-07-08 13:23:36 +02:00
Robert Kloefkorn
3bc520eeb7 SimulatorState: store all data in a vector to allow for flexibility when used with 
derived states.
BlackoilState: adjusted to SimulatorState changes.
 2015-07-08 13:23:36 +02:00
Bård Skaflestad
6265b0a94b Merge pull request #826 from atgeirr/fix-warnings 
Fix unused argument warnings.
 2015-07-08 12:39:36 +02:00
Atgeirr Flø Rasmussen
7df516896d Fix unused argument warnings. 2015-07-08 12:37:11 +02:00
Bård Skaflestad
5965b7246c Merge pull request #824 from andlaus/fix_SatFuncMultiplexer_on_gcc44 
fix SatFuncMultiplexer on old compilers
 2015-07-02 12:27:26 +02:00
Andreas Lauser
4fe4bee158 fix SatFuncMultiplexer on old compilers 
"old" == "gcc 4.4". the standard c++ library of this compiler seems to
invoke the copy operator when creating objects in a vector, whereas
newer versions of the library don't. The problem is that std::unique
pointer cannot be copied because it is -- err -- unique and thus the
implicit copy operator for the SatFuncMultiplexer class gets deleted
by the compiler.

the fix is to introduce a "fake" copy operator which does not do
anything but is present to make std::vector of stdlibc++-4.4
happy. this is obviously not very elegant, but I could not come up
with a better solution. (another fix would be to use raw pointers
instead of std::unique_ptr, but IMO this does not qualify as
"better".)
 2015-07-02 11:47:32 +02:00
Atgeirr Flø Rasmussen
038fb6913d Merge pull request #823 from andlaus/use_fluidstates_for_satfuncs 
Use fluidstates for satfuncs
 2015-07-01 12:57:55 +02:00
Andreas Lauser
8ccf1b3dbe multiplexer saturation function: get rid of the pesky union and the reinterpret_cast 
basically, we now store a pointer to the base class and convert this
to the concrete incarnation of the saturation function. the only
disadvantage of this is that it requires to allocate the concrete
objects dynamically, i.e., there's another layer of indirection. On
the plus side it saves a few bytes per object and it makes things
quite a bit simpler, so it is a win IMO.

thanks to [at]atgeirr for suggesting this.
 2015-06-29 15:28:30 +02:00
Andreas Lauser
388578f5ba use the multiplexer saturation function in SaturationPropsFromDeck 
this makes it possible to switch to different saturation functions
again. So far the only supported function besides the default one is
the one which implements the "Stone 2" model.
 2015-06-29 14:49:20 +02:00
Andreas Lauser
47521dca1d add a multiplexer saturation function 2015-06-29 14:49:20 +02:00
Andreas Lauser
e016b1ea37 convert the "Stone2" and "Simple" saturation functions to fluid states 2015-06-29 14:49:20 +02:00
Andreas Lauser
63075249a9 SaturationPropsFromDeck: make the jump to fluid states 
this means the following changes:

- the "SatFuncGwseg" class is converted
- for now, Gwseg is the only saturation function supported by
  SaturationPropsFromDeck. (will be changed in later commits.)
- the funcForCell() method of SaturationPropsFromDeck is removed as it
  just occludes things
 2015-06-29 14:49:20 +02:00