Commit Graph

1133 Commits

Author SHA1 Message Date
Arne Morten Kvarving
18a6f709b0 Update import of ERT-Eclipse headers to new location 2013-02-11 22:38:02 +01:00
Roland Kaufmann
f4350098ed Use precompiled headers to compile C++ modules
On an average system this will cut around 15% of the total build time.
Unfortunately, including Boost headers in the precompiled header takes
longer time to generate and then read in each module, than just
including the necessary headers in each module.

Use Noel Llopis' list_precomp.py at
http://www.gamesfromwithin.com/wp-content/uploads/bin/list_precomp_py.txt
to analyse which headers are included the most and are candidates for
inclusion.
2013-02-11 22:38:00 +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
Bård Skaflestad
eb4bf0a373 Merge pull request #91 from joakim-hove/writeEclActive
Write ecl active
2012-11-07 06:40:00 -08: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
Bård Skaflestad
d399b2d7cc Merge pull request #89 from atgeirr/gravity-in-wells
Gravity in wells
2012-11-07 03:53:04 -08: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
5ca3f98725 Update CompressibleTpfa wellbore gravity handling.
Should now be in sync with cfs_tpfa_residual C interface. Simple well
gravity model implemented.
More flexibility in well gravity models would be a natural future extension.
2012-11-06 19:28:22 +01:00
Atgeirr Flø Rasmussen
bbc80e4b83 Add HAVE_ERT guards to writeECLData.cpp. 2012-11-06 16:18:22 +01:00
Bård Skaflestad
69070133bd Merge branch 'master' into gravity-in-wells 2012-11-05 15:48:07 +01:00
Atgeirr Flø Rasmussen
51bbc85a26 Bugfix tof computations with multidimensional upwinding.
Cell tof depends on downwind face tof in a more complicated way
with multidim upwinding, this was not done correctly.
2012-11-05 14:26:00 +01:00
Bård Skaflestad
f466ae6a51 Account for gravity in well connection flux calculation
We previously ignored effects of gravity in the calculation of the well
connection fluxes (i.e., perforation fluxes).  This commit includes
those effects where appropriate.
2012-11-01 13:34:27 +01:00
Atgeirr Flø Rasmussen
3325d4ef39 Implemented multidimensional upwinding.
The 'SMU' variant is chosen for its smoothness.
2012-10-30 13:10:50 +01:00
Atgeirr Flø Rasmussen
69832375d2 Merge branch 'tof_utilities' into multidim_upwind 2012-10-30 10:25:23 +01:00
Bård Skaflestad
905cec9543 Merge branch 'master' into gravity-in-wells 2012-10-29 18:33:10 +01:00
Atgeirr Flø Rasmussen
020f452a28 Added parameters for controlling use of multidim upwinding.
For now, you will simply get SPU even with use_multidim_upwind=true.
2012-10-29 17:23:17 +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
87169cfa86 Merge branch 'master', remote-tracking branch 'upstream/master' into tof_utilities 2012-10-29 08:46:26 +01:00
Atgeirr Flø Rasmussen
72f8da074e Add constructor taking file name to GridManager.
Calls read_grid(). Grid fileformat not yet documented.
2012-10-25 13:23:50 +02:00
Bård Skaflestad
2ec15ab74a Merge branch 'master' into gravity-in-wells 2012-10-25 10:44:17 +02:00
Atgeirr Flø Rasmussen
319fb8df50 Merge pull request #84 from bska/fix-equality-comparisons
Fix well classification that was only correct by accident
2012-10-25 01:08:48 -07:00
Bård Skaflestad
3e20f4ed2b Merge branch 'master' into gravity-in-wells 2012-10-24 22:43:25 +02:00
Roland Kaufmann
09f458f5ee Remove superfluous construction by std::make_pair
Since we know the type of the components, we may just as well create the
pair directly! (Using make_pair invokes compiler bugs in GCC).
2012-10-24 21:22:11 +02:00
Bård Skaflestad
c8dedfde06 Fix well classification that was only correct by accident
Specifically, the tests

   if (!wells->type[self_index] == INJECTOR)
   if (!wells->type[self_index] == PRODUCER)

produced the expected results *only* because INJECTOR==0 and PRODUCER==1
in the WellType enumeration, thus (!INJECTOR == PRODUCER) and
(!PRODUCER == INJECTOR).

Installing the (much) more appropriate

    if (wells->type[self_index] != INJECTOR)
    if (wells->type[self_index] != PRODUCER)

is not only more readable, it is also future-proof and scales better if
we ever introduce new WellTypes (e.g., a MONITOR).
2012-10-24 21:12:29 +02:00
Bård Skaflestad
672ff95ae8 Replace !(a==b) test with a more common a!=b test 2012-10-24 21:02:46 +02:00
Bård Skaflestad
d2ab445ba6 Merge branch 'master' into gravity-in-wells 2012-10-24 10:09:31 +02:00
Roland Kaufmann
359fdb1428 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
Bård Skaflestad
b1f61d93c4 Merge branch 'master' into gravity-in-wells 2012-10-23 14:47:39 +02:00
Joakim Hove
564ba1c3aa Changed functions readKeyword and classifyKeyword to become static methods in class EclipseGridParser. 2012-10-21 21:51:13 +02:00
Bård Skaflestad
37d54be703 Merge branch 'master' into gravity-in-wells 2012-10-18 10:58:28 +02:00
Atgeirr Flø Rasmussen
3a61778066 Reinstate disabled test. Assert more. 2012-10-18 10:51:12 +02:00
Bård Skaflestad
011fe02f59 Merge branch 'master' into gravity-in-wells 2012-10-17 22:10:14 +02:00
Atgeirr Flø Rasmussen
dcee95ec96 Fix support for velocity interpolation in 2d. 2012-10-17 21:30:53 +02:00
Bård Skaflestad
a593efb1ea Merge branch 'master' into gravity-in-wells 2012-10-17 13:30:37 +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
Bård Skaflestad
beae475787 Don't compare floating point numbers for equality. 2012-10-16 21:48:38 +02:00
Atgeirr Flø Rasmussen
ab910f3778 Finished VelocityInterpolationECVI constructor.
Untested so far.
2012-10-16 20:19:17 +02:00
Bård Skaflestad
b400397389 Update documentation accompanying CompletionData structure.
Specifically, the 'wdp' member is a scalar value at each well
connection.  Phase behaviour is incorporated through other means.
2012-10-16 14:05:33 +02:00
Bård Skaflestad
1b63e27899 Rename CompletionData::gpot -> wdp .
This is in preparation of implementing actual gravity support in
(compressible) well-pressure solution.
2012-10-16 13:55:07 +02:00
Atgeirr Flø Rasmussen
7cf412340b 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
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
7b793f98c6 Document public interface of compr_source module.
This is Doxygen-style reference documentation only.
2012-10-15 19:49:23 +02:00
Bård Skaflestad
efb381a9a1 Reformat to add Doxygen markup where appropriate 2012-10-15 19:15:31 +02:00
Bård Skaflestad
c414ddad5d Document public interface of compr_quant_general module
This is Doxygen-style reference documentation only.
2012-10-15 16:08:17 +02:00