Atgeirr Flø Rasmussen
8b8d029d2d
Merge pull request #1069 from babrodtk/fix_visc_output
...
Updated so that VOIL/VGAS/VWAT are supported keywords
2017-02-23 15:27:49 +01:00
Atgeirr Flø Rasmussen
6024a7ad78
Merge pull request #1070 from babrodtk/eigen_3.3_fix
...
This enables compiling with Eigen 3.3
2017-02-23 14:04:51 +01:00
babrodtk
ef1c8909f2
This enables compiling with Eigen 3.3
2017-02-23 11:34:41 +01:00
Atgeirr Flø Rasmussen
2577eee159
Add wellsToState() overload for dense well state class.
2017-02-23 10:35:11 +01:00
Atgeirr Flø Rasmussen
512ab189ee
Refactor to use wells_ data member.
2017-02-23 10:31:00 +01:00
Atgeirr Flø Rasmussen
7db75f1e12
Add needed include directive.
2017-02-23 10:22:19 +01:00
Atgeirr Flø Rasmussen
2e8ff72e9e
Rename template variable for clarity.
2017-02-23 10:21:45 +01:00
Atgeirr Flø Rasmussen
260944cfb0
Split Compat.hpp in header and implementation.
...
Avoids tedious recompiles of legacy sims when changing certain
ebos-specific classes.
2017-02-23 10:19:21 +01:00
Atgeirr Flø Rasmussen
5c9fb9d32a
Refactor setting of new members into own functions.
2017-02-23 09:51:00 +01:00
babrodtk
3e44bb1e4e
Updated so that VOIL/VGAS/VWAT are supported keywords
2017-02-22 11:18:24 +01:00
babrodtk
1e5df1b720
Added writing initial timestep data to restart
2017-02-22 10:12:47 +01:00
Atgeirr Flø Rasmussen
2797eca463
Merge pull request #1025 from andlaus/flow_ebos-fix-FIP
...
Flow ebos fix fip
2017-02-21 14:31:21 +01:00
Andreas Lauser
9dab0323ce
flow_ebos FIP: create the element iterator object as part of the for statement
...
IMO, the previous solution was easier to read and a few lines shorter,
but I don't really care about how this is done...
2017-02-21 13:53:08 +01:00
Andreas Lauser
1f7be0d324
flow_ebos FIP: add comments about the pore volume calculation
2017-02-21 13:33:24 +01:00
Andreas Lauser
a27a2c33a7
flow_ebos FIP: consider all pore volume modifiers
...
for now "all pore volume multipliers" means compressibility. the
storage term of the simulator includes them, so they need to be
considered when calculating the fluid in place as well.
2017-02-21 10:03:11 +01:00
Andreas Lauser
9df4b21369
flow_ebos: fix the calculation of the original fluid in place
...
for Norne the numbers are now very close to those of the ECL
reference. ("very close" means < 0.01 % deviation of pressure and
initial fluid volume for the field totals.)
2017-02-20 16:28:20 +01:00
Andreas Lauser
55547a1b86
flow_ebos FIP: try to fix hcpv and pres in the parallel case
...
the global reduction must be done _after_ the local computation, not
before it...
thanks to [at]blattms and [at]atgeirr.
2017-02-20 16:28:20 +01:00
Andreas Lauser
d03dbb7e2c
flow_ebos FIP: unify the parallel and non-parallel versions
2017-02-20 16:28:20 +01:00
Andreas Lauser
76a825f36d
flow_ebos: make the FIP code consistent with flow_legacy
...
in particular, the rock compressibility effects are not considered in
the FIP numbers anymore. While I'm not sure if this is correct or not,
it at least makes the results consistent with those produced by
'flow_legacy'.
2017-02-20 16:28:20 +01:00
Andreas Lauser
6949de699f
flow_ebos: improve the FIP code
...
in particular, it can now be called if the cache for the intensive
quantities is "cold".
2017-02-20 16:28:20 +01:00
Alf Birger Rustad
cac6a33a51
Merge pull request #1045 from akva2/more_summary_analysis
...
[WIP] Perform more analysis of summary regression test failures
2017-02-18 11:35:33 +01:00
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
