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

4661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
osae
e3b06569e9 Adjustments for vanishing oil phase. 2014-06-25 18:03:17 +02:00
osae
d3ee5dc20a SWATINIT: Initialisation and capillary pressure scaling. 2014-06-25 18:03:17 +02:00
osae
6e00befef6 Scaling of capillary pressure. 2014-06-25 18:03:17 +02:00
Atgeirr Flø Rasmussen
e8db63dfb0 Fix initialization of tracer heads, and output ordering. 2014-06-25 09:56:37 +02:00
Atgeirr Flø Rasmussen
59d0ae185f Refactor tracer computations. 
Current version executes reordered solve once for each tracer. The benefit
is a simpler code and the ability to use MDU with tracers. The cost is
potentially higher runtime, compared to doing a single sweep for all
tracers (and tof).
 2014-06-24 09:43:26 +02:00
Atgeirr Flø Rasmussen
11bea99bef Remove unused data member. 2014-06-23 14:18:01 +02:00
Atgeirr Flø Rasmussen
4d2043a3ba Clean up dead code for MDU, update comment. 2014-06-23 14:05:51 +02:00
Atgeirr Flø Rasmussen
cf36cbe6d1 Add tracers_ensure_unity parameter. 
When this boolean parameter is true (the default), tracer solutions
will be normalized so that the tracer averages will sum to one in each cell.
This behaviour is the same as before, the change is that it can now be
turned off.
 2014-06-23 14:03:49 +02:00
Atgeirr Flø Rasmussen
8dceb4b08c Activate MDU option, making SMU method its default. 2014-06-23 11:29:14 +02:00
Atgeirr Flø Rasmussen
b3454a03b8 Fix bugs in MDU. 2014-06-23 11:23:16 +02:00
Atgeirr Flø Rasmussen
d498143488 Add computation of face tofs parts. 
This must be done after the cell tof has been computed since they
depend on it.
 2014-06-23 11:22:14 +02:00
Bård Skaflestad
e06fb0e5d4 Merge pull request #604 from akva2/build_tutorials 
Build tutorials
 2014-06-23 10:51:51 +02:00
Arne Morten Kvarving
d2b47b2ec2 added: build system for tutorials 2014-06-23 10:48:32 +02:00
Arne Morten Kvarving
e137eb3d16 fixed: tutorials should include config.h conditionally 2014-06-23 09:53:52 +02:00
Bård Skaflestad
076f9b1ae9 Merge pull request #601 from andlaus/fix_Findopm-parser.cmake_next_try 
Findopm-parser.cmake: Fix it up, next try
 2014-06-21 00:26:49 +02:00
Andreas Lauser
1ef41b2733 Findopm-parser.cmake: Fix it up, next try 
thanks to Arne Morten Kvarving, Bård Skaflestad and Roland Kaufmann
for the discussion.
 2014-06-20 12:34:37 +02:00
Atgeirr Flø Rasmussen
57cb41217f First compiling version of fixed MDU method. 2014-06-19 15:11:32 +02:00
Bård Skaflestad
f5823d2ea2 Merge pull request #603 from akva2/fix_cp_prereqs 
fixed: dune-cornerpoint (now) needs the dune-common version information
 2014-06-18 15:47:24 +02:00
Arne Morten Kvarving
1d506e49eb fixed: dune-cornerpoint (now) needs the dune-common version information 2014-06-18 15:36:31 +02:00
Bård Skaflestad
eb7c0eb75a Merge pull request #602 from akva2/add_files_hook 
added: hook for conditionally compiled files
 2014-06-16 14:53:20 +02:00
Arne Morten Kvarving
457ea2c44f added: hook for conditionally compiled files 
backport from opm-upscaling PR#100
 2014-06-16 14:40:52 +02:00
Atgeirr Flø Rasmussen
1080e37fb0 Fix use of assert. 2014-06-16 13:44:00 +02:00
Atgeirr Flø Rasmussen
d788814259 Work in progress fixing multidim upwinding. 2014-06-16 13:14:42 +02:00
Atgeirr Flø Rasmussen
2b6fdc6259 Removed unused debugging output. 2014-06-16 12:49:41 +02:00
Atgeirr Flø Rasmussen
5e5b9e091d Split method solveSingleCell() for easier maintenance. 2014-06-16 12:49:41 +02:00
Atgeirr Flø Rasmussen
eed5892e98 Merge pull request #600 from bska/restore-build 
[buildsystem] Disable search for Boost in parser detection
 2014-06-13 13:04:56 +02:00
Bård Skaflestad
43c844b19f [buildsystem] Disable search for Boost in parser detection 
This changeset disables the effect of commit e9a5e82.  There appears
to be an unforeseen interaction between the calls to

    Find_Package (Boost)

that are implied by module 'opm-parser-prereqs.cmake' and the one
that's directly invoked in 'Findopm-parser.cmake'.  Until the
situation can be fully analysed and a complete solution implemented,
this is a temporary measure to restore the build of opm-core and
downstream OPM modules.
 2014-06-13 08:51:18 +02:00
