OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-18 04:52:57 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,278 Commits 24 Branches 102 Tags 90 MiB
90a3ae8940
Commit Graph

294 Commits

Author SHA1 Message Date
Arne Morten Kvarving
4695dc9354 changed: use c++17 [[maybe_unused]] 2021-05-14 13:54:58 +02:00
Arne Morten Kvarving
d049cdd59d fixed: do not use Opm:: prefix when inside namespace Opm 2021-05-05 09:50:05 +02:00
Arne Morten Kvarving
4ffebbbbb0 anonymize unused parameters to quell warnings 2021-04-30 13:16:21 +02:00
Bård Skaflestad
4ca6f13e8d Merge pull request #650 from totto82/robustThermal 
Restrict the temperature update using provided parameters
 2021-04-26 22:37:05 +02:00
Tor Harald Sandve
6816dbaf94 Restrict the temperature update using provided parameters 2021-04-26 16:31:37 +02:00
Arne Morten Kvarving
016e0164a8 blackoilpolymermodules: include OpmLog.h 2021-04-26 11:23:42 +02:00
Tor Harald Sandve
4a101f1412 fix conductivity harmonic mean computation 2021-03-26 15:31:30 +01:00
Bård Skaflestad
4dbb65910d Merge pull request #642 from totto82/testDiff 
Only update diffusion quanteties if DIFFUSE is in the deck
 2021-03-19 23:40:11 +01:00
Tor Harald Sandve
4801d4e03a move the boundary check downstream 2021-03-09 09:45:31 +01:00
Tor Harald Sandve
aebe1a789a Only update diffusion quanteties if DIFFUSE is in the deck 2021-02-25 11:15:28 +01:00
Tor Harald Sandve
3f6782e2d2 include stdexcept 2021-02-18 14:08:16 +01:00
Tor Harald Sandve
7226209791 fix model for efficient diffusion coefficient and add reference 2021-02-16 11:07:32 +01:00
Tor Harald Sandve
59707e0f64 divide diffusivity by face area since opm-models expects pr area flux 2021-02-12 08:36:39 +01:00
Tor Harald Sandve
0b0fae607f scale diffusion by saturation 2021-02-12 08:36:39 +01:00
Tor Harald Sandve
87abc2c36b use diffusivity 2021-02-12 08:36:39 +01:00
Tor Harald Sandve
eadcf4f99d Add blackoil diffusion model 2021-02-12 08:36:39 +01:00
Tor Harald Sandve
02b978b523 fix boundary face index in parallel 2021-02-09 12:35:44 +01:00
Tor Harald Sandve
2f4131232c Merge pull request #638 from totto82/fixBoundaryContextIncrement 
fix incrementer in boundarycontext
 2021-01-18 13:45:51 +01:00
Tor Harald Sandve
5bdccf43d7 return a copy of the intersection to avoid passing reference to a temporary object 2021-01-18 09:00:14 +01:00
Tor Harald Sandve
1b4f0cf2c5 fix incrementer in boundarycontext 2021-01-15 10:37:53 +01:00
Tor Harald Sandve
7606cc911b Fix 2-phase blackoil boundary 2021-01-14 10:56:27 +01:00
Cintia Goncalves Machado
47c06c54d8 Remove water saturation as primary variable of flow_onephase 2020-11-23 10:41:11 +01:00
Bård Skaflestad
fb001a04c4 ExtBoModule: Don't Overload on Scalar and Evaluation 
The two types may be the same, in which case this is a build
failure.
 2020-11-18 19:00:47 +01:00
Ove Sævareid
ae2cc8eb0d Removed unused args. 2020-11-18 11:34:33 +01:00
Ove Sævareid
a6d90e3b29 Handle OnePhaseIndices 2020-11-17 18:10:21 +01:00
Ove Sævareid
db0bd548c6 Shadow warning. 2020-11-17 15:20:35 +01:00
Ove Sævareid
9b652488e2 Remove unused. 2020-11-16 17:47:43 +01:00
Ove Sævareid
a6bf939101 Compute undersaturated compressibilities from pvt input. Cleaning up, and adding some expl comments. 2020-11-16 16:52:16 +01:00
Ove Sævareid
d86602c18d Alternative solvent extension for the black oil model. 2020-11-16 16:52:16 +01:00
Atgeirr Flø Rasmussen
e04f5844ca Disable property macros. 
Still available by manually overriding OPM_ENABLE_OLD_PROPERTY_MACROS,
but not by default. This change has been communicated for a long time.
 2020-10-19 09:54:31 +02:00
