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

5219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
babrodtk
ac0e72ea1d Refactoring 2015-08-19 13:12:14 +02:00
babrodtk
c7a66bf595 Update support for VFP tables: Now produces almost identical results to BHP for 'identity' table' 2015-08-19 13:12:14 +02:00
babrodtk
5913535396 More integration of VFP tables 2015-08-19 13:12:03 +02:00
babrodtk
88c3596535 Initial integration of VFP 2015-08-19 13:11:41 +02:00
babrodtk
53413e9318 Fixed warning 2015-08-19 13:10:48 +02:00
babrodtk
c4aae4440e Update support for VFP tables: Now produces almost identical results to BHP for 'identity' table' 2015-08-19 13:10:48 +02:00
babrodtk
e05b7778d7 More integration of VFP tables 2015-08-19 13:10:48 +02:00
babrodtk
1dab5351c2 Initial integration of VFP 2015-08-19 13:10:48 +02:00
Atgeirr Flø Rasmussen
11062bf13a Merge pull request #853 from atgeirr/fix-init-order 
Match init order to member order.
 2015-08-19 11:36:10 +02:00
Atgeirr Flø Rasmussen
13d443473e Match init order to member order. 
In a constructor initialisation list, the order should be the same
as the order in which the variables actually are initialised, which
is given by the order they are declared in the class and not by the
order in the initialisation list.
 2015-08-19 11:33:29 +02:00
Atgeirr Flø Rasmussen
c1332b8b83 Merge pull request #852 from GitPaean/testing_new_adaptive_timestepping 
adding command line option full_timestep_initially_
 2015-08-18 10:24:51 +02:00
Kai Bao
5e5271b14d adding command line option full_timestep_initially_ 
when the option is true, for each report step, the size of the adaptive
time step always beginning with the size of the report step.
 2015-08-17 15:56:31 +02:00
Atgeirr Flø Rasmussen
932d686408 Merge pull request #851 from atgeirr/catch-more-istl-exceptions 
Catch more istl exceptions
 2015-08-17 14:48:01 +02:00
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