Commit Graph
107 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen 04b255a03f Make more use of move semantics in AD code.
This makes some API changes to AutoDiffBlock.
 - Add overload for the constant() constructor taking rvalue ref.
 - Add overload for the variable() constructor taking rvalue ref.
 - Make the function() constructor *require* rvalue refs.
 - Add a swap() function.

The remaining changes in this commit are follow-ups especially
to the third change (adding std::move in many places), and
some removal of unnecessary block pattern arguments from calls to
the constant() static method.
2015-03-16 14:22:32 +01:00
Atgeirr Flø Rasmussen 965be0471f Remove non-AD overload of muWat().
The AD version is made a little smarter, detecting the
case of input with no derivatives. Existing use of the
non-AD rewritten.
2015-03-03 12:56:30 +01:00
Atgeirr Flø Rasmussen 4d9a30807b Fix test_rateconverter failure.
- Make test use three phases, not two.
 - Avoid interpolation failure by adding a line to PVDG.
2015-02-27 10:20:30 +01:00
Atgeirr Flø Rasmussen d9ce8625cf Remove unused classes.
After this, the two affected tests fail due to bugs in PVT region
support in BlackoilPropsAdFromDeck.
2015-02-23 13:42:51 +01:00
Markus Blatt fc137afcd5 Adds a constructor to BlackoilPropsAdFromDeck that allows copy the grid independant part.
In the parallel simulator we will have to be able adress only poperties on
some part of the global grid. To create thos properties we need to be able
to copy the grid independant data of the properties object and resize the rest.
This commit adds a construct taking a properties object for reading and a
new number of cells to accomplish this.
2015-02-12 21:33:41 +01:00
Markus Blatt dca6b436a7 Activates transmissibilities test for CpGrid without warnings.
Tests run fine for both grids.
2015-01-15 21:27:07 +01:00
Markus Blatt b0707e05bf Ported test_transmissibilities to the UgGridHelpers interface.
Previously, there were a completely different check for UnstructuredGrid
and CpGrid. The latter probably not working properly due to missing
support in the DUNE grid interface.

This commit resorts the code to use the UgGridHelpers abtraction instead of
UnstructuredGrid's legacy grid interface. Thus one code can be used to do
the checks for both grids. For UG the code compiles and the test is successful.
For CpGrid it compiles but of course the test still fails due to missing
transmissibility multiplier support. This will be sorted out in a different PR.
2015-01-14 11:56:37 +01:00
Markus Blatt e681d6b836 Use correct constructor for ntgGeology.
This should have been in the previous PR. But I missed it when splitting
things up.
2015-01-14 11:56:37 +01:00
Markus Blatt 55fb6fa7ed Use correct constructor of DerivedGeology used with CpGrid in test_transmissibilities.
The constructor now needs and additional boolean to
flag whether to local permeabilities. The old one used
is not there anymore. Therefor this patch moves the code
to the new constructor interface.
2015-01-12 14:56:42 +01:00
Tor Harald Sandve 02724b7f7a Implement comments for PR#249
1) Add the possibility for the user to chose between local and global
coordinate permeability in the transmissibility calculations.
2) Trow for CpGrid
3) Add default for switch
2014-12-10 07:29:05 +01:00
Atgeirr Flø Rasmussen 7b2334b758 Fix wrong resize() usage for Eigen::Array. 2014-12-02 09:24:03 +01:00
Andreas Lauser 4e3a69cc90 PVT properties: allow them to be temperature dependent
Note that this patch does not introduce any real temperature
dependence but only changes the APIs for the viscosity and for the
density related methods. Note that I also don't like the fact that
this requires so many changes to so many files, but with the current
design of the property classes I cannot see a way to avoid this...
2014-12-01 20:06:02 +01:00
Bård Skaflestad 82fc769922 RESV: Add facility for surface-to-reservoir rate conversion
This commit adds a simple facility for converting component rates at
surface conditions to voidage rates at reservoir conditions.  It is
intentionally limited in scope and meant to be employed only in the
context of class FullyImplicitBlackoilSolver<> or something very
similar.  In particular, class SurfaceToReservoirVoidage<> assumes
that it will be used to compute conversion coefficients for
component rates to voidage rates, and that those coefficients will
typically be entered into the coefficient matrix of a linearised
residual.

Add a trivial test just to demonstrate the setup and calling
process.  This is not a feature or correctness test.
2014-08-08 11:40:50 +02:00
Andreas Lauser faa98b4f74 add a unit test for the implementation of transmissibilty multipliers in DerivedGeology
for the legacy C-style grid the unit test is more or less complete (it
does not test FAULTMULT and NNC, etc, but these could be added with
sufficient determination), for Dune::CpGrid it currently does not
really check anything because I have not found a good way for CpGrid
to produce the "global" intersection index of an intersection...
2014-07-28 11:30:13 +02:00
Andreas Lauser 0219f83563 glue in support for property modifiers
i.e. reading the grid properties from EclipseState instead of from the
raw deck. This requires that all deck files exhibit a GRID and a
SCHEDULE section or else EclipseState will throw in the constructor.
2014-06-09 12:36:46 +02:00
Andreas Lauser b7f3ee7b79 rename "newParserDeck" to "deck" 2014-05-02 15:48:04 +02:00
Andreas Lauser dbb19403fc completely remove the EclipseGridParser from the module 2014-05-02 15:47:52 +02:00
Andreas Lauser 553698a933 remove tests/integration_tests/sim_fibo_ad_test.cpp
this test seems to compare the old and the new parser which does not
make sense anymore once the old parser is no longer available...
2014-05-02 13:59:25 +02:00
Andreas Lauser 83705279bb add the TABDIMS keyword to the data file for the fluid unit test
that's necessary because the Eclipse RM references it in the table
keywords and the opm-parser needs the keyword to be present to use
it...
2014-04-30 16:49:29 +02:00
Atgeirr Flø Rasmussen 347016a066 Add more checks to cover bug that was in operator -=. 2014-03-26 12:25:11 +01:00
Atgeirr Flø Rasmussen 60ff38adc6 Added test for += and -= operators. 2014-03-26 12:03:44 +01:00
Atgeirr Flø Rasmussen 37a23825c4 Removed dead code in test_block.cpp. 2014-03-26 11:48:13 +01:00
Atgeirr Flø Rasmussen fd4f5f5a26 Merge branch 'master' into new_well_formulation
Conflicts:
	opm/autodiff/FullyImplicitBlackoilSolver.cpp