Atgeirr Flø Rasmussen
3c83f5df0f Add --help-all option that also prints hidden options. 2020-10-16 13:55:45 +02:00
Atgeirr Flø Rasmussen
0c4749b2d4 Merge pull request #626 from totto82/updateIntensive 
Make a method that invalidate and updates the intensive quantities
 2020-09-28 09:02:30 +02:00
Tor Harald Sandve
6fbea5e41f Make a method that invalidate and updates the intensive quantities 2020-09-23 15:19:37 +02:00
Joakim Hove
b2cac8fa44 Remove unused #include of Exceptions 2020-09-21 10:57:42 +02:00
Tor Harald Sandve
74a59ddabc Merge pull request #620 from rbe051/fix_gravity_bug_in_darcyfluxmodule 
Fixed bug in calculation of gravity contribution to boundary flux
 2020-09-01 15:34:31 +02:00
Joakim Hove
d9c9f84f74 Use non table TLMIXPAR implementation 2020-08-12 09:12:04 +02:00
rube051
171a03e802 Fixed comments to gravity term in darcyfluxmodule 2020-07-07 09:41:25 +02:00
rube051
4dedbeee19 Fixed bug in calculation of gravity contribution to boundary flux in the darcyfluxmodule 
There was a sign mistake and a missing division by cell size.
 2020-07-07 09:30:42 +02:00
Atgeirr Flø Rasmussen
a0be8f8ed4 Merge pull request #619 from atgeirr/sequential-squashed 
Add LinearizationType, which will be used for sequential methods.
 2020-06-20 11:24:29 +02:00
Atgeirr Flø Rasmussen
378b293918 Merge pull request #618 from akva2/janitoring 
reorganize to avoid unused warnings without MPI
 2020-06-19 16:55:35 +02:00
hnil
e4e349eb7e Add LinearizationType, which will be used for sequential methods. 2020-06-19 14:58:49 +02:00
Atgeirr Flø Rasmussen
4e189a28df Merge pull request #617 from OPM/replace-property-macro-calls 
Replace property macro calls
 2020-06-19 11:51:10 +02:00
Arne Morten Kvarving
c8617141d4 reorganize to avoid unused warnings without MPI 2020-06-19 09:45:29 +02:00
Bernd Flemisch
d72de0f308 [cleanup] replace typedef by using 2020-06-10 13:49:42 +02:00
Bernd Flemisch
bdb7bac3e8 [properties] replace remaining macro calls 2020-06-10 13:07:19 +02:00
Bernd Flemisch
b809e9a4f7 [properties] replace SET_STRING_PROP calls 
It's not possible to have `constexpr std::string`s in C++17. Taking
`std::string_view` gives conversion errors. Since this is all temporary
and will be replaced by pure runtime parameters anyway, use string
literals for the moment.
 2020-06-09 11:15:16 +02:00
Bernd Flemisch
3ba67ebaa8 [properties] replace SET_TAG_PROP calls 2020-06-09 10:55:25 +02:00
Bernd Flemisch
cbffa2a7ba [properties] replace SET_SCALAR_PROP calls 2020-06-09 10:43:28 +02:00
Bernd Flemisch
725c022e69 [properties] replace BEGIN/END_PROPERTIES macro calls 2020-06-08 17:11:48 +02:00
Bernd Flemisch
880c5223ac [properties] replace macro calls by native C++ 2020-06-08 16:41:02 +02:00
Arne Morten Kvarving
016e5a75d8 anonoymize unused parameter 
quells compiler warnings
 2020-06-08 10:14:29 +02:00
Markus Blatt
9b650a9258 Use negative status to indicate --help, --print-properties, --print-parameters. 
That is the documented convention and needed to be able to mark these
runs as successful.
 2020-06-03 16:42:25 +02:00
Atgeirr Flø Rasmussen
a8a8d8a072 Make gas-oil related outputs conditional. 
This includes such things as saturation pressures, rs, rv etc.
 2020-06-02 11:31:02 +02:00
Atgeirr Flø Rasmussen
c743d0a8c0 Use correct relative path names in pvd file. 2020-05-29 13:58:14 +02:00
Atgeirr Flø Rasmussen
b31f33f567 Avoid segfault for two-phase case. 2020-05-29 10:20:58 +02:00
Atgeirr Flø Rasmussen
61eb74b1d6 Merge pull request #591 from OPM/feature/replace-propertysystem 
Replace property system
 2020-05-28 12:05:11 +02:00