Bård Skaflestad
97fe40c9c6 Merge pull request #599 from andlaus/add_ERT_to_opm-parser 
explicitly add the ERT libraries to the prerequisites of opm-parser
 2014-06-13 00:10:11 +02:00
Andreas Lauser
e9a5e82223 Findopm-parser.cmake: invoke FindBoost unconditionally 
even if boost was found previously, it might still miss a few
libraries. thanks to @akva2 for catching this.
 2014-06-12 21:46:18 +02:00
Bård Skaflestad
bc57bf1160 Merge pull request #598 from andlaus/enable_property_modifiers 
Glue in support for the grid property modifier keywords
 2014-06-11 22:45:59 +02:00
Andreas Lauser
47ba95d4eb Findopm-parser.cmake: make sure that the ERT libraries are available 
and some other minor cleanups to the module. For me it still works,
but this being the build system, I can't guarantee more...
 2014-06-11 22:24:34 +02:00
Andreas Lauser
0c47d27827 Glue in support for the grid property modifier keywords 
this basically means using Opm::EclipseState instead of the raw deck
for these keywords.

with this, property modifiers like ADD, MULT, COPY and friends are
supported for at least the PERM* keywords. If additional keywords are
required these can be added relatively easily as well.

no ctest regressions have been observed with this patch on my machine.
 2014-06-11 13:48:49 +02:00
Bård Skaflestad
6bac6159ee Merge pull request #596 from andlaus/fix_some_keyword_names 
Fix some keyword names
 2014-06-10 23:14:34 +02:00
Bård Skaflestad
95a4d991f0 Merge pull request #587 from andlaus/implement_multi-region_pvt_tables 
Implement multi-region PVT properties
 2014-06-06 14:38:36 +02:00
Andreas Lauser
31c97ca172 change item names used to query the PVCDO keyword 
That's similar to having fun with a vodoo doll...
 2014-06-06 13:18:57 +02:00
Andreas Lauser
80cb3265db fix some keyword names 
The queried keywords are unknown to the parser and after manual
inspection also to the Eclipse RM. There might be wrong keywords some
left, but these were to ones needed to get SPE9 started using
sim_fibo_ad...
 2014-06-05 16:07:31 +02:00
Andreas Lauser
93f7a47062 add missing include 
for some reason this seems to be only required by GCC 4.4
 2014-06-05 14:32:58 +02:00
Andreas Lauser
126ca8043f Eclipse does not have a PERM keyword 2014-06-05 08:36:53 +02:00
Andreas Lauser
f96dfc2e0f fix the equilibration test by using new values 
thanks to @bska for the hints.
 2014-06-04 13:26:37 +02:00
Andreas Lauser
947d1644bd add missing PVTW keywords to the decks used by the equil test 
the test still fails, but the errors seem to be due to differences in
the saturation functions...
 2014-06-04 11:35:24 +02:00
Andreas Lauser
8568f9f3f9 add an assert 2014-06-04 11:11:35 +02:00
Andreas Lauser
2545b423fc handle the case that the compressed to logically cartesian array is NULL 2014-06-04 11:11:35 +02:00
Andreas Lauser
cbb5910a93 incorperate the review comments/decisions for multi-region PVT 
the largest change is that all classes below opm/core/props/pvt take
the PVT region index as an argument, the higher-level ones (i.e.,
BlackoilProps*) take cell indices.
 2014-06-04 11:11:35 +02:00
Andreas Lauser
fbd8d42e8d Implement multi-region PVT for all property classes 
since they are not using a single PVT table anymore, their "Single"
prefix has been removed...
 2014-06-04 11:11:35 +02:00
Bård Skaflestad
8afa34db4d Merge pull request #583 from andlaus/remove_EclipseGridParser 
Remove eclipse grid parser
 2014-06-04 00:26:41 +02:00
Andreas Lauser
c1c3f9d2e0 remove the table_t type 
that was an artifact only required for the old parser
 2014-05-21 11:22:43 +02:00
Andreas Lauser
f96417e81c rename all "newParserDeck" objects to "deck" 
The "new" parser is now "the" parser...
 2014-05-21 11:22:43 +02:00
Andreas Lauser
720acacad3 remove the EclipseGridParser class 
RIP!
 2014-05-21 11:22:43 +02:00
Andreas Lauser
3941fbc5f1 remove EclipseGridParser compatibility methods from all classes 2014-05-21 11:22:43 +02:00
Andreas Lauser
099f22cf1f attic: remove all files which required EclipseGridParser 
since the attic is the place for bits to rot silently, I doubt that
this code would have been of much contemporary use anyway. Even if it
could be made to compile, porting it to opm-parser would hardly be
worth the effort. If you are nostalgic and want to see how things were
done in the olden days, use `git show $COMMIT` or `git log --stat` or
`git log -p` and search for "EclipseGridParser"...
 2014-05-21 11:22:43 +02:00