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

2142 Commits

Author SHA1 Message Date
Halvor Møll Nilsen
ed2aa9da38 Introduced posibility to change number of sample points for pvt. 
Did change the PVTW calculation so derivatives are exact.
Extended the test functions for pvt and relperm
 2012-08-31 17:01:07 +02:00
Halvor Møll Nilsen
7b1501cead Added new SatFuncSimple fluid. 
Introduced a simple fluid which has no problem with strange black oil behavior.
Intended for testing, but for now it is used in SaturationPropsFromDeck.
 2012-08-28 16:41:06 +02:00
Halvor Møll Nilsen
16f6d71a4e Changed cmake file from listing all files to glob. 
Due to structure of the code some files need to be removed. This is not optimal.
AGMG support is not integrated.
The CMakeFile make it easy to use opm-core in qtcreator.
 2012-08-28 14:31:54 +02:00
Halvor Møll Nilsen
48360d23a1 Added param initializer on fluids with param to addjust table length. 
Moved internal class SatFunc to SatFuncStone2.
 2012-08-28 14:27:14 +02:00
Halvor Møll Nilsen
a6dcc52cba Started work on supporting 3 phases for wellreport. 2012-08-27 12:22:32 +02:00
Halvor Møll Nilsen
ea09af47f4 Added programs to test test fluids. 2012-08-27 12:21:25 +02:00
Halvor Møll Nilsen
88d1d9762d Addes support for initialisation of three phases using SWOF and SGOF 2012-08-27 12:20:03 +02:00
Halvor Møll Nilsen
b7e9fbe9a5 Corrected mistake from moving function calls. 2012-08-24 13:39:42 +02:00
Halvor Møll Nilsen
fd0d060ed8 Corrected typing pointed out by atgeirr in respose to pullrequest 2012-08-24 12:52:41 +02:00
Halvor Møll Nilsen
bf082c57b6 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	opm/core/simulator/SimulatorIncompTwophase.cpp
 2012-08-24 12:26:27 +02:00
kristinf
5df2980f6d First attempt at README file 2012-08-24 08:56:05 +02:00
Bård Skaflestad
bb6563ffc0 Merge pull request from Ivarun/automake_1.12_compatibility 
Make configure.ac compatible with automake 1.12
 2012-08-23 06:23:40 -07:00
Ivar Ursin Nikolaisen
b448adff16 Make configure.ac compatible with automake 1.12 
Since automake 1.12 warnings in the category 'extra-portability' are
enabled with -Wall [1]. In automake 1.11.2 the AM_PROG_AR macro was
added and is required when compiling with extra-compatibility [2].

[1] http://lists.gnu.org/archive/html/automake/2012-04/msg00060.html
[2] http://lists.gnu.org/archive/html/automake/2011-12/msg00055.html
 2012-08-23 14:20:41 +02:00
Bård Skaflestad
a3ac364ea2 Merge pull request from Ivarun/fix_associativity_bug_in_get_zcorn_sign 
Fix associativity bug in get_zcorn_sign
 2012-08-21 06:47:35 -07:00
Halvor Møll Nilsen
66dea391a8 added writing of reorder iterations for each cell 2012-08-21 15:23:46 +02:00
Ivar Ursin Nikolaisen
462c7cf8e3 Add parentheses to c1 assignment for consistency. 2012-08-21 15:15:40 +02:00
Bård Skaflestad
d1fef7c0df Merge pull request from atgeirr/master 
Improvements to Simulator* class.
 2012-08-21 06:10:46 -07:00
Atgeirr Flø Rasmussen
81ca766b86 Fix pressure renormalization conditions. Some formatting fixes. 
Checking for both rock compressibility and pressure conditions
is necessary before we renormalize pressure.
 2012-08-21 14:52:43 +02:00
Ivar Ursin Nikolaisen
aaae8e170b Fix associativity bug in get_zcorn_sign 
The bug can also cause c2 to be larger than the length of
actnum, leading to segmentation faults.
 2012-08-21 14:15:49 +02:00
Atgeirr Flø Rasmussen
fe0581b69b Preserve sorting order. 2012-08-21 14:09:44 +02:00
Atgeirr Flø Rasmussen
87ce47f70d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	examples/sim_2p_incomp_reorder.cpp
	opm/core/simulator/SimulatorIncompTwophase.cpp
 2012-08-21 12:47:52 +02:00
Bård Skaflestad
d2e6125570 Merge pull request from hnil/master 
Added output of timing in param format.
 2012-08-21 02:28:41 -07:00
Atgeirr Flø Rasmussen
d9444d0dfb Added well constraint checking to SimulatorIncompTwophase. 
- Changed Wells constructor arg for SimulatorIncompTwophase to WellsManager.
 - Insert checking code for well constrains (mostly copied from spu_2p.cpp).