Bård Skaflestad
622d6665ce Properly Scale Solvent Saturation 
Fixes a self-assignment issue.
 2020-05-24 12:13:09 +02:00
Bernd Flemisch
196e0b9b9b [parameters] restore full functionality of getting parameters 2020-05-19 13:52:34 +02:00
Bernd Flemisch
4c3bd69687 [properties] recover a more general SET_SPLICES macro 2020-05-18 15:53:58 +02:00
Bernd Flemisch
cb81d87fd3 [properties] add forward declaration 2020-05-18 15:53:58 +02:00
Bernd Flemisch
2fe69dfd9b [properties] fix macros that are used in opm-simulators, change include order 2020-05-18 15:53:58 +02:00
Bernd Flemisch
58182fe379 [properties] clean up 2020-05-18 15:53:58 +02:00
Bernd Flemisch
de2ca522ff [properties] redistribute property tag definitions 
Minimize changes compared to master. Avoid having the one and only
file for property tag definitions.
 2020-05-18 15:53:58 +02:00
Bernd Flemisch
5e411a8665 fix test suite 2020-05-18 15:52:45 +02:00
Bernd Flemisch
54d665a532 [properties] recover splice mechanism 2020-05-18 15:52:45 +02:00
Bernd Flemisch
4f890ed379 [properties] continue with splice mechanism 2020-05-18 15:52:45 +02:00
Bernd Flemisch
2ffc13e9c3 [properties] splice mechanism almost working again 2020-05-18 15:52:45 +02:00
Bernd Flemisch
5fe2bc0aa9 intermediate state of reimplementing the splice functionality 2020-05-18 15:52:45 +02:00
Bernd Flemisch
6d6ba6909c [properties] replace propertysystem 2020-05-18 15:52:45 +02:00
hnil
09d58b770a Added option for projection saturation. It do not change the result for default setting. To be able to do this it 
is slightly unlogical for surfactant runs which do projection two times.
 2020-05-14 08:28:41 +02:00
Robert Kloefkorn
f1b2fc2baf [bugfix][GridCommHandle] fix incorrect signature of overloaded interface 
method causing segfault with >= DUNE 2.7.
 2020-04-24 14:04:56 +02:00
Arne Morten Kvarving
1afaba329a mark conditionally used parameters as maybe_unused 
and anonymize unused parameters
 2020-04-14 14:16:20 +02:00
Markus Blatt
be3ed71634 Fix compilation issues due to removed Dune::shared_ptr. 
Those methods return a unique_ptr since at least DUNE 2.6.
 2020-03-17 15:13:39 +01:00
Markus Blatt
aaa375b080 Merge pull request #602 from akva2/no_serialization_polymermodule 
Avoid deck usage setting up BlackoilPolymerModule
 2020-03-08 15:20:31 +01:00
Markus Blatt
a3cd4e6961 Merge pull request #601 from akva2/no_serialization_brine 
Get rid of deck usage in BlackoilBrineModule
 2020-03-06 20:13:16 +01:00
Arne Morten Kvarving
0b9130b516 remove serialization templates from BlackoilPolymerModule 2020-03-06 15:12:57 +01:00
Arne Morten Kvarving
44a579a5f7 rename BlackoilPolymerModule::initFromDeck to initFromState 
no deck usage any longer
 2020-03-06 15:12:57 +01:00
Arne Morten Kvarving
3f6a858856 changed: get rid of Deck usage in BlackoilPolymerModule 2020-03-06 15:12:57 +01:00
Arne Morten Kvarving
424ca49696 remove serialization templates from BlackoilBrineModule 2020-03-04 15:42:48 +01:00
Arne Morten Kvarving
8480523c88 rename BlackoilBrineModule::initFromDeck to BlackoilBrineModule::initFromState 
no longer any deck usage
 2020-03-04 15:42:15 +01:00
Arne Morten Kvarving
a991da41a3 get rid of deck usage in BlackoilBrineModule 2020-03-04 15:42:06 +01:00
Arne Morten Kvarving
35e8b211de remove serialization templates from BlackoilFoamModule 2020-03-04 14:57:54 +01:00
Arne Morten Kvarving
875a00728e rename BlackoilFoamModules::initFromDeck to BlackoilFoamModules::initFromState 
no deck usage any longer
 2020-03-04 14:57:17 +01:00
