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

2465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
de3b7f002f Merge pull request #40 from atgeirr/fix_mass_balance_report 
Fix mass balance reports

Thanks.  Looks good.  No regressions in testing.
 2012-10-02 11:28:23 -07:00
Bård Skaflestad
fb8ade64c1 Merge remote-tracking branch 'upstream/master' 2012-10-02 19:30:31 +02:00
Bård Skaflestad
ec5c6ca791 Merge pull request #38 from atgeirr/mods_for_surfvol_src 
Changing transport source convention

Tested locally.  No regressions.  Merged.

Long-term, we may need to do away with scalar source terms though--at least for black-oil type problems.
 2012-10-02 10:28:49 -07:00
Atgeirr Flø Rasmussen
d9f9a73ba1 Merge pull request #39 from bska/tidy-cpgpreprocess 
Document appropriate structure fields.
 2012-10-02 07:32:44 -07:00
Bård Skaflestad
3108031bfd Document appropriate structure fields. 
Commit 642eaf6 introduced the correct documentation, but mixed the order
of the 'zcorn' and 'actnum' documentation.  This commit corrects that
oversight.
 2012-10-02 16:24:13 +02:00
Atgeirr Flø Rasmussen
64aab3cc49 Fix mass balance reporting. 
Multiple issues:
  - now reporting surface volumes, not reservoir volumes,
  - fixed reporting for the case of multiple transport steps.
 2012-10-02 15:47:47 +02:00
Atgeirr Flø Rasmussen
66fe242280 Fix volume reporting with multiple transport substeps. 2012-10-02 15:47:21 +02:00
Atgeirr Flø Rasmussen
0669a2dd8b Add explanatory comment. 2012-10-02 15:46:33 +02:00
Atgeirr Flø Rasmussen
594d2a68da Increase output precision for ascii dumps. 2012-10-02 14:39:12 +02:00
Atgeirr Flø Rasmussen
358e6e93b1 Update compressible transport solver for new src convention. 
Namely, that inflowing transport sources are water *surface* volumes,
not water *reservoir* volumes.
 2012-10-02 14:37:18 +02:00
Atgeirr Flø Rasmussen
8c24c40a2a Bugfix: size of vector for A should be np*np. 2012-10-02 14:35:28 +02:00
Atgeirr Flø Rasmussen
490b8c01d1 Change interface for (blackoil) computeInjectedProduced(). 
Also use new computeInjectedProduced() and computeTransportSource()
functions in SimulatorCompressibleTwophase.
 2012-10-02 11:12:23 +02:00
Atgeirr Flø Rasmussen
056060abf9 Merge pull request #37 from bska/ert 
Don't compare signed to unsigned integer types.
 2012-10-01 23:24:38 -07:00
Bård Skaflestad
2e99dd48dc Don't compare signed to unsigned integer types. 
This avoids recalcitrant objections from the compiler.
 2012-10-01 17:37:18 +02:00
Atgeirr Flø Rasmussen
84a87990ff Modified functions dealing with transport source. 
In preparation for switching to new convention for inflow
sources in the compressible case: source being surface volumes,
not reservoir volumes.
 2012-10-01 16:40:47 +02:00
Atgeirr Flø Rasmussen
b020b4759b Update WellState::perfPress() after pressure solve. 2012-10-01 16:40:10 +02:00
Atgeirr Flø Rasmussen
7f9ea9041a Added perfPress() to WellState. 2012-10-01 16:39:35 +02:00
Bård Skaflestad
0b766e5ec2 Merge pull request #26 from atgeirr/ert 
Make ert branch up-to-date.

Merged as of commit 3e8b6a3 .  Thanks.
 2012-09-30 13:33:29 -07:00
Atgeirr Flø Rasmussen
3e8b6a389d Update ert test program to make it compile again. 2012-09-30 15:42:13 +02:00
Atgeirr Flø Rasmussen
4fcc01ebd6 Merge branch 'master' into ert 2012-09-30 15:08:49 +02:00
Atgeirr Flø Rasmussen
6f052cb0ed Merge branch 'master' into reorder_tof 2012-09-30 15:05:45 +02:00
Atgeirr Flø Rasmussen
756ab674ef Work in progress: degree 2 quadratures. 
Also, changed quadrature degrees used to get exact quadratures for all terms.
 2012-09-28 14:44:04 +02:00
Bård Skaflestad
5f1dfc15ac Merge remote-tracking branch 'upstream/master' 2012-09-28 09:03:14 +02:00
Atgeirr Flø Rasmussen
a0e7f113f2 Merge pull request #36 from alfbr/master 
Improve the README for ubuntu installation.
 2012-09-27 13:48:50 -07:00
