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

381 Commits

Author SHA1 Message Date
Andreas Lauser
c25ec5999e convert users of the ASSERT and the ASSERT2 macros to standard assert() 2013-09-05 13:04:37 +02:00
Andreas Lauser
19e5d5cea2 convert THROW to OPM_THROW 2013-09-05 13:04:37 +02:00
Andreas Lauser
0eaf62c7e3 Add a file with OPM specific exceptions 2013-09-05 13:04:37 +02:00
Andreas Lauser
47bb5cde46 refactor the exception throwing code 2013-09-05 13:04:37 +02:00
Andreas Lauser
7a5a725f25 Replace boost::is_integral by std::is_integral 2013-09-05 13:04:37 +02:00
Andreas Lauser
3c9baded80 replace BOOST_STATIC_ASSERT by C++-2011's static_assert 2013-09-05 13:04:37 +02:00
Andreas Lauser
d11db08084 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
Roland Kaufmann
ccf4fcae12 Change from pass-by-value to pass-by-const-ref 
The object is copied when put into the list, so there should be no
danger of dangling references.
 2013-08-26 14:33:23 +02:00
Roland Kaufmann
3156d0749a Add classes for event-handling 
The new classes Event and EventSource can be used as a simple mechanism
for implementing event-based callbacks in the simulators.
 2013-08-26 12:52:03 +02:00
Andreas Lauser
70949c6edb use std::shared_ptr instead of boost::shared_ptr 
our policy is that we only use boost if necessary, i.e., if the oldest
supported compiler does not support a given feature but boost
does. since we recently switched to GCC 4.4 or newer, std::shared_ptr
is available unconditionally.
 2013-08-08 13:25:58 +02:00
Júlio Hoffimann
8385a9bcbb Remove trailing whitespaces 2013-07-28 08:34:13 -03:00
Markus Blatt
68eb3fbcb1 Changed std::tr1 occurences to boost. 
std::tr1 might not be supported by all compilers and will eventually
be dropped by others. Using boost instead makes this more
portable.
 2013-07-04 16:04:35 +02:00
Roland Kaufmann
0fb4f14b28 Provide DTD schema to describe parameter file format 
Notice that this definition specifies a superset of the actual format
as the ParameterGroup tag is context-dependent (which cannot be captured
by DTD schemata).
 2013-05-13 10:50:22 +02:00
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
Atgeirr Flø Rasmussen
3fa259496b Fix stride bug in WellReport::push(). Use convert::to(). 2012-09-04 13:12:06 +02:00
Atgeirr Flø Rasmussen
72e13ffd0d Fix stride bug in SGAS/SWAT init. 2012-09-04 13:06:13 +02:00
Atgeirr Flø Rasmussen
a07d894500 Merge branch 'master' into nonuniform_fluid_tables 
Conflicts:
	Makefile.am
	opm/core/fluid/BlackoilPropertiesFromDeck.hpp
	opm/core/fluid/SaturationPropsFromDeck.cpp
	opm/core/fluid/SaturationPropsFromDeck.hpp
	opm/core/fluid/blackoil/BlackoilPvtProperties.cpp
	opm/core/fluid/blackoil/BlackoilPvtProperties.hpp
	opm/core/fluid/blackoil/SinglePvtDead.cpp

This merge combines three more-or-less orthogonal features
for saturation tables: the option to use StoneII or Simple
three-phase behaviour, the option to fit a spline or not,
and finally setting the number of samples used (if spline
fitting).

Interfaces have changed, the most top-level one being
that BlackoilPropertiesFromDeck::init() now also takes
a ParameterGroup argument.
 2012-09-04 11:42:31 +02:00
Atgeirr Flø Rasmussen
3e294a4a81 Formatting fixes. 2012-09-03 15:07:03 +02:00
Atgeirr Flø Rasmussen
055f2d5f19 Whitespace cleanup and adding a check for #phases <= 3. 2012-09-03 14:04:52 +02:00
Atgeirr Flø Rasmussen
e37f003cb5 Added more checks in 3-phase init code. 2012-09-03 13:54:50 +02:00
Atgeirr Flø Rasmussen
142f186b81 Merge remote-tracking branch 'hnil/master' 2012-09-03 13:40:33 +02:00
Atgeirr Flø Rasmussen
154571c768 Merge branch 'master' into nonuniform_fluid_tables 2012-09-03 13:12:11 +02:00
Xavier Raynaud
87dc7affc5 Fixed comment. 2012-09-03 12:26:22 +02:00
Xavier Raynaud
596c988126 Improve documentation. 2012-09-03 11:29:48 +02:00
Halvor Møll Nilsen
ed2aa9da38 Introduced posibility to change number of sample points for pvt. 
Did change the PVTW calculation so derivatives are exact.
Extended the test functions for pvt and relperm
 2012-08-31 17:01:07 +02:00