Unrelated to the above changes.
 - Added pressure normalization for incompressible case (from spu_2p.cpp)
 2012-08-21 10:51:14 +02:00
Halvor Møll Nilsen
29c6be6752 Added writing of timings in param format 2012-08-21 09:57:36 +02:00
Atgeirr Flø Rasmussen
1170727f1e Renamed SimulatorTwophase -> SimulatorIncompTwophase. 2012-08-20 15:45:05 +02:00
Atgeirr Flø Rasmussen
bbf2b4f369 Changed name of parameter output file to 'simulation.param'. 2012-08-20 14:46:51 +02:00
Bård Skaflestad
9a44eababc Merge pull request from atgeirr/master 
Added parameter output_vtk.
 2012-08-17 05:14:56 -07:00
Atgeirr Flø Rasmussen
427fb67e9b Merge remote-tracking branch 'upstream/master' 2012-08-17 13:58:13 +02:00
Atgeirr Flø Rasmussen
a23f8d1706 Added parameter output_vtk. 
Defaults to true, if false do not write .vtu output.
 2012-08-17 13:54:19 +02:00
Bård Skaflestad
21b33e40d7 Merge pull request from atgeirr/master 
Modifications to compressible transport solver, other minor mods.
 2012-08-17 03:49:30 -07:00
Atgeirr Flø Rasmussen
9a1bcaf496 Whitespace cleanup. 2012-08-17 12:40:15 +02:00
Atgeirr Flø Rasmussen
8fa0140e66 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	opm/core/simulator/SimulatorTwophase.cpp
 2012-08-17 11:31:59 +02:00
Atgeirr Flø Rasmussen
f582627f2a Merge pull request from hnil/master 
Corrected use of boost header.
 2012-08-17 02:26:51 -07:00
Atgeirr Flø Rasmussen
08e966eff1 Small improvements, outputs unused params at the correct time. 2012-08-17 11:20:42 +02:00
Halvor Møll Nilsen
bdad2c449c Changed header for boost. 2012-08-17 10:59:26 +02:00
Atgeirr Flø Rasmussen
48acb816ff Merge remote-tracking branch 'upstream/master' 2012-08-17 10:58:12 +02:00
Atgeirr Flø Rasmussen
6ed0b0a817 Merge pull request from hnil/master 
Changed output to be easier to read from matlab.
 2012-08-17 01:55:18 -07:00
Halvor Møll Nilsen
b0cbc3d7f4 Reintroduced writing of param. 2012-08-16 16:10:28 +02:00
Halvor Møll Nilsen
5a05af55eb Merge remote-tracking branch 'upstream/master' 2012-08-16 16:01:52 +02:00
Halvor Møll Nilsen
2da6650b97 Moved output of quantities to separate directoirs inside the outdir. 
This is done to get a cleaner putput.
 2012-08-16 15:29:57 +02:00
Atgeirr Flø Rasmussen
b427125a4f Merge remote-tracking branch 'upstream/master' 2012-08-14 15:27:30 +02:00
Atgeirr Flø Rasmussen
d89395f486 Merge pull request from bska/master 
Coding Style and Diagnostics Clean-up.
 2012-08-14 05:01:08 -07:00
Bård Skaflestad
7ccf0350bc Tighten grammar of "HAVE_AGMG" symbol description. 2012-08-14 12:55:57 +02:00
Bård Skaflestad
05410ac950 Always #define "HAVE_DUNE_ISTL". 
Define the symbol to zero (false) if unavailable.  This prevents a
diagnostic message concerning an undefined preprocessor symbol when used
in the form

    #if HAVE_DUNE_ISTL
       /* ... */
    #endif
 2012-08-14 12:49:56 +02:00
Bård Skaflestad
736020e6fe Always #define "HAVE_AGMG". 
Define the symbol to zero (false) if unavailable or unwanted.  This
prevents a diagnostic message concerning an undefined preprocessor
symbol (i.e., "HAVE_AGMG") when used in the form

    #if HAVE_AGMG
       /* ... */
    #endif
 2012-08-14 12:42:47 +02:00
Atgeirr Flø Rasmussen
17383ca91f Merge remote-tracking branch 'upstream/master' 2012-08-14 11:31:54 +02:00
Bård Skaflestad
f8825976f0 Restore original method spacing. 
No functional changes.
 2012-08-14 11:26:07 +02:00
Atgeirr Flø Rasmussen
a81df458e3 Gravity segregation column solver for compressible case implemented. 2012-08-14 11:25:59 +02:00
Bård Skaflestad
0841cea042 Restore coding conventions. 
Inadvertently lost in commit 064184b.
 2012-08-14 11:05:09 +02:00
Bård Skaflestad
5986b4a24d Re-adjust Doxygen layout for commit 9d9691a. 2012-08-14 11:03:33 +02:00