Arne Morten Kvarving
8aa3b2c2fe get rid of deck usage in BlackoilFoamModule 2020-03-04 14:56:38 +01:00
Arne Morten Kvarving
5e391417b5 remove serialization templates from BlackoilSolventModules 2020-03-04 09:59:12 +01:00
Arne Morten Kvarving
19c2c4f981 rename initFromDeck to initFromState 
no deck usage any longer
 2020-03-04 09:59:12 +01:00
Arne Morten Kvarving
cb2aaa3452 Get rid of deck usage in blackoilsolventmodules 2020-03-04 09:59:12 +01:00
Arne Morten Kvarving
5ac9e0a2b9 use TLMIXPAR from state 2020-03-04 09:10:41 +01:00
Arne Morten Kvarving
75454a81cb changed: pass the Schedule through the SolventModule::initFromDeck method 
required for the SolventPvt setup
 2020-03-03 14:26:48 +01:00
Tor Harald Sandve
32bb94624a Merge pull request #589 from akva2/serialization_brine_module 
add mpi serialization for BlackoilBrineModule
 2020-02-17 14:16:21 +01:00
Atgeirr Flø Rasmussen
46d4596390 Silence warning also in debug builds. 2020-02-13 09:38:39 +01:00
Arne Morten Kvarving
6784db5e71 bump required dune version to 2.6 
and remove compatibility code
 2020-02-06 16:10:06 +01:00
Arne Morten Kvarving
1df01a3730 add mpi serialization for BlackoilBrineModule 2020-02-05 09:13:18 +01:00
Tor Harald Sandve
d0dcaf4409 fix plmax for > 1 regions 2020-01-30 10:30:48 +01:00
Atgeirr Flø Rasmussen
4a0effe8cc Add and use gatherStrings() for exception messages. 
Ensures user sees any useful exception messages during
initialization.
 2020-01-21 15:33:31 +01:00
Tor Harald Sandve
31a48d9cfd quell some warnings 2020-01-10 10:44:53 +01:00
Tor Harald Sandve
fd023ddb74 adapt one-phase model for brine 2020-01-09 13:16:47 +01:00
Trine S. Mykkeltvedt
587fa71e04 renaming saltwater-->brine and review comments 2020-01-07 09:29:58 +01:00
Trine S. Mykkeltvedt
106c4e3616 added saltwater module 2020-01-07 09:29:58 +01:00
Arne Morten Kvarving
f9370183f3 changed: add serialization templates to BlackoilFoamModule 2020-01-06 11:06:05 +01:00
Arne Morten Kvarving
69426ba768 changed: add serialization templates to BlackoilPolymerModule 2020-01-06 11:06:05 +01:00
Arne Morten Kvarving
27e7b42ae9 changed: add serialization templates to BlackoilSolventModule 2020-01-06 11:06:05 +01:00
Joakim Hove
8b6f695a9d Use DeckItem::hasValue() before accessing Todd Langstaff parameters 2019-11-17 17:04:59 +01:00
Markus Blatt
1e9a200128 Change Ewoms to Opm in namespace end comments 2019-10-30 08:49:28 +01:00
Markus Blatt
784afe5e70 Move BlackOilOnePhaseIndices to Opm namespace 
to make it consistent with the rest. #530 development
must have been started before the renaming in #532
and somehow the old namespace survived.
 2019-10-29 15:53:00 +01:00
Markus Blatt
431d5718e2 Fixed missing conversion ewoms->opm-models in header includes, 2019-10-24 14:19:54 +02:00
Atgeirr Flø Rasmussen
e50de81eba Merge pull request #561 from akva2/janitoring 
quell unused parameter warning
 2019-10-18 09:26:43 +02:00
dr-robertk
a56e2294d1 Merge pull request #554 from totto82/enableRockcompFlow 
enable rockcomp in flow
 2019-10-17 14:12:11 +02:00
Arne Morten Kvarving
34bfa10f99 quell unused parameter warning 2019-10-17 10:16:38 +02:00
dr-robertk
20b2c57829 Merge pull request #553 from totto82/sync_logging 
Adapt to make logging possible from ebos
 2019-10-15 14:14:25 +02:00
Arne Morten Kvarving
29ced177c4 fixed: do not assert for positive timestep when simulation is finished 2019-10-14 09:20:47 +02:00
Atgeirr Flø Rasmussen
2c8d0a95fc Merge pull request #530 from atgeirr/enable-onephase-revised 
Enable onephase revised
 2019-10-11 21:02:41 +02:00
