Commit Graph

503 Commits

Author SHA1 Message Date
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
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
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
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
aff268dbdb Adapt to API change for AutoDiffBlock class. 2015-03-16 16:49:12 +01:00
Atgeirr Flø Rasmussen
9d56234602 Follow API change in BlackoilPropsAdInterface. 2015-03-09 09:56:55 +01:00
Atgeirr Flø Rasmussen
22f8fd2271 Adapt to API change in WellsManager. 2015-02-17 13:53:01 +01:00
Liu Ming
74332085dc change PolymerInflow constructor interface due to commit 6628941c9c9d781db9ec8e3ac05a3a8dc49dcf21 in opm-parser. 2015-01-27 12:24:26 +08:00
Liu Ming
6a3bfba846 Adapte to FIBO wellstate API changes in opm-autodiff. 2015-01-19 11:29:32 +08:00
Liu Ming
f9892f20d7 Add rough conversation testing for polymer equation. 2014-12-09 10:33:20 +08:00
Liu Ming
4d1f364a40 fix cmax issues. 2014-12-08 13:45:30 +08:00
Liu Ming
601767306a fix cmax issue, which affect Nodesorption results. 2014-12-08 10:00:27 +08:00
Liu Ming
d2892833b4 fix wrong implementation. 2014-12-08 09:54:16 +08:00
Liu Ming
93994a3e53 simplify the implementation. 2014-12-08 09:52:57 +08:00
Liu Ming
d9605b94e7 Merge remote-tracking branch 'opm/master' into fix_cmax 2014-12-08 09:15:01 +08:00
Andreas Lauser
c3d73e6de8 fix typo 2014-12-03 17:03:25 +01:00
Liu Ming
28b2fab7b7 fix gcc4.8 compile issue and remove whitespace. 2014-12-03 17:28:55 +08:00
Liu Ming
242ec598c8 Merge remote-tracking branch 'opm/master' into wpolymer_schedule 2014-12-03 16:56:38 +08:00
Liu Ming
cca03d5421 delete commented line. 2014-11-21 09:29:09 +08:00
Andreas Lauser
d36d7e81cb allow temperature dependent PVT properties
this has the nice side effect that non-uniform temperature fields also
become supported as long as they are "impressed" externally...
2014-11-20 19:25:18 +01:00
Liu Ming
9303e41966 add new polymerInflow constructor, get polymer injection rate from schedule section. 2014-11-20 16:32:02 +08:00
Liu Ming
63d68ecd62 add config.h 2014-11-19 08:44:54 +08:00
Liu Ming
c605a22c14 add config.h 2014-11-18 09:47:51 +08:00
Liu Ming
a43fa424a6 remove not-used files, these files belong to Incompressible flow, not
supported by autodiff.
2014-11-18 09:33:38 +08:00
Liu Ming
674284d382 fix header gard! 2014-11-18 09:29:27 +08:00
Liu Ming
4ce5661d9e compute cmax every time step. 2014-11-17 17:23:04 +08:00
Liu Ming
9a5c889656 adapt to API changes of opm-autodiff. 2014-11-14 13:16:22 +08:00
Liu Ming
58bdc701e3 since two phase polymer simulator support EclipseWriter, need to remove historical
files for outputing water cut.
2014-10-29 13:38:15 +08:00
Liu Ming
ac764bd8a8 let sim_poly_fi2p_comp_ad works as the same way as sim_poly_fibo_ad.
- move time iteration to simulator class
 - add EclipseWriter and output Eclipse binaries.
 - add DeckConstPtr for polymer inflow.
2014-10-29 13:23:50 +08:00
Liu Ming
3102c4dab2 use WellStateFullyImplicitBlackoil instead of WellState. 2014-10-29 10:25:06 +08:00
Liu Ming
d44e8e6d9f remove unnecessary referencer. 2014-10-28 16:29:22 +08:00
Liu Ming
a23e4ca63b remove historical and un-used files. 2014-10-28 14:28:34 +08:00
Liu Ming
c0a61c9655 due to the new timer, simulator class should not do time iteration once again. 2014-10-28 13:31:35 +08:00
Liu Ming
5242d6bbf7 move time iterations to Simulator class and pass deck to create polymer inflows.
This should solve the issues: write the final state to eclipse binaries.
2014-10-28 13:14:44 +08:00
Liu Ming
5535dd99cc source term should be '-' not '+' to mass balance equation... 2014-10-27 14:10:40 +08:00
Liu Ming
ba6fef4fbd pass wells manager from sim_poly_fibo to Simulator class, instead of directly
create it in Simulator class, since polymer inflow need deck and wells.
2014-10-24 14:04:57 +08:00
Liu Ming
6b3b90500f Merge remote-tracking branch 'opm/master' into bo_polymer
Conflicts:
	opm/polymer/PolymerProperties.hpp
2014-10-20 13:51:37 +08:00
Liu Ming
88a1ec6e9f fix bugs: polymer head should be dp*trans. 2014-10-20 13:44:12 +08:00
Atgeirr Flø Rasmussen
23ea7cbd11 Merge pull request #69 from qilicun/fix_bugs
PLYVISC and PLYADS should not just have only one row.
2014-10-17 12:21:58 +02:00
Liu Ming
89120ed57f output parameters for debugging and remove double loop of timer. 2014-10-16 16:55:36 +08:00
Liu Ming
ddfb030b57 Merge remote-tracking branch 'opm/master' into bo_polymer 2014-10-16 10:00:37 +08:00
Liu Ming
f1f0fa9c29 resize and use ADB::null() to initialize. 2014-10-16 09:59:59 +08:00