Commit Graph

2622 Commits

Author SHA1 Message Date
Bård Skaflestad
416086db2e New function clone_wells()
Used to create a deep copy (clone) of an existing Wells object.

While here, add test case for common Wells object operations.
2012-10-04 21:09:47 +02:00
Markus Blatt
694890e0cf Added missing m4 file with the test for SuperLU 2012-10-04 11:39:49 +02:00
Markus Blatt
ae52de0426 Added test for SuperLU and adapted the Makefile.am to support it 2012-10-04 11:37:28 +02:00
Bård Skaflestad
403c64aaeb Merge pull request #41 from atgeirr/ert
Thanks for keeping the branch up-to-date.
2012-10-03 02:42:14 -07:00
Atgeirr Flø Rasmussen
dd8b444bf5 Merge branch 'master' into reorder_tof 2012-10-03 10:05:53 +02:00
Atgeirr Flø Rasmussen
4b01cf53dd Merge branch 'master' into ert
Conflicts:
	opm/core/grid/cpgpreprocess/preprocess.h
2012-10-03 10:00:58 +02:00
Bård Skaflestad
862160c378 Merge remote-tracking branch 'upstream/master' 2012-10-02 20:30:13 +02:00
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