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

4954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arne Morten Kvarving
be2ab082ad add check-commits target 2014-10-20 14:52:52 +02:00
Atgeirr Flø Rasmussen
978e32de16 Merge pull request #662 from dr-robertk/timestepcontrol 
Timestepcontrol
 2014-10-20 12:40:21 +02:00
Robert Kloefkorn
42bcb5f0c8 address Atgeirs comments. 2014-10-20 12:32:11 +02:00
Robert Kloefkorn
e552acc244 Merge remote-tracking branch 'upstream/master' into timestepcontrol 2014-10-17 11:28:04 +02:00
Joakim Hove
7e1eb963f3 Merge pull request #666 from joakim-hove/WCONDPROD-SHUT 
Wcondprod shut
 2014-10-17 08:06:01 +02:00
Joakim Hove
68b915530e Minor whitespace fixup 2014-10-17 08:05:13 +02:00
Joakim Hove
5720e5e785 Updated WellsManager testing 2014-10-16 16:34:00 +02:00
Robert Kloefkorn
f8e61c0267 also catch std::runtime_error, i.e. convergence of linear solver failed. 2014-10-14 15:18:36 +02:00
Jørgen Kvalsvik
d380d1759e Reduces CHKERRXX usage to where necessary. 
The error checking macro makes it harder to read and harder to write, so
instead we now only check for functions  that can contain errors. Bounds and
range checks are handled by PETSc and not OPM.
 2014-10-14 14:43:42 +02:00
Jørgen Kvalsvik
4a79f2e2ca Petsc constructor now uses intialiser list. 
The previous implementation set plenty of values in the initialization list and
immediately overwrote these values with values looked up from the param group.
This patch makes it look up the parameteres from the param group argument,
making the constructor simpler.
 2014-10-14 14:43:42 +02:00
Jørgen Kvalsvik
2917387845 Makes using wrong constructor a compile-time error 
Petsc only supports initialisation through the ParameterGroup constructor.
Calling the default, non-arg constructor is a static error, and not
implementing it makes using it break compiles.
 2014-10-14 14:43:42 +02:00
Jørgen Kvalsvik
5ed0f73ba2 Removes call_petsc.c and calls the lib from C++ 
call_petsc.c was really a thin C wrapper around the call to petsc itself and
turns out was mostly unnecessary C++ emulation. This removes the file entirely
and ports its functionality into LinearSolverPetsc.cpp.

All features from the file should now be more readable as well as properly
utilising modern C++ features.

The patch uses the CHKERRXX macro from petsc to handle errors reported by
petsc, and currently does not handle this and give the control back to OPM's
error/throw system.
 2014-10-14 14:43:42 +02:00
Joakim Hove
72cde22f62 Bug in well_index increment in WellsManager 2014-10-14 12:43:57 +02:00
Joakim Hove
dd87b8fc52 Will not update WellControls if cmode == CMODE_UNDEFINED 2014-10-14 12:42:55 +02:00
Joakim Hove
37c563689c ControlMode is left undefined if it unset in deck. 2014-10-14 12:34:58 +02:00
Robert Kloefkorn
164b892c17 added initial fraction to initialize last_timestep. 2014-10-13 11:17:37 +02:00
Robert Kloefkorn
44f90f974e Two small adjustments that came up when running in debug mode. 2014-10-10 13:55:28 +02:00
Robert Kloefkorn
2fcb3c6638 Merge remote-tracking branch 'upstream/master' into timestepcontrol 2014-10-08 16:42:32 +02:00
Joakim Hove
41d326f95d Merge pull request #664 from joakim-hove/well-shut-test 
Well shut test
 2014-10-08 12:54:43 +02:00
Andreas Lauser
16658430cc WellsManager: do not require a control mode to be set if the well status is SHUT 
For Norne it fell on its nose because of this...
 2014-10-08 12:35:38 +02:00
