Commit Graph

3564 Commits

Author SHA1 Message Date
Liu Ming
431a21d632 write simulation details to log file. 2016-05-09 13:33:44 +08:00
Atgeirr Flø Rasmussen
60b00a0ddf Merge pull request #673 from akva2/simplify_jenkins_build_scripts
simplify jenkins build scripts a little
2016-05-04 10:17:26 +02:00
Atgeirr Flø Rasmussen
8e550bf98c Merge pull request #668 from qilicun/get-messages-from-parser
extract messages from parser.
2016-05-04 10:16:57 +02:00
Pål Grønås Drange
e02927dbf5 Merge pull request #676 from pgdr/nnc-simple-fixup
The getNNC API in Parser changed; remove *
2016-05-04 08:57:04 +02:00
Pål Grønås Drange
96d073a13e set default output directory to . 2016-05-03 17:38:29 +02:00
Pål Grønås Drange
c5d68f802a one line shared_ptr to ref fix 2016-05-03 15:38:04 +02:00
Joakim Hove
58851e8c02 Merge pull request #666 from kjellkongsvik/clean_EclipseWriter
Remove parameters from EclipseWriter constructor
2016-05-03 15:37:30 +02:00
Atgeirr Flø Rasmussen
e4f3622ee1 Merge pull request #675 from atgeirr/bump-version
dune.module: change version to 2016.10-pre
2016-05-03 14:36:54 +02:00
Atgeirr Flø Rasmussen
ac6a8f7229 dune.module: change version to 2016.10-pre 2016-05-03 14:31:32 +02:00
Atgeirr Flø Rasmussen
7b85cb306a Merge pull request #674 from akva2/add_flow_mpi_installation
Add flow mpi installation
2016-05-02 10:59:47 +02:00
Arne Morten Kvarving
6df328d56e added: mark flow_mpi for installation 2016-05-02 10:57:09 +02:00
Liu Ming
8f34d9e375 Merge pull request #1 from atgeirr/update-get-messages-from-parser
Update get messages from parser branch
2016-05-01 12:24:25 +08:00
Arne Morten Kvarving
acf6d3b7dc simplify jenkins build scripts a little
changes done related to downstream triggers made
it easier to build upstreams as well
2016-04-30 10:00:57 +02:00
Bård Skaflestad
3c590f9352 Merge pull request #672 from akva2/fix_build_with_g++_53
fixed: build with g++ 5.3
2016-04-29 21:16:39 +02:00
Arne Morten Kvarving
5bc252c4ab fixed: build with g++ 5.3
this partially fixes the build on ubuntu xenial.
it also breaks due to an updated eigen, but with this
you can build with the old eigen instead of the distro
supplied eigen.
2016-04-29 19:02:56 +02:00
Atgeirr Flø Rasmussen
c11d322ef8 Merge pull request #662 from GitPaean/well_refactoring_keep_moving
More functions moved to StandardWells
2016-04-29 15:29:22 +02:00
Atgeirr Flø Rasmussen
34bc69c257 Move helpers to the detail namespace, layout changes.
The helpers were moved to the bottom of the file for clarity.
Misc. layout and whitespace changes, also fix two minor
errors in comments.
2016-04-29 14:59:18 +02:00
Atgeirr Flø Rasmussen
8ea71e2f15 Use a small lambda to avoid repeating code. 2016-04-29 14:58:44 +02:00
Atgeirr Flø Rasmussen
5fac939afb Merge branch 'get-messages-from-parser' of https://github.com/qilicun/opm-simulators into qilicun-get-messages-from-parser 2016-04-29 14:42:37 +02:00
Kjell W. Kongsvik
be1ffec94f Remove phaseUsage parameter as it can be found internally 2016-04-29 13:12:43 +02:00
Kjell W. Kongsvik
e4688c32ce Reverted back parameters so that output grid is not unsafely recreated 2016-04-29 13:06:36 +02:00
Kjell W. Kongsvik
c7bbd2489e Use output_dir_ member instead of querying the parameters again. 2016-04-29 13:06:36 +02:00
Kjell W. Kongsvik
385c7e74d2 Remove parameters from EclipseWriter constructor 2016-04-29 13:06:36 +02:00
Kai Bao
08e691e262 moving variableWellStateInitials to StandardWells. 2016-04-29 10:07:10 +02:00
Kai Bao
15380fd370 moving variableWellStateIndices to StandardWells
Probably it is the time to introduce SeqQs and SeqP for the
multi-segment wells.
2016-04-29 10:07:10 +02:00
Kai Bao
e7d00f4f99 adding variableStateWellIndices to StandardWells
to handle different types of variables later for different types of
wells.
2016-04-29 10:07:10 +02:00
Kai Bao
b87920e5e4 moving computeWellPotentials to StandardWells 2016-04-29 10:07:10 +02:00
Kai Bao
13acc8ee03 moving computeWellConnectionPressures to StandardWells
the results look okay, while the running for flow_solvent needs further
investigation even the results with flow_solvent actually look okay.