Atgeirr Flø Rasmussen
b9509cdf78 Add or fix foam-related indices for one- and two-phase cases. 2019-10-10 16:08:04 +02:00
Atgeirr Flø Rasmussen
bc0eaca943 Remove buggy call to setEnthalpy(). 2019-10-10 15:55:04 +02:00
Atgeirr Flø Rasmussen
7fe1ad5c69 Fixed error message and reinstated dummy enthalpy update. 2019-10-10 09:54:43 +02:00
Atgeirr Flø Rasmussen
8977d64bc6 Whitespace fixes and style consistency. 2019-10-09 14:45:17 +02:00
Atgeirr Flø Rasmussen
544aeea40b Minor modifications requested in review. 2019-10-09 14:45:17 +02:00
Atgeirr Flø Rasmussen
b4bd3d66e4 Add braces where necessary (not just a style change). 2019-10-09 14:45:17 +02:00
hnil
ee482e87a6 change according to comments in pullrequest 2019-10-09 14:45:17 +02:00
hnil
3a56213ed8 Added several checks to ensure timestep>0 2019-10-09 14:45:17 +02:00
hnil
d9b981e059 made onephase water runs possible 2019-10-09 14:45:17 +02:00
hnil
c1640aaf3e avoid setting entalpy in non active phases (assert will else be broken) 2019-10-09 14:45:17 +02:00
hnil
efe3313f85 not adapting any variables in onephase 2019-10-09 14:45:17 +02:00
hnil
8572e1d108 make it possible with only one phase in genneral? 2019-10-09 14:45:16 +02:00
hnil
9c0520aeeb added onephase indices 2019-10-09 14:45:16 +02:00
hnil
17e9a73f81 tried to enable onephase with water as phase 2019-10-09 14:45:16 +02:00
Tor Harald Sandve
8969895d52 Merge pull request #552 from totto82/fix_polymer 
fix bug in PLYROCK
 2019-10-09 11:01:35 +02:00
Tor Harald Sandve
73692f2276 enable rockcomp in flow 2019-10-08 15:50:27 +02:00
Tor Harald Sandve
a245f70283 Adapt to make logging possible from ebos 2019-10-08 14:51:28 +02:00
Tor Harald Sandve
f9bb897f15 fix bug in PLYROCK 2019-10-07 15:17:36 +02:00
Arne Morten Kvarving
277d272f7f quell some unused parameter warnings 2019-09-20 12:44:50 +02:00
Arne Morten Kvarving
88a5e1db06 changed: ewoms/models/richards -> opm/models/richards 2019-09-19 11:08:59 +02:00
Arne Morten Kvarving
f558f5d98b changed: ewoms/models/pvs -> opm/models/pvs 2019-09-19 11:07:52 +02:00
Arne Morten Kvarving
a5d4b823f5 changed: ewoms/nonlinear -> opm/models/nonlinear 2019-09-19 11:04:36 +02:00
Arne Morten Kvarving
09cdd3aadd changed: ewoms/models/ncp -> opm/models/ncp 2019-09-19 11:03:17 +02:00
Arne Morten Kvarving
d302771e6c changed: ewoms/io -> opm/models/io 2019-09-19 10:59:55 +02:00
Arne Morten Kvarving
9247935c8a changed: ewoms/models/immiscible -> opm/models/immiscible 2019-09-19 10:51:11 +02:00
Arne Morten Kvarving
72b5e42016 changed: ewoms/models/flash -> opm/models/flash 2019-09-19 10:32:32 +02:00
Arne Morten Kvarving
16f4bdcf02 changed: ewoms/models/discretefracture -> opm/models/discretefacture 2019-09-19 10:29:58 +02:00
Arne Morten Kvarving
474ae4ded8 changed: ewoms/disc -> opm/models/discretization 2019-09-19 10:28:26 +02:00
Arne Morten Kvarving
f48ae0f7f1 changed: ewoms/models/blackoil -> opm/models/blackoil 2019-09-19 10:19:54 +02:00
Arne Morten Kvarving
17e8fa6574 changed: rename ewoms/models/common -> opm/models/common 2019-09-19 10:14:44 +02:00
Arne Morten Kvarving
e01f712294 changed: ewoms/common -> opm/models/utils 2019-09-19 10:14:17 +02:00
Arne Morten Kvarving
d8723dc9ce changed: ewoms/parallel -> opm/models/parallel 2019-09-16 09:48:55 +02:00