Atgeirr Flø Rasmussen
a0a3d67c04
Merge pull request #113 from akva2/use_config_mode
...
Use config mode
2015-05-27 12:31:57 +02:00
Atgeirr Flø Rasmussen
82da34ddd3
Merge pull request #109 from atgeirr/refactor-solver
...
Start refactor fully implicit polymer solver
2015-05-22 12:41:01 +02:00
Atgeirr Flø Rasmussen
59bd1391a8
Update polymer solver with convergence features from opm-autodiff.
...
Original patches by Tor Harald Sandve and Markus Blatt.
2015-05-21 16:29:01 +02:00
Atgeirr Flø Rasmussen
d7de9894e0
Follow minor API changes in opm-autodiff.
2015-05-21 09:50:54 +02:00
Atgeirr Flø Rasmussen
c700b2124d
Merge pull request #110 from qilicun/fix_polyinflow
...
Fix error: When the injector is not the first of wells, opm should work well
2015-05-20 11:12:43 +02:00
Liu Ming
641113bfa8
remove the debug information.
2015-05-20 15:06:00 +08:00
Liu Ming
f66921612c
Output well name when wells can't find in WPOLYMER keyword.
2015-05-20 14:57:26 +08:00
Atgeirr Flø Rasmussen
b7ef3b7f57
Minor changes to make BlackoilPolymerModel more like BlackoilModel.
...
No behaviour changes, only renaming etc. to reduce the diff.
2015-05-20 08:48:54 +02:00
Liu Ming
f8baad5d91
Fix error: When the injector is not the first of wells, opm should work well.
2015-05-20 12:35:04 +08:00
Atgeirr Flø Rasmussen
6984ca52e4
Update docs.
2015-05-19 21:36:40 +02:00
Atgeirr Flø Rasmussen
65e7a934a9
Make BlackoilPolymerModel usable with NewtonSolver from opm-autodiff.
2015-05-19 21:29:14 +02:00
Atgeirr Flø Rasmussen
300f236cef
Copied FullyImplicitBlackoilPolymerSolver to BlackoilPolymerModel.
2015-05-19 14:40:38 +02:00
Atgeirr Flø Rasmussen
98fd744c29
Merge pull request #100 from edbru/OPM-186
...
Now also flow_polymer.cpp in project opm-polymer takes the NOSIM keyword...
2015-05-18 12:53:10 +02:00
Joakim Hove
01c7e66419
Merge pull request #95 from joakim-hove/external-cmake
...
External cmake
2015-05-15 14:38:34 +02:00
Atgeirr Flø Rasmussen
5a0ae07252
Merge pull request #108 from GitPaean/simple_changes
...
Adapting some updates in opm-autodiff to opm-polymer.
2015-05-11 08:29:39 +02:00
Kai Bao
a3efd688f4
Update addWellEq() to match the opm-autodiff.
2015-05-08 14:30:00 +02:00
Kai Bao
110dde2bb5
updating updateWellControls()
...
modified to no longer update primary variables, and moved to earlier
in assemble()
2015-05-08 12:50:17 +02:00
Kai Bao
b46dcc3b76
refactoring computeMassFlux().
...
To match the opm-autodiff implementation that only handles one phase
each time.
Polymer equation is handled with the water phase together, since it
effects the water phase.
2015-05-08 10:07:49 +02:00
Kai Bao
3bd0ff1885
Removing unused block patterns and using std::move.
2015-05-08 09:06:05 +02:00
Atgeirr Flø Rasmussen
3ef3c53889
Merge pull request #107 from GitPaean/minor_upate_adaption
...
Minor update and adaption to match opm-autodiff
2015-05-07 14:15:05 +02:00
Kai Bao
b754d77810
change transMult() and poroMult() to match autodiff.
2015-05-07 13:27:39 +02:00
Kai Bao
06d2534b3d
emove unused method computeRelPermWells()
2015-05-07 13:15:24 +02:00
Kai Bao
0f65fd52f0
Changing computeRelPerm() and and computePressures() to match autodiff.
2015-05-07 13:11:14 +02:00
Kai Bao
1d112f9ec9
No longer throw on solver failure
2015-05-07 13:05:23 +02:00
Kai Bao
d5577f634d
Changing the default parameters for SolverParameter
...
To be more consistent with the OPM-autodiff.
And also min_iter_ was added.
2015-05-07 12:47:05 +02:00
Atgeirr Flø Rasmussen
b73a0c43f9
Merge pull request #104 from akva2/update_redhat_packaging
...
update redhat packaging
2015-04-27 08:51:51 +02:00
Liu Ming
825d4a1609
Merge remote-tracking branch 'opm/master'
2015-04-17 16:38:07 +08:00
Atgeirr Flø Rasmussen
5bc3028727
Merge pull request #102 from akva2/update_debian_packaging
...
update debian packaging
2015-04-17 08:53:38 +02:00
Atgeirr Flø Rasmussen
997dc27484
Merge pull request #101 from GitPaean/adding_startup_message_flow_polymer
...
Adding startup message flow polymer and accpting single deck filename as command line argument.
2015-04-16 09:39:41 +02:00
Kai Bao
807c528bef
Removing a white space.
2015-04-15 16:56:05 +02:00
Kai Bao
fc36bc866a
Accept single deck filename as command line argument.
2015-04-15 16:48:36 +02:00
Kai Bao
8c67dddf90
Adding the startup message for flow-polymer.
...
Three letters wider than flow.
2015-04-15 16:38:56 +02:00
Edvin Brudevoll
d300cb6eb6
Now also flow_polymer.cpp in project opm-polymer takes the NOSIM keyword into account.
2015-04-15 14:17:40 +02:00
Bård Skaflestad
f9dfd36043
Merge pull request #99 from atgeirr/cmake_01
...
Sync build system
2015-04-10 17:22:35 +02:00
Andreas Lauser
9abbc45571
remove the obsolete 'm4' subdirectory
...
as far as I can see, it provided M4 macros for autotools based
projects which wanted to use OPM. I have severe doubts that this was
used by anyone because it most likely does not even work. (e.g. the M4
macros does not seem to specify the ERT and opm-parser prerequisites.)
Note that I'm not 100% sure of the above, so if I'm wrong, state so
loudly and I'll close the PR...
2015-04-10 16:17:14 +02:00
Atgeirr Flø Rasmussen
2e03ada69f
Merge pull request #98 from andlaus/use_EclipseState_for_summary_units
...
Revert "pass the deck to the output writer"
2015-03-31 17:45:13 +02:00
Andreas Lauser
239547e794
Revert "pass the deck to the output writer"
...
This reverts commit 71987ae3b038c141a673ae1c1037f63ed695e595.
2015-03-31 12:10:16 +02:00
Atgeirr Flø Rasmussen
ea37d60623
Merge pull request #97 from andlaus/use_deck_units_for_summary_output
...
pass the deck to the output writer
2015-03-27 12:30:25 +01:00
Andreas Lauser
206d7b56e4
pass the deck to the output writer
2015-03-26 17:33:20 +01:00
Liu Ming
c9ad1e33ba
Merge remote-tracking branch 'remotes/opm/master'
2015-03-25 09:08:58 +08:00
Atgeirr Flø Rasmussen
62e8146424
Merge pull request #96 from qilicun/updates
...
Updates FIBOPOLYMER simulator based on flow simulator.
2015-03-24 20:29:46 +01:00
Liu Ming
f23f5fac8e
rename sim_poly_fibo_ad to flow_polymer.
2015-03-24 17:06:32 +08:00
Liu Ming
d791888430
Merge remote-tracking branch 'remotes/opm/master' into updates
...
Conflicts:
opm/polymer/fullyimplicit/FullyImplicitBlackoilPolymerSolver_impl.hpp
2015-03-24 16:56:19 +08:00
Liu Ming
0d0ff9d961
use std::move(), solving conflicts.
2015-03-24 16:41:32 +08:00
Liu Ming
efd7b93779
Merge branch 'updates'
2015-03-24 15:18:58 +08:00
Liu Ming
b4d834508c
Updates FIBOPOLYMER simulator based on flow simulator.
...
Rename sim_poly_fibo_ad to flow_polymer.
2015-03-24 15:07:25 +08:00
Atgeirr Flø Rasmussen
7f90315f48
Merge pull request #93 from atgeirr/fix-compile-error
...
Adapt to API change for AutoDiffBlock class.
2015-03-20 10:55:05 +01:00
Atgeirr Flø Rasmussen
aff268dbdb
Adapt to API change for AutoDiffBlock class.
2015-03-16 16:49:12 +01:00
Bård Skaflestad
f2b928932a
Merge pull request #92 from atgeirr/fix-compile-error
...
Follow API change in BlackoilPropsAdInterface.
2015-03-09 10:25:53 +01:00
Atgeirr Flø Rasmussen
9d56234602
Follow API change in BlackoilPropsAdInterface.
2015-03-09 09:56:55 +01:00