To resolve conflicts, WellState was changed to WellStateFullyImplicitBlackoil
in multiple places, and perfRate() changed to perfPhaseRate() in
WellDensitySegmented.
2014-03-20 10:04:45 +01:00
Kristian Flikka 269a2bbd24 Reverting some const_casting, that was introduced with no real reason 2014-02-05 21:24:38 +01:00
Kristian Flikka 2b47f0364b Const-ref of parameter to the runWithXParser() functions 2014-02-05 21:18:03 +01:00
Kristian Flikka 5309ba793b Removed comment 2014-02-05 19:46:27 +01:00
Kristian Flikka 79c3a38d24 Changed back arguments of runWithXParser to use ParameterGroup 2014-02-05 19:43:43 +01:00
Kristian Flikka 8d7e7cc731 Trying to get the test back running, by looking at the sim_fib_ad main method. Please advice if the string casting on line 335 is bad stuff, not my strongest side 2014-02-05 18:22:16 +01:00
Joakim Hove 0138fc43ef Merged upstream/master 2014-01-29 15:25:21 +01:00
Atgeirr Flø Rasmussen d5ebe3c685 Use correct number of items in initialiser. 2014-01-27 10:42:35 +01:00
Atgeirr Flø Rasmussen 924080d8dc Proper memorymanagement in test program. 2014-01-27 08:32:24 +01:00
Atgeirr Flø Rasmussen f9ea03fe67 Renamed SegmentedWellModel->WellDensitySegmented. 2014-01-24 15:54:01 +01:00
Atgeirr Flø Rasmussen a4b2044e14 Modified test case to match MRST test case. 2014-01-23 12:42:17 +01:00
Atgeirr Flø Rasmussen aa5d9d255b Added a test program for SegmentedWellModel.
The only currently tested case is a simple water injector.
2014-01-22 12:56:08 +01:00
Kristian Flikka b05630c310 parse function in libParser renamed, fixed in sim_fibo_ad 2014-01-13 08:43:39 +01:00
Kristian Flikka dba421316a Fixed sim_fibo_ad, by adding EclipseWriter 2013-12-05 13:38:40 +01:00
Kristian Flikka 35ce8d2932 Removed some debug code 2013-11-27 13:32:12 +01:00
Kristian Flikka 31b03a2572 Added new parser classes, simple step 1, loop through TSTEPS in Schedule 2013-11-27 13:32:12 +01:00
Kristian Flikka 031584aa81 Minor change to argument vector, to be according to the main() standard 2013-11-27 13:31:48 +01:00
Kristian Flikka 2de09d6d56 Removed use of deprecated boost native string func, replaced with string() 2013-11-27 09:10:54 +01:00
Kristian Flikka 5a2765a296 Updated test to match changed constructor of SimulatorFullyImplicitBlackoil 2013-11-26 15:16:21 +01:00
Kristian Flikka 3f68cbfe1b Fixed some rotten pointer/alloc code. Updated data paths 2013-11-26 14:46:07 +01:00
Kristian Flikka 111c9ee445 Added sim_fibo_ad_test, running two identical simulations with the SPE1 case 2013-11-26 12:55:41 +01:00
Arne Morten Kvarving 278ad83e7f loosen tolerance a bit to avoid failing tests on certain archs (i386, precise) 2013-10-23 09:41:26 +02:00
Arne Morten Kvarving e8386a32c1 changed: run test for a x different than pi
this to workaround roundoff differences occuring near sin(pi) on
different compilers/hardware
2013-10-16 11:35:47 +02:00
Atgeirr Flø Rasmussen 85f79c0e84 Rename AutoDiff::ForwardBlock -> Opm::AutoDiffBlock.
Also moved AutoDiffHelpers.hpp content to Opm namespace, and modified other
files as required by these two changes.
2013-09-19 12:53:28 +02:00
Atgeirr Flø Rasmussen e9b933bf4f Rename AutoDiff::Forward -> Opm::AutoDiff. 2013-09-19 11:32:47 +02:00
Andreas Lauser 0582ef08d8 explicitly include <iostream>
instead of relying on relying that some header includes it...
2013-09-05 12:28:16 +02:00
Andreas Lauser 51cb4f2cb8 Add exception handlers to all tutorials and examples 2013-09-05 12:28:04 +02:00
Jens Olav Nygaard d3a02e4891 Added ForwardBlock operator* for scalars. 2013-08-02 12:24:12 +02:00