OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,256 Commits 9 Branches 35 Tags
61829dd238dda744b89c9b5618bf9ac37270666f
Commit Graph

268 Commits

Author SHA1 Message Date
Andreas Lauser
884c5ab027 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
f7d7deeb03 Simplified class NonuniformTableLinear. 
Removed the policy control for what to do beyond the domain.
Old behaviour was constant extrapolation, current behaviour
is linear extrapolation. The possibility to choose was never
needed and has beem removed.
 2013-03-22 16:22:29 +01:00
Atgeirr Flø Rasmussen
c1657b427a Finished unification of linear interpolation. 
The functions of linInt.hpp are now used everywhere, but:
 - linInt.hpp -> linearInterpolation.hpp (better name)
 - linearInterpolationExtrap() -> linearInterpolation() (extrapolate by default)
 2013-03-22 15:33:07 +01:00
Atgeirr Flø Rasmussen
a8097317a5 Make all codes use the same linear interpolation routines. 2013-03-22 15:28:16 +01:00
Atgeirr Flø Rasmussen
e770b1a6b4 Moved MonotCubicInterpolator to Opm namespace. 
Also minor doc fix.
 2013-03-21 14:57:36 +01:00
Atgeirr Flø Rasmussen
b32674f3ea Moved ColumnExtract and initState. 
ColumnExtract -> opm/core/grid/ and initState -> opm/core/simulator/.
 2013-03-18 12:47:23 +01:00
Atgeirr Flø Rasmussen
2405758e2d Renamed newwells.h -> wells.h. 
Also moved implementation file to subdir.
 2013-03-18 10:33:34 +01:00
