Kai Bao
4129928be4
when no THP control/limit, thp value will be set to zero.
...
It provides a strategy to reset the zero thp value when no thp control
is involved anymore.
2017-02-17 17:12:52 +01:00
Atgeirr Flø Rasmussen
d8aa0b7ddf
Merge pull request #1056 from babrodtk/pdpb_output
...
Added output of dew and bubble point pressures
2017-02-17 13:41:10 +01:00
babrodtk
d21443ae60
Updated auxillary=>auxiliary in new code
2017-02-17 10:44:52 +01:00
babrodtk
c39964c712
Added try-catch to computation of bubble/dew point pressure
2017-02-17 10:40:43 +01:00
babrodtk
4a46451d95
Added output of dew and bubble point pressures
2017-02-17 10:40:43 +01:00
Joakim Hove
dda6f58de0
Merge pull request #1062 from joakim-hove/build-trigger
...
White spcae change.
2017-02-17 10:38:15 +01:00
Arne Morten Kvarving
6183e78402
perform some more analysis on regression test failures
2017-02-16 16:00:42 +01:00
Joakim Hove
6ed41d282e
White spcae change.
2017-02-16 15:03:27 +01:00
Atgeirr Flø Rasmussen
cb899a425b
Merge pull request #1044 from akva2/update_norne_reference
...
added: update norne integration test from jenkins trigger
2017-02-16 14:05:11 +01:00
Atgeirr Flø Rasmussen
232687fc58
Merge pull request #1053 from GitPaean/fixing_thp_control
...
update the thp value for flow_ebos
2017-02-16 13:16:18 +01:00
Joakim Hove
a49aaeb579
Merge pull request #1059 from babrodtk/spellingfix
...
Renamed auxillary to auxiliary
2017-02-16 12:26:09 +01:00
Arne Morten Kvarving
d2730175a0
changed: perform all comparisons in regression tests in all cases
...
we want to process all comparisons, even if a previous comparison
failed. will aid further analysis
2017-02-16 11:07:38 +01:00
Kai Bao
71d777f839
update the thp value for flow_ebos
...
otherwise the thp constraint will not work.
2017-02-15 20:50:43 +01:00
Atgeirr Flø Rasmussen
68ff44ebbd
Merge pull request #1055 from GitPaean/pure_separating_standardWellsDense
...
Separating the StandardWellsDense to interface file and implementation file
2017-02-15 18:57:56 +01:00
Andreas Lauser
b088711186
Merge pull request #1057 from babrodtk/whitespace_fixes
...
Minor whitespace fixes to be consistent with surrounding code
2017-02-15 18:29:24 +01:00
babrodtk
edffbcd3f8
Renamed auxillary to auxiliary
2017-02-15 14:47:24 +01:00
babrodtk
8830fd5880
Minor whitespace fixes to be consistent with surrounding code
2017-02-15 14:30:54 +01:00
Kai Bao
8b38b7b8a3
finishing separating the StandardWellsDense.hpp implementations.
2017-02-15 10:07:22 +01:00
Kai Bao
498f40f896
fourth part in separating the StandardWellsDense.hpp implementations.
2017-02-15 10:07:22 +01:00
Kai Bao
2a3fe58ac2
third part in separating the StandardWellsDense.hpp implementations.
2017-02-15 10:07:22 +01:00
Kai Bao
8de7795629
the second part in separating the StandardWellsDense.hpp implementations.
2017-02-15 10:07:22 +01:00
Kai Bao
8354f3600f
the first part in separating the StandardWellsDense.hpp implementations.
...
split into commits for easy debugging purpose.
2017-02-15 10:07:22 +01:00
Atgeirr Flø Rasmussen
b358319e63
Merge pull request #1031 from totto82/newTrans
...
Start using face geometry computed the Ecl way
2017-02-15 10:04:01 +01:00
Atgeirr Flø Rasmussen
0ebff11099
Merge pull request #1047 from dr-robertk/PR/cleanup-output-writers
...
[WIP] Unify output writers to avoid code duplication.
2017-02-14 15:27:22 +01:00
dr-robertk
22cbaeea62
Merge pull request #4 from atgeirr/cleanup-output-writers-extra
...
Remove pessimizing move and silence warnings.
2017-02-14 11:08:15 +01:00
Atgeirr Flø Rasmussen
41fb8eb933
Remove pessimizing move and silence warnings.
2017-02-14 10:50:31 +01:00
Robert Kloefkorn
4c118c6455
Merge remote-tracking branch 'upstream/master' into PR/cleanup-output-writers
2017-02-13 21:28:54 +01:00
Robert Kloefkorn
b18f07c1bd
Address comments.
2017-02-13 16:11:24 +01:00
Atgeirr Flø Rasmussen
7e3e5bf026
Merge pull request #1037 from GitPaean/smaller_tol_wells_ebos
...
[Discussion] using smaller tolerance_wells for StandardWellsDense
2017-02-12 14:37:59 +01:00
Atgeirr Flø Rasmussen
26447b8776
Merge pull request #1052 from atgeirr/restore-build
...
Change include paths for moved headers.
2017-02-10 16:12:38 +01:00
Atgeirr Flø Rasmussen
27c0430932
Change include paths for moved headers.
2017-02-10 16:07:25 +01:00
Atgeirr Flø Rasmussen
12adcdf218
Merge pull request #1049 from akva2/import_adaptive_time_stepping
...
Import adaptive time stepping and associated classes
2017-02-10 15:17:02 +01:00
Arne Morten Kvarving
86fbb36fd2
adjustments for imported files
...
- adjust include paths
- add new test to build system
- add new example to build system
2017-02-10 13:02:00 +01:00
Arne Morten Kvarving
109780f62f
Import adaptive time stepping and simulator timer from opm-core
...
also import associated tests / examples
2017-02-10 12:04:11 +01:00
Robert Kloefkorn
82658c92d0
Removal of SimulatorFullyImplicitBlackoilOutputEbos.{h,c}pp.
...
All simulators now use SimulationDataContainer to store intermediate data that
is passed to the output Solution container. This is in cases not the most
efficient way, but it's unified to avoid errors from code duplication.
2017-02-09 16:57:45 +01:00
Arne Morten Kvarving
9f34dc492e
Merge pull request #1046 from akva2/no_empty_vectors
...
fixed: calculate FIP in substeps for summary output
2017-02-09 12:07:04 +01:00
Arne Morten Kvarving
c9bd40dccd
hot-fix ebos output class
...
it's the pointwise addition +, not the append
2017-02-09 09:35:40 +01:00
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
Arne Morten Kvarving
1cb81c12e8
changed: pass fipnum array into adaptive time stepping loop
...
needed as substep summary reports requires FIP data to be available.
add calculation of this data if output is requested and summary
config holds relevant keywords.
2017-02-09 09:33:32 +01:00
Arne Morten Kvarving
f9de2dee2a
added: update norne integration test from jenkins trigger
2017-02-02 11:16:00 +01:00
Kai Bao
4159542186
setting tolerance_wells to be 1.e-4.
...
for better convergence behavoir.
2017-01-31 10:50:10 +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
Andreas Lauser
04a1c25ebf
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
(ordering of the permeability matrices) 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.
in order to avoid code duplication, the permeability extraction
function of the RockFromDeck class is now made a public static
function and used as an implementation detail of the WellsManager.
finally, the permfield_valid_ attribute is removed from the
RockFromDeck class because this data was unused and not accessible via
the class' public API.
2017-01-27 12:51:12 +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