Xavier Raynaud
4d800cad3d Added functionality to compute porosity for compressible fluid. 2012-08-29 10:54:21 +02:00
Atgeirr Flø Rasmussen
547dc1648c Added class SinglePvtDead, add parameter 'props_use_spline' to simulators. 
Recall that the class that used to be called SinglePvtDead has
been renamed to SinglePvtDeadSpline. If 'props_use_spline' is true,
that class is used (this is the default), which makes a monotone
spline that is uniformly, densely sampled. The new class simply
uses linear interpolation in the input tables.
 2012-08-27 16:48:21 +02:00
Atgeirr Flø Rasmussen
80e54a93d0 Switch loop ordering for better cache performance. 2012-08-27 13:17:27 +02:00
Halvor Møll Nilsen
a6dcc52cba Started work on supporting 3 phases for wellreport. 2012-08-27 12:22:32 +02:00
Halvor Møll Nilsen
88d1d9762d Addes support for initialisation of three phases using SWOF and SGOF 2012-08-27 12:20:03 +02:00
Atgeirr Flø Rasmussen
8e5ef9ac0d Fixed bug in matrix multiplication (matrix has Fortran element order). 2012-08-27 11:19:22 +02:00
Atgeirr Flø Rasmussen
82204f2b3b Whitespace cleanup. 2012-08-23 08:59:09 +02:00
Atgeirr Flø Rasmussen
234d125266 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
Halvor Møll Nilsen
064184bd0c Changed to extrapolation outside tables for pormult. Added facetags to the grid structure. Changed default fluid to Linear. 2012-08-14 09:36:19 +02:00
Bård Skaflestad
e690659bc5 Hook file into Doxygen. 
While here, doxygenise the information describing convert::to() and
convert::from(), and the prefixes as well.
 2012-07-18 11:00:50 +02:00
Bård Skaflestad
82369f9109 Add facility for overriding `HAVE_BOOST' from Dune. 
This is, at best, a work-around for an issue that presents when
earlier versions of Autoconf (e.g., 2.59) are used to process Dune's
DUNE_BOOST_BASE macro (introduced in dune-common@6480,
dune-istl@1492).  For reasons I've been unable to determine, the
HAVE_BOOST symbol just gets #define-d, not set to `ENABLE_BOOST' as
was intended.  Some kind of race condition?

Anyway, the Dune ISTL module uses statements such as

   #if HAVE_BOOST
     /* ... */
   #endif

to determine if particular software features should be enabled.
This breaks down if `HAVE_BOOST' is simply defined.  Following
commit fb614100, the symbol `OPM_HAVE_BOOST' is always defined (as a
Boolean state), so if we override ISTL's notion of `HAVE_BOOST', the
above construction continues to work.

We will, however, happily remove thise kluge if a better solution
arises in the core Dune modules.
 2012-07-12 14:20:59 +02:00
Andreas Lauser
6f69de969a opm-core: make it work nicely with clang 2012-07-05 12:42:49 +02:00
Bård Skaflestad
8947ef569f Mark return values as \return rather than \ret. 
Needed for Doxygen compliance.
 2012-07-02 12:55:28 +02:00
Joakim Hove
0e1dcb2c0d Using Opm::unit::convert for seconds -> days conversion. 2012-06-28 16:17:51 +02:00
Bård Skaflestad
ebf4b63aa4 Use a "const" DataMap object. 
As a fall-out, we can no longer use std::map<K,V>::operator[], because
that function cannot be applied to "const" objects.  Replace by .find().
 2012-06-28 14:42:04 +02:00