With two different version of
computePropertiesForWellConnectionPressures, flow_solvent produces the
same results. This is something needs further investigation.

The current implementation requires a copy of
computeWellConnectionPressure in StandardWells and StandardWellsSolvent.
That means probably we need to introduce the asImpl() for the Wells.
2016-04-29 10:07:10 +02:00
Kai Bao
dcca0b0b76 moving addWellControlEq to StandardWells 2016-04-29 10:07:10 +02:00
Kai Bao
eb278c3c9a moving addWellFluxEq() to StandardWells
Conflicts:
	opm/autodiff/BlackoilModelBase_impl.hpp
2016-04-29 10:07:10 +02:00
Liu Ming
c23fa6f359 correct spelling. 2016-04-29 14:16:48 +08:00
Liu Ming
f29f087435 extract messages from parser. 2016-04-29 14:13:21 +08:00
Joakim Hove
ef05a64a88 Merge pull request #664 from joakim-hove/remove-python
Removed stale test code
2016-04-29 08:01:42 +02:00
Joakim Hove
240e08733e Merge pull request #663 from joakim-hove/restart-refactor
Change method name -> IOConfig::restart()
2016-04-28 22:20:31 +02:00
Joakim Hove
ead88e9ee4 Change method name -> IOConfig::restartRequested() 2016-04-28 15:58:17 +02:00
Atgeirr Flø Rasmussen
ec04d7f33b Merge pull request #661 from babrodtk/two_phase_bugfixes
Two phase bugfixes
2016-04-28 15:42:55 +02:00
Joakim Hove
db3bbbe65e Removed stale test code 2016-04-26 17:51:11 +02:00
babrodtk
1846c4146d Merge branch 'atgeirr_twophase' into two_phase_bugfixes 2016-04-26 08:25:20 +02:00
Atgeirr Flø Rasmussen
0d85f3642c Access water/gas quantities only if active phase. 2016-04-26 08:24:54 +02:00
babrodtk
613052525b Code cleanup 2016-04-26 07:49:12 +02:00
babrodtk
a1504a2bff Runs first iterations of two-phase case plausibly 2016-04-26 07:49:12 +02:00
babrodtk
2ac514a1ea Checkpoint 2016-04-26 07:49:12 +02:00
Arne Morten Kvarving
70e13d1988 fixed: debian packaging
superlu package name changed in xenial
2016-04-22 17:00:29 +02:00
Atgeirr Flø Rasmussen
b436818439 Merge pull request #660 from GitPaean/fixing_polymer_running_without_polymer
fixing flow_polymer running cases without polymer.
2016-04-21 13:33:52 +02:00
Kai Bao
9afadffea9 fixing flow_polymer running cases without polymer. 2016-04-21 12:59:11 +02:00
Atgeirr Flø Rasmussen
cc8facc378 Merge pull request #659 from GitPaean/fixing_flow_solvent_running_without_solvent
adding the has_solvent_ flag to StandardWellsSolvent
2016-04-21 12:28:54 +02:00
Atgeirr Flø Rasmussen
fd75fbe4c9 Merge pull request #658 from atgeirr/master
Silence some recently introduced warnings.
2016-04-21 11:47:50 +02:00
Kai Bao
cc79dff708 adding the has_solvent_ flag to StandardWellsSolvent
flow_solvent is able to run cases without solvent.
2016-04-21 11:17:39 +02:00
Atgeirr Flø Rasmussen
4af2b4a915 Silence some recently introduced warnings. 2016-04-21 10:29:09 +02:00
Joakim Hove
1f64f79f6d Merge pull request #657 from pgdr/eclipsegrid-is-input
Using getInputGrid API from Parser
2016-04-20 15:50:33 +02:00