Robert Kloefkorn
80431e273f ok, now we got it. euclidianNormSquared. 2014-10-07 14:14:31 +02:00
Joakim Hove
08d6cbcafa Added test for SHUT well 2014-10-07 12:12:15 +02:00
Joakim Hove
6a16b0f1e5 Removed 'dead' data at the end of test data. 2014-10-07 12:11:17 +02:00
Robert Kloefkorn
ba316dd651 more convenient name. 2014-10-07 10:45:09 +02:00
Robert Kloefkorn
b111fbbb15 innerProduct --> euclideanNorm2. 2014-10-07 10:40:44 +02:00
Robert Kloefkorn
ef813c94cc inner_product --> innerProduct. Avoid confusion with std version. 2014-10-07 09:52:22 +02:00
Robert Kloefkorn
b250383ae0 use unit::convert::to instead of hard coded 86400 factor. 2014-10-07 09:48:57 +02:00
Robert K
355e68c63b move implementation to .cpp files. 2014-10-06 14:26:23 +02:00
Robert K
3f8d379c7f added new files. 2014-10-06 14:25:44 +02:00
Robert K
f6b1ac3556 Merge remote-tracking branch 'upstream/master' into timestepcontrol 2014-10-06 14:06:35 +02:00
Robert K
5af49ed90b the adaptive time stepping utility classes. 2014-10-06 14:06:07 +02:00
Andreas Lauser
a910f9f632 Merge pull request #659 from OPM/fix_cmake_3_0_warnings 
set CMake policies CMP0026 and CMP0048 to OLD
 2014-10-06 09:19:31 +02:00
Robert K
879dddc9b6 move protected area to the bottom and remove unused lines as well as halfTimeStep method. 2014-10-03 15:53:18 +02:00
Robert K
e1d1063e0d remove white spaces. 2014-10-03 14:14:01 +02:00
Robert K
0ed28121a1 reset to old state. 2014-10-03 14:10:56 +02:00
Robert K
e69c37167c renamed and split advance method. 2014-10-03 13:44:05 +02:00
Robert K
c371d4fa22 class for handling adaptive time steps. 2014-10-03 13:33:13 +02:00
Robert K
f6c9bc9090 improvement of the time step adjustment. 2014-10-02 14:04:32 +02:00
Andreas Lauser
7d8cb7f24f set CMake policies CMP0026 and CMP0048 to OLD 
this is required for CMake 3.0 to stop it complaining that we access
the LOCATION target property and set the *_VERSION_* variables ourselves.
 2014-10-01 14:26:22 +02:00
Robert K
92d5f43d82 sub step simulator timer. 2014-10-01 13:56:27 +02:00
Robert K
9517359d3f reset master. 2014-10-01 13:55:42 +02:00
Robert K
d42d0a6cbe SubStepSimulationTimer for time step control. Needs documentation and cleanup. 2014-09-30 15:55:26 +02:00
Atgeirr Flø Rasmussen
c3551dfdad Merge pull request #657 from GitPaean/PVT_viscosity_try 
Obtaining viscosity by doing a linear interpolation of the inverse of B*mu instead of mu directly.
 2014-09-23 22:44:37 +02:00
Kai Bao
ee265f5cb5 Changing the tolerance for blackoilfluid tests. 
Using the original strict relative tolerance for other properties than viscosity.
 2014-09-23 14:38:32 +02:00
Kai Bao
ef3e524c30 Changing nColumns to nRows. 2014-09-23 13:17:47 +02:00
Atgeirr Flø Rasmussen
c0627c2305 Merge pull request #654 from andlaus/fix_rate_conversion 
Fix rate conversion
 2014-09-22 14:36:52 +02:00
Kai Bao
175da5450f Changing the location of * in long formula. 2014-09-22 14:29:18 +02:00
Kai Bao
6a43935ea3 Deleting some commented lines. 2014-09-22 14:26:00 +02:00
Kai Bao
09404202da Changing the naming in PvtDead. 
To be consistent with the naming int PvtLive.
 2014-09-22 14:21:33 +02:00
Andreas Lauser
7ce561095c EclipseWriter: don't convert the unit inside the rate() function 
because if that is done, the integration for the production total is
wrong because the time step length is days and not seconds.

Note that the conversion now uses Opm::unit::convert::to(<>,
1/conversionFactor) instead of simply multiplying with the conversion
factor. I still think this obfuscates things more than it helps, but
[at] bska will hopefully want it this way...
 2014-09-22 14:16:41 +02:00