Commit Graph

5912 Commits

Author SHA1 Message Date
Jørgen Kvalsvik
bca5c8e8de Don't rely on Deck for checkTable and checkPhase
Prefer using EclipseState over Deck.
2016-12-20 14:08:58 +01:00
jokva
ec060d513b Merge pull request #1123 from jokva/read-pressure-swat-sgas-from-es
Read RS,RV,PRESSURE,SWAT,SGAS from EclipseState
2016-12-20 10:01:13 +01:00
Jørgen Kvalsvik
8cc624fd0d Read RS,RV,PRESSURE,SWAT,SGAS from EclipseState
Prefer reading these values from EclipseState rather than the Deck type.
2016-12-19 14:26:27 +01:00
Atgeirr Flø Rasmussen
4ea6611ecc Merge pull request #1117 from totto82/storeIfTimeStepFails
Store whether timestep failed or not
2016-12-19 12:21:31 +01:00
Tor Harald Sandve
2a3a825895 Store whether timestep failed or not
Used in flow ebos to tell the simulator to recalculate the cached
quantities for failed timesteps.
2016-12-19 10:52:59 +01:00
Atgeirr Flø Rasmussen
f65739c718 Merge pull request #1121 from andlaus/fix_build
add missing semicolon to fix the build
2016-12-16 11:08:54 +01:00
Andreas Lauser
62c56ff716 add missing semicolon to fix the build
some versions of boost seem to be more picky about this than others...
2016-12-16 10:29:52 +01:00
Joakim Hove
e53b0a58fa Merge pull request #1119 from jokva/pvtw-from-eclipsestate
Read PVTW from EclipseState
2016-12-06 22:41:39 +01:00
Jørgen Kvalsvik
f0b4c4f390 Read PVTW from EclipseState
Read the PVTW table entries from EclipseState rather than manually
through the Deck object.
2016-12-06 14:53:41 +01:00
Bård Skaflestad
28a02f6953 Merge pull request #1118 from atgeirr/remove-redundant-tests
Remove redundant tests.
2016-12-05 13:43:05 +01:00
Atgeirr Flø Rasmussen
dec5bdf7c4 Remove redundant tests.
The unit constant test has been added to opm-parser since the
unit support has been moved there. The parser test is simply
redundant.
2016-12-05 12:55:37 +01:00
Andreas Lauser
078de1b039 Merge pull request #1116 from andlaus/SimulatorReport_fix_substep_output
AdaptiveTimeStepping: fix stupid (but harmless) mistake in the sub-step info message
2016-12-03 15:08:05 +01:00
Andreas Lauser
b5b3507cb0 AdaptiveTimeStepping: fix stupid (but harmless) mistake in the sub-step info message
that was a copy-and-pasto: newton iterations = linearizations - 1
2016-12-03 15:04:32 +01:00
Atgeirr Flø Rasmussen
87650a3819 Merge pull request #1115 from atgeirr/remove-more-grid-stuff
Remove more files moved to opm-grid.
2016-12-01 13:52:35 +01:00
Atgeirr Flø Rasmussen
f72f996008 Merge pull request #1112 from andlaus/improve_SimulatorReport
Improve simulator report
2016-11-30 19:33:55 +01:00
Atgeirr Flø Rasmussen
fd552926d8 Remove more files moved to opm-grid. 2016-11-30 14:29:37 +01:00
Andreas Lauser
ce02a4bb92 clean up and extend the SimulationReport class
it now also accounts for assembly, linear solve, update and output
write time and indicates if an operation has converged.
2016-11-30 11:27:49 +01:00
Atgeirr Flø Rasmussen
ebfcea125d Merge pull request #1114 from akva2/update_jenkins_grid
update jenkins dependency graph
2016-11-29 22:50:09 +01:00
Arne Morten Kvarving
868d008353 update jenkins dependency graph
opm-grid is now an upstream
2016-11-29 21:54:08 +01:00
Atgeirr Flø Rasmussen
8d129d7172 Merge pull request #1113 from atgeirr/remove-grid-stuff
Move grid things to opm-grid.
2016-11-29 21:04:14 +01:00
Atgeirr Flø Rasmussen
ec85a922ac Update dune.module to reflect changed dependency graph. 2016-11-29 13:31:48 +01:00
Atgeirr Flø Rasmussen
c7cc24385a Remove files moved to opm-grid. 2016-11-29 13:25:22 +01:00
Atgeirr Flø Rasmussen
602f3252e6 Merge pull request #1103 from GitPaean/fixing_warning
warning fixed related to petsc
2016-11-23 12:37:31 +01:00
Joakim Hove
647e005297 Merge pull request #1109 from jokva/get-ref-depth-timestep
Ask for reference depth at timestep.
2016-11-22 23:12:34 +01:00
Arne Morten Kvarving
1edcdbc055 Merge pull request #1110 from akva2/update_downstreams_ewoms
update downstream list
2016-11-22 16:03:28 +01:00
Arne Morten Kvarving
1dd4500bd2 update downstream list
ewoms moved in the hierarchy
2016-11-22 15:24:56 +01:00
Jørgen Kvalsvik
cadb14c9e8 Ask for reference depth at timestep. 2016-11-22 14:22:09 +01:00
Atgeirr Flø Rasmussen
1e462f4c04 Merge pull request #1107 from GitPaean/fixing_findWellNode
Adding a flag to WellCollection whether group control active
2016-11-17 23:27:06 +01:00
Kai Bao
4427c85d77 a flag to WellCollection whether group control active 2016-11-17 16:26:19 +01:00
Atgeirr Flø Rasmussen
af874ada54 Merge pull request #1106 from atgeirr/remove-moved-tests
Remove tests that were moved to opm-output.
2016-11-17 10:41:06 +01:00
Atgeirr Flø Rasmussen
3c35e767d4 Remove tests that were moved to opm-output. 2016-11-17 09:47:58 +01:00
Bård Skaflestad
1429046029 Merge pull request #1105 from andlaus/fix_valgrind_errors
fix some valgrind errors in the init code
2016-11-16 19:08:48 +01:00
Andreas Lauser
1d98c3b8ca fix some valgrind errors in the EQUIL code
this fixes some valgrind errors while doing the twophase capability
for flow_ebos: In all previously tested cases, these errors were
probably non-fatal because the memory illegally accessed here is
likely to be allocated (but after this function was finished it
contained garbage).

