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
692 Commits 24 Branches 102 Tags 90 MiB
0b316fc1db
Commit Graph

692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
0b316fc1db Merge pull request #139 from andlaus/satfunc_refactoring 
AD simulators: include Evaluation.hpp before the other headers, only initialize the satfuncs once
 2015-09-02 15:23:24 +02:00
Andreas Lauser
5eef205551 only initialize the satfuncs once 
this makes the main files more similar to the primary simulator (i.e., flow.cpp)
 2015-09-02 14:56:38 +02:00
Joakim Hove
d2cd65fe34 Merge pull request #140 from joakim-hove/table-refactor 
Using TableManager to get tables.
 2015-09-02 11:58:01 +02:00
Joakim Hove
86dfd557a0 Using TableManager to get tables. 2015-09-01 13:02:15 +02:00
Atgeirr Flø Rasmussen
ff16f9b3fe Merge pull request #138 from bska/fix-build 
Restore build of flow_polymer
 2015-08-25 15:20:54 +02:00
Bård Skaflestad
994e342d7b Restore build of flow_polymer 
Function Opm::thresholdPressures() gained a new ParseMode parameter
in commit OPM/opm-core@09aa2b7 (PR OPM/opm-core#857).  Chase updated
call interface.
 2015-08-25 09:30:44 +02:00
Atgeirr Flø Rasmussen
a57c4cf779 Merge pull request #137 from GitPaean/correcting_determination_in_range_velocity 
correcting the determination of out-of-table-range velocity
 2015-08-18 10:34:47 +02:00
Kai Bao
d9cb0066df correcting the determination of out-of-table-range velocity 
comparing the location to the line instead of comparing the velocity
value directly.
 2015-08-17 18:17:23 +02:00
Joakim Hove
fc2223605e Merge pull request #136 from joakim-hove/parsemode 
Added ParseMode argument
 2015-08-06 17:45:43 +02:00
Joakim Hove
71f3cc9c64 Added ParseMode argument 2015-07-27 13:53:11 +02:00
Atgeirr Flø Rasmussen
0c2c079bd9 Merge pull request #135 from atgeirr/update-for-api-change 
Update to match changes in opm-autodiff.
 2015-07-10 13:07:07 +02:00
Atgeirr Flø Rasmussen
834d607d57 Update to match changes in opm-autodiff. 
BlackoilModelBase now requires an EclipseState constructor argument.
Also silenced two minor warnings.
 2015-07-10 12:57:30 +02:00
Bård Skaflestad
8f46134861 Merge pull request #134 from GitPaean/companion_PR_autodiff_408 
adapting to the change in autodiff#408
 2015-07-01 14:41:41 +02:00
Kai Bao
c88b1d6a8b adapting to the change in autodiff#408 2015-06-24 14:23:25 +02:00
Atgeirr Flø Rasmussen
155ec16a3f Merge pull request #133 from GitPaean/Adding_SHRATE_RELATED 
Adding shear-thinning effects based on keyword SHRATE
 2015-06-23 15:15:32 +02:00
Kai Bao
f00f7c38b6 using size_t to avoid signed/unsigned comparison. 2015-06-23 14:39:04 +02:00
Kai Bao
1f36eaa27e constructing vector directly instead of using std::copy. 2015-06-23 14:33:02 +02:00
Kai Bao
8f51065abf using .data() instead of obtaining the address of first element. 2015-06-23 14:19:35 +02:00
Kai Bao
46edf7bb90 minor formatting for spaces for one if statement. 2015-06-23 14:02:57 +02:00
Kai Bao
c026503e91 more documents for BlackoilPolymerModel construction function. 2015-06-23 14:01:19 +02:00
Kai Bao
2100f10411 Merge branch 'master' into Adding_SHRATE_RELATED 2015-06-23 13:33:05 +02:00
Kai Bao
638c2da394 Merge branch 'master' into Adding_SHRATE_RELATED 2015-06-23 13:31:20 +02:00
Atgeirr Flø Rasmussen
f54e0d3992 Merge pull request #132 from atgeirr/fix-warnings 
Fix warnings
 2015-06-23 13:30:05 +02:00
Atgeirr Flø Rasmussen
f90afe5d38 Remove const on return type. 2015-06-23 13:25:52 +02:00
Atgeirr Flø Rasmussen
383322b760 Fix signed/unsigned comparisons. 2015-06-23 13:24:31 +02:00
Atgeirr Flø Rasmussen
eabe1986e6 Merge pull request #124 from GitPaean/Adding_PLYSHLOG_RELATED 
Adding shear-thinning calculation with PLYSHLOG
 2015-06-23 13:18:07 +02:00
Kai Bao
afb8feaafe formatting the blank lines and a bracket. 2015-06-23 13:04:48 +02:00
Kai Bao
9c3c0cffce correcting copyright information. 2015-06-23 13:02:05 +02:00
Atgeirr Flø Rasmussen
9128ef23f1 Merge pull request #131 from GitPaean/adaptation_split_addWellEq 
change the parameter order addWellContributionToMassBalanceEq().
 2015-06-23 11:38:13 +02:00
Kai Bao
d2602cc73f Merge branch 'Adding_PLYSHLOG_RELATED' into Adding_SHRATE_RELATED 
Conflicts:
	opm/polymer/PolymerProperties.hpp
 2015-06-23 10:27:25 +02:00
Kai Bao
5cdc677672 cleaning up commented codes and adding a few comments. 2015-06-22 15:44:14 +02:00
Kai Bao
39986c3363 adapting to the new refactoring in opm-autodiff#406. 
replacing addWellEq() with seperated functions, which make the
incoropration of the shear-thinning much natural and easier.
 2015-06-22 15:38:31 +02:00
Kai Bao
9cd52ca631 Merge branch 'adaptation_split_addWellEq' into Adding_PLYSHLOG_RELATED 
Conflicts:
	opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp
 2015-06-22 12:59:19 +02:00
Kai Bao
04a72bd325 Merge branch 'master' into Adding_PLYSHLOG_RELATED 2015-06-22 12:57:26 +02:00
Kai Bao
78775cd33e parameter order change of addWellContributionToMassBalanceEq(). 
To follow the corresponding change in opm-autodiff.
 2015-06-22 12:48:22 +02:00
Atgeirr Flø Rasmussen
9ed6ea1b31 Merge pull request #130 from qilicun/fix_param 
Fix parameter errors.
 2015-06-22 10:29:20 +02:00
Liu Ming
3898ecde96 Fix parameter errors. 2015-06-22 15:43:01 +08:00
Kai Bao
4807a90c35 moving the shear-thinning application out of the addWellEq() 
So we still use the addWellEq() from the Base Class, without making a
new addWellEq() function in the BlackoilPolymerModel class.
 2015-06-19 15:17:59 +02:00
Kai Bao
60494ac531 changing to adapt to the change in the autodiff. 2015-06-18 16:56:39 +02:00
Kai Bao
f3c98bc95a Merge branch 'master' into Adding_PLYSHLOG_RELATED 
Conflicts:
	opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp
 2015-06-18 15:45:31 +02:00
Atgeirr Flø Rasmussen
c45907a41f Merge pull request #128 from atgeirr/fix-polymer-well-contrib 
Move polymer code from extraAddWellEq to addWellContributionToMassBalanceEq.
 2015-06-18 15:03:08 +02:00
Atgeirr Flø Rasmussen
2319420f06 Move polymer code extraAddWellEq -> addWellContributionToMassBalanceEq. 2015-06-18 14:34:52 +02:00
Kai Bao
dd9669ae43 Merge pull request #127 from atgeirr/only-create-modelparams-once 
Avoid parameter spamming in output.
 2015-06-18 13:12:26 +02:00
Atgeirr Flø Rasmussen
32590ec072 Use solver_param_ from base class. 2015-06-18 11:09:57 +02:00
Atgeirr Flø Rasmussen
2b6163b5ff Use the base class model_param_ and avoid recreating it. 2015-06-17 12:51:39 +02:00
Kai Bao
6745a2fb0a Merge branch 'master' into Adding_PLYSHLOG_RELATED 2015-06-10 15:15:25 +02:00
Kai Bao
df3c6cb8d1 using Water Position instead of assuming it is 0. 2015-06-10 14:40:46 +02:00
Kai Bao
3bd59ab7e4 correcting the marco in the Point2D.hpp file. 
the typo is resulted from a stash apply CONFLICT.
 2015-06-10 14:14:03 +02:00
Bård Skaflestad
bfd9071307 Merge pull request #125 from atgeirr/add-dummy-types 
Satisfy interface requirements of SimulatorBase.
 2015-06-10 13:52:28 +02:00
Kai Bao
81d9fe7a55 moving function computeShearMultLog to class PolymerProperties 2015-06-10 13:48:03 +02:00