OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
597 Commits 24 Branches 102 Tags 90 MiB
3e12d739b5
Commit Graph

597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
3e12d739b5 Restore build on older compilers 
Older compilers, e.g., GCC 4.4., do not understand the
"simple-type-specifier" syntax of C++11's "friend" declarations.
Typical responses are

   error: a class-key must be used when declaring a friend
   error: friend declaration does not name a class or function

Restore build on older compilers (e.g., GCC prior to 4.7) by
inserting the 'class' keyword.
 2015-05-28 17:16:28 +02:00
Bård Skaflestad
a9c4d373a4 Merge pull request #114 from akva2/shared_check_commits 
changed: use common check-commits target from opm-cmake
 2015-05-28 15:19:36 +02:00
Atgeirr Flø Rasmussen
39aa0ddbf3 Merge pull request #112 from atgeirr/apply-crtp 
Reduce complexity of fully implicit solver.
 2015-05-28 13:28:51 +02:00
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
1d5a67f2cd Remove method computeResidualNorms(), use base version. 2015-05-26 17:10:16 +02:00
Atgeirr Flø Rasmussen
1dcffe4b18 Refactor computeMassFlux(). 2015-05-26 17:04:33 +02:00
Atgeirr Flø Rasmussen
2ddfe91504 Make computeMassFlux() more like the base class version. 2015-05-26 16:49:25 +02:00
Atgeirr Flø Rasmussen
9cc01245f1 Adapt to rq_.head -> rq_.dh renaming in opm-autodiff. 2015-05-26 16:43:06 +02:00
Atgeirr Flø Rasmussen
a42c982628 Refactor updateState() to not copy base version code. 2015-05-26 15:31:45 +02:00
Atgeirr Flø Rasmussen
272947c99c Use extraAddWellEq() to add well contrib to polymer equation. 
This way of refactoring was chosen since the extra term depends
on a lot of context. Instead of recreating the context in the
polymer model (which would not reduce any complexity) the necessary
variables are passed to extraAddWellEq().
 2015-05-26 14:04:35 +02:00
Atgeirr Flø Rasmussen
64da6ef184 Refactor computeAccum(). 
Extend base class version instead of copying.
 2015-05-26 12:55:43 +02:00
Atgeirr Flø Rasmussen
c9c19d9253 Fix error and warning in assert() statements. 2015-05-26 12:08:30 +02:00
Atgeirr Flø Rasmussen
2cd5b672bf Only deal with concentration if has_polymer_ is true. 2015-05-26 12:06:17 +02:00
Atgeirr Flø Rasmussen
2539fb935d Refactor variableState(). 
Use base case where possible instead of copying it.
 2015-05-26 11:49:10 +02:00
Atgeirr Flø Rasmussen
da98f18f80 Use base class version of parameter accessors. 2015-05-26 02:00:46 +02:00
Atgeirr Flø Rasmussen
f2e5177594 Remove functions that are identical in BlackoilModelBase. 
Also refactor some functions that are different to call the
base version and then do additional processing. However this
process has not been carried out on all methods at this point.
 2015-05-26 01:46:34 +02:00
Atgeirr Flø Rasmussen
26484e91a5 Transform BlackoilPolymerModel to inherit BlackoilModelBase. 
The class still contains surplus implementations though.
 2015-05-26 00:12:37 +02:00
Atgeirr Flø Rasmussen
5c1e314cbb Fix the same bug for the MPI case. 
Note: not actually tested with MPI, written blindly!
 2015-05-25 00:10:11 +02:00
Atgeirr Flø Rasmussen
5f6027ba01 Bugfix: we compute no well flux residual for polymer, do not try to use. 2015-05-25 00:06:17 +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