note that I'm not completely sure if this patch is semantically
correct, so I'd appreciate some input who understands it. (what is
"z"?)
2016-11-16 17:20:24 +01:00
Kai Bao
fda1016532 warning fixed related to petsc 2016-11-16 15:35:35 +01:00
Atgeirr Flø Rasmussen
054fa92e61 Merge pull request #1104 from GitPaean/fixing_findWellNode
rewriting the findWellNode function
2016-11-16 15:00:13 +01:00
Kai Bao
6e4f9e708e rewriting the findWellNode function
with assuming we should always find the well in the well collection.
2016-11-16 14:27:15 +01:00
Joakim Hove
df920e4970 Merge pull request #1101 from jokva/changes-in-grouptree
GroupTree interface changed upstream
2016-11-16 13:26:58 +01:00
Atgeirr Flø Rasmussen
c901e2ec7c Merge pull request #1088 from GitPaean/group_control
group control_updating well production targets within a group.
2016-11-16 13:20:04 +01:00
Kai Bao
c3b00dc7fd fixing the comments.
No change in the functions and results.
2016-11-16 11:40:10 +01:00
Kai Bao
708bfd169b addressing a few comments. 2016-11-16 09:51:06 +01:00
Kai Bao
bf2f9b3f06 adding target_updated_ flag to WellNode
to save some repeated efforts when updating Well Targets.
2016-11-16 09:43:28 +01:00
Kai Bao
55eec0b2ed checking whehter need to update before updateWellTargets. 2016-11-15 13:56:49 +01:00
Kai Bao
f9f5bacee4 cleaning up more unused flag from WellsGroup 2016-11-11 11:29:12 +01:00
Joakim Hove
0cf4021698 Merge pull request #1102 from jokva/stack-allocd-items
Use new DeckItem constructor interface.
2016-11-11 11:07:34 +01:00
Kai Bao
91b8c872eb removing a few not-used function with the new strategy. 2016-11-10 17:50:30 +01:00
Kai Bao
95997e208c different strategy is using when updating the well targets
When the group has wells both under individual control and group
control, since the well rates under individual control changes each
iteration, the well targets for this kind of group need to be updated
each iteration.

When we change to use implicit well potentials later, which is supposed
to be more accurate, we probably should always (unless we decided not to)
update the well targets each iteration.
2016-11-10 17:22:25 +01:00
Kai Bao
085785bf26 adding function findWellNode() to WellCollection
to return the WellNode* instead of WellGroupInterface*
2016-11-10 16:28:40 +01:00
Kai Bao
b319e1a75d cleaning up and adding more comments for better understanding.
No functional change.
2016-11-10 16:28:40 +01:00
Kai Bao
3e8b1bdb82 applying the efficiency factor to VREP control. 2016-11-10 16:28:40 +01:00
Kai Bao
76a2108ea9 adding VREP injection support.
not handling multiple injection wells for moment.
2016-11-10 16:28:40 +01:00