Atgeirr Flø Rasmussen
d7dc0abc13
Further improved WellReport and Watercut docs.
2013-09-24 14:39:41 +02:00
Atgeirr Flø Rasmussen
87466f25d2
Documented WellReport and Watercut classes.
2013-09-24 14:14:54 +02:00
Andreas Lauser
fde3fe3332
convert users of MESSAGE to OPM_MESSAGE
2013-09-05 13:04:38 +02:00
Andreas Lauser
d6fa31b452
convert users of the ASSERT and the ASSERT2 macros to standard assert()
2013-09-05 13:04:37 +02:00
Andreas Lauser
cb76a0fd7f
convert THROW to OPM_THROW
2013-09-05 13:04:37 +02:00
Andreas Lauser
408d3389c3
include iostream in the files which use std::cerr or std::cout
...
for some of these files this is needed to make to keep it compiling
after the next patch because the new ErrorMacros.hpp file will no
longer implicitly includes <iostream>. for the remaining files it is
just good style.
While at it, the includes for most of these files have been ordered in
order of decreasing abstraction level.
2013-09-05 13:04:37 +02:00
Júlio Hoffimann
c077912466
Remove trailing whitespaces
2013-07-28 08:34:13 -03:00
Andreas Lauser
40fe2abf04
make config.h the first header to be included in any compile unit
...
this is required for consistency amongst the compile units which are
linked into the same library and seems to be forgotten quite
frequently.
2013-04-10 12:56:14 +02:00
Atgeirr Flø Rasmussen
f9f5cbf321
Moved ColumnExtract and initState.
...
ColumnExtract -> opm/core/grid/ and initState -> opm/core/simulator/.
2013-03-18 12:47:23 +01:00
Atgeirr Flø Rasmussen
c78b7de680
Renamed newwells.h -> wells.h.
...
Also moved implementation file to subdir.
2013-03-18 10:33:34 +01:00
Atgeirr Flø Rasmussen
b73a33f4af
Adapt include statements to moved headers.
2013-03-14 10:29:42 +01:00
Atgeirr Flø Rasmussen
bb944b7e52
Moved writeECLData and writeVtkData to opm/core/io subdirs.
2013-03-08 08:06:18 +01:00
Atgeirr Flø Rasmussen
a154183b9d
Moved opm/core/eclipse/* to opm/core/io/eclipse/*.
2013-03-07 22:59:06 +01:00
Bård Skaflestad
2eaf60f680
Index into vectors using integers.
...
This commit corrects an error that has been present since the
introduction of function wellsToSrc() in commit a50bb8f but was never
detected. Although the conversion int->double->std::size_t is likely to
be loss-less, it is better to not introduce any more steps than are
actually needed.
2013-02-18 11:49:52 +01: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
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
a9783eefc7
Add explanatory comment.
2012-10-02 15:46:33 +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
6a01298312
Merge branch 'master' into ert
...
Conflicts:
Makefile.am
2012-09-26 09:07:57 +02:00
Atgeirr Flø Rasmussen
2017481a58
Improve diagnostic output if crossflow is detected.
2012-09-20 14:33:57 +02:00
Atgeirr Flø Rasmussen
8dc958044f
Merge branch 'master' into ert
2012-09-18 09:18:40 +02:00
Atgeirr Flø Rasmussen
65447604ae
Typo fix.
2012-09-14 20:56:08 +02:00
Atgeirr Flø Rasmussen
67b5f007fd
Made initialization from SWAT/SGAS etc. more robust and general.
2012-09-14 10:40:36 +02:00
Atgeirr Flø Rasmussen
9c77d12f8d
Merge branch 'master' into ert
...
Conflicts:
Makefile.am
configure.ac
examples/Makefile.am
opm/core/GridManager.cpp
opm/core/eclipse/EclipseGridParser.cpp
opm/core/grid/cpgpreprocess/preprocess.h
tests/Makefile.am
2012-09-05 13:36:19 +02:00
Atgeirr Flø Rasmussen
0f9d572f9a
Fix stride bug in WellReport::push(). Use convert::to().
2012-09-04 13:12:06 +02:00
Atgeirr Flø Rasmussen
14aab769f2
Fix stride bug in SGAS/SWAT init.
2012-09-04 13:06:13 +02:00
Atgeirr Flø Rasmussen
c2d41a6639
Whitespace cleanup and adding a check for #phases <= 3.
2012-09-03 14:04:52 +02:00
Atgeirr Flø Rasmussen
913054c473
Added more checks in 3-phase init code.
2012-09-03 13:54:50 +02:00
Atgeirr Flø Rasmussen
c409fcccce
Merge remote-tracking branch 'hnil/master'
2012-09-03 13:40:33 +02:00
Xavier Raynaud
a8cb519d4e
Fixed comment.
2012-09-03 12:26:22 +02:00
Xavier Raynaud
0701daa4dc
Improve documentation.
2012-09-03 11:29:48 +02:00
Xavier Raynaud
b4a4e297a8
Added functionality to compute porosity for compressible fluid.
2012-08-29 10:54:21 +02:00
Atgeirr Flø Rasmussen
5182fef48d
Switch loop ordering for better cache performance.
2012-08-27 13:17:27 +02:00
Halvor Møll Nilsen
cf9b9cdf20
Started work on supporting 3 phases for wellreport.
2012-08-27 12:22:32 +02:00
Halvor Møll Nilsen
9ef6014964
Addes support for initialisation of three phases using SWOF and SGOF
2012-08-27 12:20:03 +02:00
Atgeirr Flø Rasmussen
9bb76d74cc
Fixed bug in matrix multiplication (matrix has Fortran element order).
2012-08-27 11:19:22 +02:00
Atgeirr Flø Rasmussen
e96421dbd7
Whitespace cleanup.
2012-08-23 08:59:09 +02:00
Atgeirr Flø Rasmussen
96327164cc
Added computeSurfacevol() method.
...
The method is called by the reordering transport solver after computing
new saturations in order to update the surface volumes.
2012-08-23 08:57:48 +02:00
Joakim Hove
368e1813a1
Using Datamapper.h in writeVtkData
2012-06-28 13:20:18 +02:00
Bård Skaflestad
cc054d474d
computeFractionalFlow(): Reuse the output array in all intermediate calculations.
...
This eliminates a number of free-store operations and data movements.
2012-06-13 17:07:56 +02:00
Atgeirr Flø Rasmussen
611cd53380
Reorganized, added opm/core/wells/ and opm/core/simulator/.
2012-06-05 15:42:49 +02:00
Bård Skaflestad
664e0eadef
initBlackoilSurfvol(): Use loop order consistent with column-major ordering.
2012-05-21 21:03:43 +02:00
Atgeirr Flø Rasmussen
bccb7381fd
Added initBlackoilSurfvol() function.
2012-05-21 14:03:56 +02:00
Atgeirr Flø Rasmussen
18a0d0cf9f
Added initialization of face pressures.
2012-05-21 10:19:12 +02:00
Atgeirr Flø Rasmussen
cd72a50977
Added initFacePressure() function.
2012-05-21 10:10:52 +02:00
Xavier Raynaud
f252f59e5c
Added necessary #include.
2012-05-16 16:08:48 +02:00
Atgeirr Flø Rasmussen
d15a952cdd
Added initStateBasic() overload taking BlackoilPropertiesInterface props.
2012-05-16 12:54:48 +02:00
Atgeirr Flø Rasmussen
af8a32c560
Silence a warning.
2012-05-16 12:52:58 +02:00