osae
92ee3cd86b
Rename eclState to eclipseState.
2014-11-05 16:10:05 +01:00
osae
8f8450f018
Base initialisation of SWL etc on EclipseState ...
...
Thus allowing an unmodified Norne deck.
2014-11-05 16:10:05 +01:00
osae
ba6de11151
Bugfix: Actually use column index ...
2014-11-05 16:10:05 +01:00
osae
877b501659
Cleaning up and preparation for eclipseState.
2014-11-05 16:10:05 +01:00
Atgeirr Flø Rasmussen
e2fdf14ee3
Suppress unused argument warning.
2014-11-05 07:51:21 +01:00
Andreas Lauser
1ee4bc514b
Merge pull request #676 from atgeirr/bugfix-simple-simulator
...
Bugfix: avoid using TimeMap without deck.
2014-11-03 16:24:19 +01:00
Atgeirr Flø Rasmussen
495699fde6
Use existing TimeMap, instead of creating new.
2014-11-03 13:33:30 +01:00
Atgeirr Flø Rasmussen
702859c5e3
Bugfix: avoid using TimeMap without deck.
...
This made the simulator crash when there is no deck involved.
2014-11-03 11:15:37 +01:00
Atgeirr Flø Rasmussen
1d7b5f2217
Merge pull request #673 from totto82/shut_wells_fix
...
BUGFIX Shut wells
2014-10-27 10:13:43 +01:00
Tor Harald Sandve
0dd70b1416
The wellmanager test is modified to account for not adding shut wells
...
Shut wells are not added to the well list and the well manager test is
modified accordinly.
2014-10-27 07:23:58 +01:00
Tor Harald Sandve
401b193854
BUGFIX. Do not increase well index for shut wells.
...
Shut wells are not added to the well list and the well index should
therefore not be increased when well control is set. This is similar to
whats is done for shut wells in createWellsFromSpecs.
2014-10-27 07:20:03 +01:00
Atgeirr Flø Rasmussen
b7a6680ef4
Merge pull request #672 from dr-robertk/PR/remove-unused-typedef-warning
...
remove unused typedef to avoid compiler warning and keep code clean.
2014-10-24 14:28:55 +02:00
Atgeirr Flø Rasmussen
ad8310543e
Merge pull request #671 from dr-robertk/PR/timestepcontrol-fixrestart
...
Fix solver restart counter.
2014-10-24 14:27:49 +02:00
Robert K
81d3281999
remove unused typedef to avoid compiler warning and keep code clean.
2014-10-24 12:51:57 +02:00
Robert K
12891f668b
fix problem with solver reastart, variable was not reset.
...
Also, the time step does only grow moderately after a solver restart.
2014-10-24 12:32:00 +02:00
Atgeirr Flø Rasmussen
12cd6d9f1e
Merge pull request #670 from totto82/shut_wells
...
Fix SHUT wells
2014-10-24 11:30:06 +02:00
Tor Harald Sandve
2b1dc85804
Make the comment in test_wellsmanager more precise
...
The comment now precisly says that Shut wells are not added instead to
the well list instead of removed.
2014-10-24 07:05:43 +02:00
Tor Harald Sandve
2ff42c327b
SHUT wells returns 0
...
Shut wells returns 0 for bhp and rates in the EclipseWriter
2014-10-24 07:01:36 +02:00
Tor Harald Sandve
c659c080cb
Fix SHUT wells
...
Shut wells are not added to the well list and thus not considered in the
simulator.
The shut well test in test_wellsmanager is modified to assert this
behaviour.
BUG: This change provokes an assert in the EclipeWriter as number of
wells in wellstate is different from number of wells in the schedule.
2014-10-24 06:57:38 +02:00
Bård Skaflestad
bc862c8125
Merge pull request #663 from akva2/check_commits
...
add check-commits target
2014-10-21 13:43:48 +02:00
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