rustad
58b2c7731d Oops, line moved to correct location. 2012-09-27 21:41:49 +02:00
rustad
dde150ecdb Unauthenticated packages fails with -y option and repo update needed. 2012-09-27 21:36:09 +02:00
Atgeirr Flø Rasmussen
ca3fbc48ae Merge branch 'master' into reorder_tof 2012-09-27 11:19:56 +02:00
Bård Skaflestad
0761b11e7c Merge remote-tracking branch 'upstream/master' 2012-09-27 11:19:47 +02:00
Atgeirr Flø Rasmussen
67f5c4ffcd Merge pull request #35 from bska/implement-surface-rate 
Add Tentative Implementation of Surface-Rate Targets
 2012-09-27 01:35:59 -07:00
Atgeirr Flø Rasmussen
cf2b975d45 Fix: forgotten multiply by cell volume in a quadrature. 2012-09-27 09:49:36 +02:00
Atgeirr Flø Rasmussen
8cfb8f005e Add sink term contribution. 2012-09-26 15:15:04 +02:00
Atgeirr Flø Rasmussen
74b74bca99 Make DG(n) solver an option for test program. 
For now, only DG(0,1) is expected to work.
 2012-09-26 14:21:16 +02:00
Atgeirr Flø Rasmussen
713bb63045 Fix argument order in call. 2012-09-26 14:21:00 +02:00
Atgeirr Flø Rasmussen
3ba50eb2d1 Initial version of DG(1) for tof implemented. 
Basis functions, quadratures and velocity interpolation are basic versions,
not handling any higher than DG(1) for now. These are currently in helper
classes and functions. The code in the main solver class is written with
the aim of supporting DG(n) generally.
 2012-09-26 13:30:54 +02:00
Bård Skaflestad
cbc5f924bf Add tentative implementation of surface-rate targets. 
Not tested at present.
 2012-09-26 10:14:45 +02:00
Atgeirr Flø Rasmussen
55b8944937 Merge branch 'master' into reorder_tof 2012-09-26 09:08:26 +02:00
Atgeirr Flø Rasmussen
0ceff04194 Merge branch 'master' into ert 
Conflicts:
	Makefile.am
 2012-09-26 09:07:57 +02:00
Atgeirr Flø Rasmussen
44a4d68816 Added skeleton of general order DG tof solver. 2012-09-26 08:58:03 +02:00
Atgeirr Flø Rasmussen
a473422a82 Add proper support for source terms. 
This fixes the problem with infinite tofs at sinks.
 2012-09-25 14:00:17 +02:00
Bård Skaflestad
06e315bd3e Merge remote-tracking branch 'upstream/master' 2012-09-25 13:10:33 +02:00
Alf Birger Rustad
80a084e0cb Merge pull request #34 from atgeirr/new_threephase_relperm 
Thanks for the clarifications.
 2012-09-25 02:28:18 -07:00
Atgeirr Flø Rasmussen
112aba50dd Merge branch 'master' into reorder_tof 2012-09-25 10:13:46 +02:00
Bård Skaflestad
10c13a38c4 Merge remote-tracking branch 'upstream/master' 2012-09-24 19:40:19 +02:00
Atgeirr Flø Rasmussen
6eb9720263 Guard against input error. 
If no valid threephase_model is input, throw instead of crashing.
 2012-09-24 17:09:50 +02:00
Atgeirr Flø Rasmussen
1dbcebefe5 Add support for new three-phase relperm option to BlackoilPropertiesFromDeck. 
New parameter option added: 'threephase_model' can now be 'gwseg'.
 2012-09-24 16:43:00 +02:00
Atgeirr Flø Rasmussen
b898e20420 Add new saturation function class SatFuncGwseg. 
Based on a model where gas and water is segregated,
and oil equally present in both gas and oil zones.
 2012-09-24 16:41:34 +02:00
Atgeirr Flø Rasmussen
653d03d997 Fix comment and indentation. 2012-09-24 16:40:56 +02:00
Atgeirr Flø Rasmussen
4794341d06 Merge pull request #32 from rolk/lt_init 
Silence faulty warning from libtoolize about LT_INIT
 2012-09-24 00:42:30 -07:00
Atgeirr Flø Rasmussen
2c9e2d08d9 Merge pull request #33 from rolk/fieldvec 
Disable warning for using DUNE's FieldVector::size
 2012-09-24 00:41:28 -07:00
Roland Kaufmann
398f58323f Disable warning for using DUNE's FieldVector::size 
In DUNE 2.2 FieldVector::size changed from being a member to being a
method. A compatibility warning is issued if you include the relevant
headers.

This warning can be silenced for DUNE modules by using passing the
option --enable-fieldvector-size-is-method to ./configure. This patch
effectively does the same, but through a macro definition.
 2012-09-24 00:21:06 +02:00