Arne Morten Kvarving
a14f5392ee
fixed: pass the fipnum data into the adaptive timer stepper
...
summary substep reports requires FIP data
2017-02-09 09:35:40 +01:00
Arne Morten Kvarving
b5b42faba4
fixed: handle exceptions in I/O in parallel
...
properly exit on all processes, instead of deadlocking.
async output will still deadlock as there is no way to handle this
without syncronization which would defeat the purpose of async.
2017-02-09 09:35:40 +01:00
Atgeirr Flø Rasmussen
c9813886ba
Merge pull request #1043 from andlaus/fix_build
...
fix the build
2017-01-27 14:51:04 +01:00
Andreas Lauser
ec1f136f37
fix the build
...
and also, do not std::move a unique_ptr. (that's a quite strange
thing, semantically.)
2017-01-27 13:23:32 +01:00
Atgeirr Flø Rasmussen
511a934323
Merge pull request #1042 from andlaus/refactor_well_permeability
...
do not explicitly pass the permeability to the well model anymore
2017-01-27 13:15:59 +01:00
Andreas Lauser
42ec0ca3c3
do not explicitly pass the permeability to the well model anymore
...
this information is already part of the EclipseState. The reason why
this should IMO be avoided is that this enforces an implementation
detail (ordering of the permeability matrices) of the simulator on the
well model. If this needs to be done for performance reasons, IMO it
would be smarter to pass an array of matrices instead of passing a raw
array of doubles. I doubt that this is necessary, though: completing
the full Norne deck takes about 0.25 seconds longer on my machine,
that's substantially less than 0.1% of the total runtime.
2017-01-27 13:06:09 +01:00
Atgeirr Flø Rasmussen
1b8dbd9411
Merge pull request #1040 from GitPaean/group_ebos_vrep
...
Group ebos vrep
2017-01-27 13:04:16 +01:00
Joakim Hove
5697b4377b
Merge pull request #999 from joakim-hove/restart-keys
...
Passing keys to the restart load function.
2017-01-27 08:26:19 +01:00
Atgeirr Flø Rasmussen
72a83222a1
Merge pull request #1038 from akva2/test_update_automation
...
refinement in regression data update script to aid automation
2017-01-26 13:54:03 +01:00
Arne Morten Kvarving
e12aecc3f5
bug introduced by macro reuse
...
there was another reason for the dedicated macro - the output directory
for the tests. add another macro parameter to handle this
2017-01-26 12:13:58 +01:00
Arne Morten Kvarving
c5d27bf6ed
refinement in regression data update script to aid automation
2017-01-26 10:52:49 +01:00
Joakim Hove
270e5f9c0e
Passing keys to the restart load function.
...
- Renamed EclipseWriter -> EclipseIO.
- Loading from restart file is a method on the EclipseIO class.
2017-01-25 23:16:08 +01:00
Kai Bao
c3f3fed47a
applying the efficiency factor to all the Jacobians
...
of the cq_s when entering the reservoir mass balance equations.
2017-01-25 15:56:15 +01:00
Kai Bao
68558bec76
moving the update the well_state at the end of the updatewellCotnrols
...
in StandardWellsDense.
The reason is that the update the well controls can change the well
controls. It is better to update the well states after all the control
checking is done.
2017-01-25 14:11:27 +01:00
Kai Bao
26785597b9
putting the update of the well states to one function
...
in StandardWellsDense to simplify the updateWellControls() function.
2017-01-25 14:11:27 +01:00
Kai Bao
19eb0d96c8
adding applyVREPGroupControl() to StandardWellsDense.
2017-01-25 14:11:27 +01:00
Kai Bao
849dae8ec5
adding computeWellVoidageRates() to StandardWellsDense
2017-01-25 14:11:27 +01:00
Kai Bao
f53bf6f957
adding a pointer to rate_converter in BlackoilModelEbos
...
in StandardWellsDense.
2017-01-25 14:11:27 +01:00
Kai Bao
af26b70fc9
adding a rate converter to BlackoilModelEbos
...
and also function updateRateConverter() to update its state.
2017-01-25 14:11:27 +01:00
Arne Morten Kvarving
4ff9996f80
Merge pull request #1035 from joakim-hove/increase-restart-tol
...
Relaxed epsilon for restart test.
2017-01-25 10:19:22 +01:00
Joakim Hove
557e4d7f04
Reversed relaxed tolerances for parellel tests.
2017-01-23 13:35:56 +01:00
Joakim Hove
ba4cc12f73
Named tolerances used for parallel testing.
2017-01-23 13:34:48 +01:00
Joakim Hove
2e721eb9e0
Relaxed tolerances for restart testing.
2017-01-23 13:34:48 +01:00
Arne Morten Kvarving
9ee2af940d
Merge pull request #1036 from akva2/documentation_ramblings
...
attempt to add some documentation
2017-01-23 13:19:49 +01:00
Arne Morten Kvarving
850d9571e8
pass tolerances in the tedious way to avoid scoping confusion
2017-01-23 13:16:30 +01:00
Atgeirr Flø Rasmussen
f4ea6c0781
Merge pull request #1034 from GitPaean/fixing_ebos_lrat
...
fixing the LRAT control for StandardWellsDense
2017-01-23 13:06:39 +01:00
Arne Morten Kvarving
e62120f872
pass test prefix to macro
...
allows unifying two macros
2017-01-23 11:44:21 +01:00
Arne Morten Kvarving
9e8093b2a3
rename some macros
2017-01-23 11:44:21 +01:00
Kai Bao
2dd4fa5bb2
fixing the LRAT control for StandardWellsDense
2017-01-23 11:30:23 +01:00
Arne Morten Kvarving
e857c151d6
attempt to add some documentation
2017-01-23 10:42:09 +01:00
Joakim Hove
5798e3475c
Merge pull request #1032 from joakim-hove/increase-abs-dev
...
Increased tolerances when running parallel tests.
2017-01-21 08:45:37 +01:00
Joakim Hove
07d90b5c8d
Increased tolerances when running parallel tests.
2017-01-21 08:44:23 +01:00
Atgeirr Flø Rasmussen
f01541ce80
Merge pull request #1033 from andlaus/update_dune.module
...
update the dune.module file
2017-01-20 15:32:29 +01:00
Andreas Lauser
7d5c5f8acc
Merge pull request #1029 from totto82/bugfix_swatinit
...
BUGFIX Pass solution from flowEbos to ebos initially
2017-01-20 15:02:50 +01:00
Andreas Lauser
e982ece15d
update the dune.module file
2017-01-20 13:30:20 +01:00
Tor Harald Sandve
ce2aa77cbd
BUGFIX Pass solution from flowEbos to ebos initially
...
The initial solution in ebos and in flowebos are different in cases where
swatinit is present. Pass the initial solution and recalculate the
intensive quantities make sure that the flowEbos initial solution is
used.
2017-01-19 09:18:55 +01:00
Atgeirr Flø Rasmussen
9840ddd261
Merge pull request #1028 from akva2/update_reference_data
...
Update reference data
2017-01-18 14:01:50 +01:00
Atgeirr Flø Rasmussen
6d6546284c
Merge pull request #1021 from GitPaean/group_ebos
...
Group controls for flow_ebos
2017-01-18 13:52:17 +01:00
Arne Morten Kvarving
ab66125297
make sure working tree is clean before execution
2017-01-18 11:42:34 +01:00
Arne Morten Kvarving
532faf8f72
rename script
2017-01-18 11:31:39 +01:00
Arne Morten Kvarving
6e84c85e42
allow relative paths to toolchain file
2017-01-18 10:48:35 +01:00
Kai Bao
31e7dec018
removing a few blank lines.
...
and adding a assertion that bhp != 0 when calculating well potentials.
2017-01-17 15:33:45 +01:00
Arne Morten Kvarving
ea06f12d25
fixed: print correct command at end of update helper
...
do not point user to deps/opm-data, use the user-supplied directory.
also add missing ewoms hash to output, consistently use $WORKSPACE
everywhere and correct variable used for spe3|spe9 in data update loop
2017-01-17 10:49:50 +01:00
Kai Bao
9e93ebcc64
check whether the group targets are converged.
2017-01-16 16:18:35 +01:00
Kai Bao
65a3fff6f2
moving computeWellPotentials to be earlier in assemble()
...
in StandardWellsDense.
solveWellEq then have access to the updated well potentials.
does not change the result.
2017-01-16 16:18:35 +01:00
Kai Bao
01322b740e
fixing the mistakes in the code due to rebasing.
2017-01-16 16:18:35 +01:00
Kai Bao
a95977e716
making the group control works for StandardWellsDense
2017-01-16 16:18:35 +01:00
Kai Bao
b0e2bd9221
adding well perforation efficiency factor to StandardWellsDense
...
And also calculateEfficiencyFactor to initialize the values.
2017-01-16 16:18:35 +01:00
Kai Bao
4b47fa52ca
adding well collection to StandardWellsDense
...
to make StandardWellsDense have access to the group information.
2017-01-16 16:18:35 +01:00
Kai Bao
941689722f
adding functioin computeWellPotentials to StandardWellsDense
2017-01-16 16:18:35 +01:00