Commit Graph

2284 Commits

Author SHA1 Message Date
Kai Bao
b5e2c5262f using rs rv from grid cells when calculating the volume ratio
during computeWellFlux for StandardWellsDense.
2017-03-02 14:21:00 +01:00
babrodtk
ba2973dbbe Fixed apparent bug in outputting PDPB 2017-02-27 10:28:31 +01:00
Atgeirr Flø Rasmussen
930f0ea9a0 Merge pull request from atgeirr/fix-conditional-visc-output
Fix conditional viscosity output
2017-02-24 17:55:18 +01:00
Andreas Lauser
bb56d53150 Merge pull request from babrodtk/initial_restart
Update for writing initial values to restart file
2017-02-24 16:04:38 +01:00
babrodtk
6ed7b9dcb9 Moved computation of FIP before output to summary 2017-02-24 11:32:36 +01:00
Atgeirr Flø Rasmussen
cef4f5d9e5 Avoid signed/unsigned comparison. 2017-02-24 10:57:17 +01:00
Atgeirr Flø Rasmussen
980a6191b2 Bugfix: make viscosity output conditional. 2017-02-24 10:56:44 +01:00
babrodtk
729a220e5c Updated to iterate over elements instead of cell indices, though this changes the output values 2017-02-24 10:48:42 +01:00
Atgeirr Flø Rasmussen
296b0c61d6 Merge pull request from babrodtk/initial_restart
Added writing initial timestep data to restart
2017-02-24 09:17:30 +01:00
Atgeirr Flø Rasmussen
10f6c64502 Merge pull request from atgeirr/fix-wellstate
Towards fixing restart for flow_ebos
2017-02-24 09:11:25 +01:00
Atgeirr Flø Rasmussen
560b39e933 Merge pull request from dr-robertk/PR/revert-1070
Revert PR 1070 to use auto instead of preprocessor statements.
2017-02-24 08:56:34 +01:00
Robert Kloefkorn
9e30d4b27c Revert PR 1070 to use auto instead of preprocessor statements. 2017-02-23 15:46:52 +01:00
Atgeirr Flø Rasmussen
3071807418 Add docs for Compat.hpp. 2017-02-23 15:39:58 +01:00
Atgeirr Flø Rasmussen
8b8d029d2d Merge pull request from babrodtk/fix_visc_output
Updated so that VOIL/VGAS/VWAT are supported keywords
2017-02-23 15:27:49 +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
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
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
6ed41d282e White spcae change. 2017-02-16 15:03:27 +01:00
Atgeirr Flø Rasmussen
232687fc58 Merge pull request 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 from babrodtk/spellingfix
Renamed auxillary to auxiliary
2017-02-16 12:26:09 +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 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 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 from totto82/newTrans
Start using face geometry computed the Ecl way
2017-02-15 10:04:01 +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