884 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Roland Kaufmann	d8dd982408	Make GCC 4.6.3 happy in C++0x mode ... It complains about not finding a match for the pair<> template class, because the first parameter (this) is allegedly const. However, this isn't a const method, so I suspect it is a compiler bug. In order to move on, I slap on a harmless cast which will make this particular compiler happy, and which should have no effects elsewhere, but put it in a #if..#else..#endif macro to avoid warnings on others; hopefully this also makes it easier to spot and remove in the future.	2012-10-24 09:57:12 +02:00
Atgeirr Flø Rasmussen	88af4a4ce3	Fix output in case of LAPACK error. ... Make copy of matrix before calling dgesv, since it will overwrite it.	2012-10-17 12:40:43 +02:00
Atgeirr Flø Rasmussen	49af5dcd7b	Use new velocity interpolation interface. ... The class TransportModelTracerTofDiscGal now uses VelocityInterpolationInterface, and acts as a factory internally, choosing an interpolation method depending on the parameter 'use_cvi'.	2012-10-16 11:11:33 +02:00
Bård Skaflestad	9aa3dcb130	Merge remote-tracking branch 'origin/ert' into ert ... Conflicts: Makefile.am	2012-10-12 11:04:20 +02:00
Bård Skaflestad	b78cd9af58	Merge remote-tracking branch 'upstream/ert' into ert ... Conflicts: Makefile.am	2012-10-12 10:58:16 +02:00
Bård Skaflestad	d3f85ea60c	Merge remote-tracking branch 'upstream/master' into ert ... Conflicts: Makefile.am opm/core/grid/cpgpreprocess/preprocess.h tests/Makefile.am This brings ert branch up-to-date with current Github master branch.	2012-10-12 00:43:51 +02:00
Atgeirr Flø Rasmussen	ca15ce6eec	Fix comment.	2012-10-10 14:12:38 +02:00
Atgeirr Flø Rasmussen	89eee7e220	Bugfix: order of function arguments. ... Order of arguments for computePhaseFlowRatesPerWell() was wrong. This fix was done previously for SimulatorCompressibleTwophase, but the incompressible sim was ignored. Also added an ASSERT that may help catch some misuse.	2012-10-10 14:09:09 +02:00
Atgeirr Flø Rasmussen	c8498b76b6	Merge pull request #59 from kristinf/dev ... sign error in total_produced Looks correct.	2012-10-10 04:49:06 -07:00
kristinf	a740bcfe5f	sign error in total_produced	2012-10-09 15:23:56 +02:00
Atgeirr Flø Rasmussen	31d17a0dcd	Whitespace cleanup.	2012-10-09 12:21:17 +02:00
Atgeirr Flø Rasmussen	76259dcd0f	Improve docs and give more info on error.	2012-10-09 09:54:54 +02:00
Atgeirr Flø Rasmussen	36721602b2	Add timing of topological sort.	2012-10-09 09:54:26 +02:00
Atgeirr Flø Rasmussen	256a5496b1	Merge branch 'master' into reorder_tof	2012-10-08 16:16:05 +02:00
Atgeirr Flø Rasmussen	9e90dcebe5	Fix sign of production rate controls. ... In the Wells struct, production rate control targets must be negative (and injection rate control targets are always positive). In the WellsGroup classes, there are separate variables for injection and production, and all rates are positive. Therefore, upon adding or modification of a production rate control, the negated value must be used.	2012-10-08 14:27:56 +02:00
Atgeirr Flø Rasmussen	a635140500	Merge branch 'master' into reorder_tof	2012-10-08 13:52:59 +02:00
Bård Skaflestad	d6154d8961	Clone wells object when constructing from existing. ... This installs a measure of safety on the part of the interface in that the caller is free to dispose of the wells object upon returning from the WellsManager constructor.	2012-10-05 10:15:06 +02:00
Halvor Møll Nilsen	044c13e9fb	Added constuctor to WellManager which used Wells struct.	2012-10-05 10:14:55 +02:00
Bård Skaflestad	e5c5a64a4a	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-05 10:14:44 +02:00
Atgeirr Flø Rasmussen	108589a286	Merge branch 'master' into reorder_tof	2012-10-05 09:20:37 +02:00
Atgeirr Flø Rasmussen	352869feb2	Merge branch 'master' into ert ... Conflicts: Makefile.am	2012-10-05 09:20:04 +02:00
Bård Skaflestad	24504875ea	Reference <grid.h> from canonical location. ... The header was removed from this directory upon import from the preexisting "opmtransport" repository.	2012-10-05 00:56:12 +02:00
Bård Skaflestad	4d488c98a7	Unequivocally exclude MATLAB timing printing. ... It is not actually needed and prevents building when symbol MATLAB_MEX_FILE is defined.	2012-10-05 00:53:59 +02:00
Bård Skaflestad	a92549290f	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
Atgeirr Flø Rasmussen	6f31f059d7	Merge branch 'master' into reorder_tof	2012-10-03 10:05:53 +02:00
Atgeirr Flø Rasmussen	d22a1b6c03	Merge branch 'master' into ert ... Conflicts: opm/core/grid/cpgpreprocess/preprocess.h	2012-10-03 10:00:58 +02:00
Bård Skaflestad	ee23dfd475	Merge remote-tracking branch 'upstream/master'	2012-10-02 20:30:13 +02:00
Bård Skaflestad	6f888db5ea	Merge remote-tracking branch 'upstream/master'	2012-10-02 19:30:31 +02:00
Atgeirr Flø Rasmussen	a9783eefc7	Add explanatory comment.	2012-10-02 15:46:33 +02:00
Atgeirr Flø Rasmussen	5acbf00b14	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	4f276a8870	Bugfix: size of vector for A should be np*np.	2012-10-02 14:35:28 +02:00
Atgeirr Flø Rasmussen	017663cc5b	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	17c1be6541	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	6fb248d403	Update WellState::perfPress() after pressure solve.	2012-10-01 16:40:10 +02:00
Atgeirr Flø Rasmussen	0eb54ca90a	Added perfPress() to WellState.	2012-10-01 16:39:35 +02:00
Atgeirr Flø Rasmussen	78835b57b8	Merge branch 'master' into ert	2012-09-30 15:08:49 +02:00
Atgeirr Flø Rasmussen	f6b2306dab	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
Atgeirr Flø Rasmussen	cf38936c99	Merge branch 'master' into reorder_tof	2012-09-27 11:19:56 +02:00
Bård Skaflestad	888d0f04ad	Merge remote-tracking branch 'upstream/master'	2012-09-27 11:19:47 +02:00
Atgeirr Flø Rasmussen	d83ab5856d	Fix: forgotten multiply by cell volume in a quadrature.	2012-09-27 09:49:36 +02:00
Atgeirr Flø Rasmussen	04a76988d9	Add sink term contribution.	2012-09-26 15:15:04 +02:00
Atgeirr Flø Rasmussen	93094ebeec	Fix argument order in call.	2012-09-26 14:21:00 +02:00
Atgeirr Flø Rasmussen	99a12a7edc	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	fb8e79857c	Add tentative implementation of surface-rate targets. ... Not tested at present.	2012-09-26 10:14:45 +02:00
Atgeirr Flø Rasmussen	bbc5ed5c68	Merge branch 'master' into reorder_tof	2012-09-26 09:08:26 +02:00
Atgeirr Flø Rasmussen	6a01298312	Merge branch 'master' into ert ... Conflicts: Makefile.am	2012-09-26 09:07:57 +02:00
Atgeirr Flø Rasmussen	1a227dbf86	Added skeleton of general order DG tof solver.	2012-09-26 08:58:03 +02:00
Atgeirr Flø Rasmussen	b9a2c14113	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	afe4c54b66	Merge remote-tracking branch 'upstream/master'	2012-09-25 13:10:33 +02:00
Atgeirr Flø Rasmussen	ddf177b4c5	Merge branch 'master' into reorder_tof	2012-09-25 10:13:46 +02:00