Joakim Hove
01f43b18d7 Using Datamapper.h in writeVtkData 2012-06-28 13:20:18 +02:00
Joakim Hove
93c813bf00 Added DataMap.hpp 2012-06-28 13:05:33 +02:00
Joakim Hove
bb066aa23b Added functionality to save results in ECLIPSE format from ERT libraries. 2012-06-27 20:20:05 +02:00
Bård Skaflestad
25cc61d481 Reference <ErrorMacros.hpp> from canonical location. 2012-06-22 19:35:19 +02:00
Bård Skaflestad
c5ed1cae04 Reference headers from canonical locations. 2012-06-22 19:33:36 +02:00
Bård Skaflestad
d7b7a930ac Reference class header from canonical position. 2012-06-22 19:32:18 +02:00
Bård Skaflestad
fbefe5d854 Replace all <tab>s by (8) spaces. 2012-06-20 00:04:48 +02:00
Atgeirr Flø Rasmussen
3f630b8d6b Moved SimulatorTimer class to opm/core/simulator directory. 2012-06-14 14:02:22 +02:00
Atgeirr Flø Rasmussen
294ce0b579 In SimulatorTimer: added setTotalTime(), made setCurrentStepNum() update current time. 2012-06-14 11:55:33 +02:00
Bård Skaflestad
2988b48bd3 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
78e9a8f6fa Added setCurrentStepNum() method. 2012-06-07 15:08:37 +02:00
Atgeirr Flø Rasmussen
7dadf8e5a2 Added Factory<...>::cloneObject(). 2012-06-07 15:08:01 +02:00
Atgeirr Flø Rasmussen
955b5ea068 Reorganized, added opm/core/wells/ and opm/core/simulator/. 2012-06-05 15:42:49 +02:00
Atgeirr Flø Rasmussen
7a31716185 Comment and indent bracketZero(). 2012-06-04 16:54:41 +02:00
Atgeirr Flø Rasmussen
b8b66d6f35 Whitespace cleanup. 2012-05-25 10:12:54 +02:00
Atgeirr Flø Rasmussen
217087cd2a Implemented more error policies for regula falsi solver. Use in reorder code. 
We have switched to WarnAndContinueOnError instead of ThrowOnError,
to reduce the annoyance factor when suffering from a minor error in
a long simulation run.
 2012-05-24 10:21:38 +02:00
Atgeirr Flø Rasmussen
288679ff3a Policy-based design enables custom error handling in scalar regula falsi. 2012-05-24 10:02:14 +02:00
Bård Skaflestad
66b44be238 initBlackoilSurfvol(): Use loop order consistent with column-major ordering. 2012-05-21 21:03:43 +02:00
Atgeirr Flø Rasmussen
5deeed1dac Added initBlackoilSurfvol() function. 2012-05-21 14:03:56 +02:00
Atgeirr Flø Rasmussen
af76b390d2 Added initialization of face pressures. 2012-05-21 10:19:12 +02:00
Atgeirr Flø Rasmussen
96c92284a3 Added initFacePressure() function. 2012-05-21 10:10:52 +02:00
Xavier Raynaud
b7139e07b5 Added necessary #include. 2012-05-16 16:08:48 +02:00
Atgeirr Flø Rasmussen
79cdeaa5df Added initStateBasic() overload taking BlackoilPropertiesInterface props. 2012-05-16 12:54:48 +02:00
Atgeirr Flø Rasmussen
99330b219e Silence a warning. 2012-05-16 12:52:58 +02:00
Atgeirr Flø Rasmussen
4c37676338 Renamed initTwophaseStateBasic() -> initStateBasic(). 2012-05-16 12:33:42 +02:00
Atgeirr Flø Rasmussen
9379263646 Renamed initStateTwophaseFromDeck() -> initStateFromDeck(). 
- Made initStateFromDeck() into a template taking arbitrary properties.
Implementation detail:
  - initWaterOilContact() was also templatized on props.
  - initHydrostaticPressure() is now overloaded on prop interface types.
 2012-05-16 11:37:31 +02:00
Atgeirr Flø Rasmussen
89b4f8ceb0 Added WellReport::push() overload taking BlackoilPropertiesInterface. 2012-05-15 12:50:02 +02:00
Atgeirr Flø Rasmussen
762a6083a2 Added utility functions for compressible fluid case. 2012-05-15 12:49:15 +02:00
Atgeirr Flø Rasmussen
67e3d38bec Now computePorevolume() takes a porosity array instead of a property object. 
This is to make it compatible with blackoil properties.
An alternative would be to give [Incomp|Blackoil]PropertiesInterface a
common base class (RockInterface?) with the common rock-related methods.
 2012-05-14 21:47:10 +02:00