Atgeirr Flø Rasmussen
34f523339d Adapt include statements to moved headers. 2013-03-14 10:29:42 +01:00
Atgeirr Flø Rasmussen
c2a7ce9a45 Moved writeECLData and writeVtkData to opm/core/io subdirs. 2013-03-08 08:06:18 +01:00
Atgeirr Flø Rasmussen
25867007ed Moved opm/core/eclipse/* to opm/core/io/eclipse/*. 2013-03-07 22:59:06 +01:00
Bård Skaflestad
11425efe81 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
4d6eca1847 Merge pull request #135 from atgeirr/doc-improvements 
Doc and comment improvements
 2013-02-06 01:26:29 -08:00
Arne Morten Kvarving
af388bb81c Update import of ERT-Eclipse headers to new location 2013-02-05 15:07:35 +01:00
Atgeirr Flø Rasmussen
8995543467 Changed OpenRS->OPM in copyright notices and #include guards. 2013-01-29 13:29:44 +01:00
Atgeirr Flø Rasmussen
8e30215f16 Changed OpenRS->OPM in copyright notices and #include guards. 2013-01-29 13:17:01 +01:00
Atgeirr Flø Rasmussen
b66920203d Ensure correct output in case of Lapack error. 
Make sure that we output the original values, since Lapack may overwrite those
used in the call.
 2012-12-17 11:07:40 +01:00
Atgeirr Flø Rasmussen
696d038ebc Bugfix: update prototype of no-ert writeECLData(). 2012-12-03 08:55:58 +01:00
Atgeirr Flø Rasmussen
205f8c887b Changed interface of writeECLData(). 2012-11-26 10:51:20 +01:00
Atgeirr Flø Rasmussen
81c022e79a Make DataMap.hpp properly include its dependencies. 2012-11-26 10:50:09 +01:00
Bård Skaflestad
44f54cb712 Fix signed-vs-unsigned comparison warning 
The existing code compared the output of data->size(), which is a
std::vector<double>::size_type (typically std::size_t) and therefore an
unsigned integer type to the number 'grid.number_of_cells' which is a
(signed) 'int'.  This leads to an annoying warning when increasing the
warning level in GCC.

While here, also insert code to verify that the 'stride' is a positive
number lest the subsequent assignment loop reference (*data) elements
out of bounds.
 2012-11-07 17:23:45 +01:00
Joakim Hove
43adfaeda5 Added start_date_ property to the SimulatorTimer class 2012-11-07 14:53:26 +01:00
Joakim Hove
a3efb49de2 Added comments + make sure to only export active cells in writeEclData 2012-11-07 13:31:46 +01:00
Atgeirr Flø Rasmussen
ae6c388546 Fix incorrect size in ecl_kw_alloc() call. 
Also, add more checks to ensure sanity.
 2012-11-06 20:45:49 +01:00
Atgeirr Flø Rasmussen
bbc80e4b83 Add HAVE_ERT guards to writeECLData.cpp. 2012-11-06 16:18:22 +01:00
Atgeirr Flø Rasmussen
4c1240c4c1 Remove helpers that moved to WachspressCoord. 2012-10-29 15:36:25 +01:00
Atgeirr Flø Rasmussen
62fa94ae2a Use class WachspressCoord in VelocityInterpolationECVI. 
Implementation of coordinates has been moved out of the ECVI class
and into its own.
 2012-10-29 15:33:04 +01:00
Atgeirr Flø Rasmussen
ad2a237657 Added method WachspressCoord::adjacentFaces(). 2012-10-29 15:14:34 +01:00
Atgeirr Flø Rasmussen
1b31b207fe Added class WachspressCoord. 2012-10-29 14:55:44 +01:00
Atgeirr Flø Rasmussen
3288c7d505 Made constructor explicit, improve comment. 2012-10-29 12:56:04 +01:00
Atgeirr Flø Rasmussen
3a61778066 Reinstate disabled test. Assert more. 2012-10-18 10:51:12 +02:00
Atgeirr Flø Rasmussen
dcee95ec96 Fix support for velocity interpolation in 2d. 2012-10-17 21:30:53 +02:00
Atgeirr Flø Rasmussen
f9efd72ecc 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
30797cae1d Implement setupFlux() method. 
Also fix bug related to face orientation in cartToBaryWachspress().
 2012-10-17 11:16:42 +02:00
Atgeirr Flø Rasmussen
ab910f3778 Finished VelocityInterpolationECVI constructor. 
Untested so far.
 2012-10-16 20:19:17 +02:00
Atgeirr Flø Rasmussen
121bb79f91 New abstract class VelocityInterpolationInterface. 
Also, two initial subclasses: VelocityInterpolationConstant
and VelocityInterpolationECVI. The latter is still a work in
progress.
 2012-10-16 11:07:05 +02:00
Bård Skaflestad
31174cf727 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
f5359936e0 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
Bård Skaflestad
6fd5c36cc9 Remove a derelict statement inherited from original implementation. 
Disabled by default, this statement attempted to pass a std::istream to
function std::fclose() which is meaningless and should not be enabled at
any time--even for a MATLAB-related build.
 2012-10-05 00:55:14 +02:00
Atgeirr Flø Rasmussen
0669a2dd8b Add explanatory comment. 2012-10-02 15:46:33 +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
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
0ceff04194 Merge branch 'master' into ert 
Conflicts:
	Makefile.am
 2012-09-26 09:07:57 +02:00
Roland Kaufmann
f10d10e33e Add volumetic unit liter 
For simulating laboratory experiments, liter is a more suitable base
unit than gallons or barrels.
 2012-09-20 15:14:51 +02:00
Atgeirr Flø Rasmussen
8fdebccef6 Improve diagnostic output if crossflow is detected. 2012-09-20 14:33:57 +02:00
Atgeirr Flø Rasmussen
9153c7f87b Merge branch 'master' into ert 2012-09-18 09:18:40 +02:00
Atgeirr Flø Rasmussen
4110e40b62 Typo fix. 2012-09-14 20:56:08 +02:00
Atgeirr Flø Rasmussen
a6fccb6790 Made initialization from SWAT/SGAS etc. more robust and general. 2012-09-14 10:40:36 +02:00
Atgeirr Flø Rasmussen
00bbfa06a8 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
064d408b20 Merge branch 'master' into nonuniform_fluid_tables 
Conflicts:
	opm/core/fluid/BlackoilPropertiesFromDeck.cpp
	opm/core/fluid/BlackoilPropertiesFromDeck.hpp
	opm/core/fluid/SaturationPropsFromDeck.cpp
 2012-09-04 13:34:30 +02:00