Bård Skaflestad
a3b5e11ecc Remove a variable rendered unused by change-set 5a9bf9f4a8b9. 2012-05-09 11:27:23 +02:00
Bård Skaflestad
7ca9f6525d Flatten loops and prefer memcpy() to manual copying. 2012-05-09 11:21:47 +02:00
Kjetil Olsen Lye
517121470e merge. 2012-05-08 12:25:29 +02:00
Kjetil Olsen Lye
339a652e5d Changed some minor bugs in the refactored code in wells_example 2012-05-08 12:23:58 +02:00
Bård Skaflestad
d55fd7b6b5 Delete trailing whitespace. 2012-05-08 12:04:59 +02:00
Bård Skaflestad
fcdca081b0 Fix a likely indexing error leading to non-unit strides. 2012-05-08 12:03:50 +02:00
Kjetil Olsen Lye
be956f2a70 Refactored some computations into seperate methods in wells_example.cpp 2012-05-08 11:04:15 +02:00
Atgeirr Flø Rasmussen
e78c7c6072 Rename parameter init_sat -> init_saturation (docs already used this name). 2012-05-03 13:48:59 +02:00
Atgeirr Flø Rasmussen
2cf04140a1 Rewrote wellsToSrc() to be a little more accepting and correct. 2012-05-03 13:45:19 +02:00
Atgeirr Flø Rasmussen
c9604fae47 Fix recently created bug in append_well_controls(). 2012-05-03 12:48:56 +02:00
Atgeirr Flø Rasmussen
5264cd317f Updated computeTransportSource() and wellsToSrc() to match changes in Wells data structure. 2012-05-02 09:24:34 +02:00
Atgeirr Flø Rasmussen
e3246c8ead Significant modification of well data structures and related functions. 
The following changes are made:
 - The SurfaceComponent enum has been removed.
 - Added new member Wells::number_of_phases.
 - The Wells::zfrac member has been replaced with comp_frac. The old
   zfrac always had 3 components per well (accessed according to the
   canonical ordering given by SurfaceComponent), the new one has
   number_of_phases components per well.
 - Changed add_well() accordingly to accept comp_frac.
 - Added new member WellControls::distr, giving distributions for
   rate controls.
 - All functions dealing with well controls now take Wells* and a
   well index instead of directly taking WellControls*.
 - Now append_well_controls() also takes a rate distribution argument.
 - Added new public function set_current_control().
 2012-04-26 13:55:35 +02:00
Atgeirr Flø Rasmussen
51639bf3bc Follow change to well rate target sign convention. 2012-04-25 15:36:01 +02:00
Atgeirr Flø Rasmussen
20d1dec648 Fixed bug in computeWDP(), add gravity argument. Make WellReport output in friendly units. 2012-04-25 12:37:30 +02:00
Atgeirr Flø Rasmussen
b1bdd3cb3b Added class WellReport. 2012-04-25 11:00:33 +02:00
Atgeirr Flø Rasmussen
4f403bbc42 Changed order of functions to match order in header file. 2012-04-25 08:59:31 +02:00
Atgeirr Flø Rasmussen
f0aed255b0 Now computeTransportSource() ignores crossflow. 2012-04-24 15:18:19 +02:00
Atgeirr Flø Rasmussen
ce98195001 Include well flow in computeTransportSource(). 
Also minor fixes in spu_2p to handle no-wells case properly.
 2012-04-24 15:15:36 +02:00
Atgeirr Flø Rasmussen
eefcc69b3c Minor change to computeWDP() interface. 2012-04-24 13:48:00 +02:00
Kjetil Olsen Lye
81733f5a43 Fixed computeWDP again. 2012-04-24 13:36:32 +02:00
Kjetil Olsen Lye
2528d35b19 Fixed computeWDP. Small prettification of code. 2012-04-24 13:33:12 +02:00
Atgeirr Flø Rasmussen
f386ffa804 Added fixes and assertions suggested by static analysis. 2012-04-23 13:28:18 +02:00
Bård Skaflestad
f2ab37c6c2 Expand description of function create_wells(). 
Restore original parameter names in the process.
 2012-04-22 11:50:41 +02:00
Bård Skaflestad
1e9748cdb8 Hide memory management aspects of struct Wells. 2012-04-21 13:57:41 +02:00
Bård Skaflestad
3807506aeb Hide memory management aspects of struct WellControls. 2012-04-21 11:34:11 +02:00
Atgeirr Flø Rasmussen
c09c660af8 Renamed add_wells() -> add_well(). Documented. 2012-04-20 11:34:58 +02:00
Atgeirr Flø Rasmussen
78006cff40 Renamed some enums and functions relating to Wells, and started documenting it. 2012-04-20 09:50:36 +02:00
Atgeirr Flø Rasmussen
a085337dc0 Initialise current well control in the appropriate place. 2012-04-19 16:11:58 +02:00
Atgeirr Flø Rasmussen
7b382a82e8 Reinject UniformTableLinear into utils subnamespace for backwards compatibility. 2012-04-19 14:11:00 +02:00
Atgeirr Flø Rasmussen
0badf481b5 Moved UniformTableLinear and related func out of subnamespace utils. 2012-04-19 11:45:52 +02:00
Bård Skaflestad
5a57f31474 Volume: Use official definition of a standard barrel; 42 U.S. gallon. 2012-04-17 19:45:39 +02:00
Bård Skaflestad
0e275bea4e Assert copyright for years 2011 and 2012. 2012-04-17 19:31:20 +02:00