Commit Graph

15586 Commits

Author SHA1 Message Date
Bård Skaflestad
e6042cdc62
Merge pull request #4275 from daavid00/flres
FLOWS and FLORES support
2023-02-02 13:03:57 +01:00
David Landa Marban
5600d7d9e5 FLOWS and FLORES support 2023-02-02 11:19:49 +01:00
Bård Skaflestad
27b794f8c0
Merge pull request #4423 from akva2/banners
changed: move banner printing to separate compile unit
2023-02-02 09:52:18 +01:00
Arne Morten Kvarving
e5dc2996e2 changed: move banner printing to separate compile unit 2023-02-01 22:54:55 +01:00
Bård Skaflestad
e25cabd06c
Merge pull request #4424 from akva2/cleanup_parallel_file_merger
ParallelFileMerger: some cleanups
2023-02-01 17:26:44 +01:00
Arne Morten Kvarving
cb14b1e690 cosmetics 2023-02-01 15:42:04 +01:00
Arne Morten Kvarving
9d1cbd5389 ParallelFileMerger: prefer std::make_unique 2023-02-01 15:41:52 +01:00
Arne Morten Kvarving
303f42b082 ParallelFileMerger: avoid including fstream in header 2023-02-01 15:40:51 +01:00
Bård Skaflestad
5daf355a7b
Merge pull request #4418 from akva2/fix_prt_header_regression
fixed: regression from 82d2146c90
2023-01-31 15:52:41 +01:00
Arne Morten Kvarving
385f526d77 fixed: regression from 82d2146c90
missing PRT header
2023-01-31 15:18:25 +01:00
Tor Harald Sandve
87a357f77e
Merge pull request #4384 from hakonhagland/imbnum3
Adds support for directional relative permeabilities with hysteresis
2023-01-30 12:33:55 +01:00
Atgeirr Flø Rasmussen
38282e30f7
Merge pull request #4407 from GitPaean/nodal_pressure_thp_constraint
making sure to check the network nodal pressure constraint
2023-01-26 16:06:22 +01:00
Kai Bao
9a12869cdb making sure to check the network nodal pressure constraint
when checking the THP constraint for producers.
2023-01-26 14:04:58 +01:00
Bård Skaflestad
db292c8519
Merge pull request #4405 from GitPaean/adding_optional_header
including <optional> header to WellContainer
2023-01-24 11:09:16 +01:00
Kai Bao
a9a69a6d70 including <optional> header to WellContainer 2023-01-24 10:34:57 +01:00
Markus Blatt
d2f55c59fc
Merge pull request #4359 from totto82/fixGPMAINT2
Fix GPMAINT for groups without control
2023-01-23 14:12:00 +01:00
Markus Blatt
0d2a6d27ee
Merge pull request #4404 from OPMUSER/CPR
Remove CPR from UnsupportedFlowKeywords.cpp
2023-01-20 09:00:42 +01:00
OPMUSER
8c98a1b3dc Remove CPR from UnsupportedFlowKeywords.cpp 2023-01-20 14:37:28 +08:00
Bård Skaflestad
7c1cf03773
Merge pull request #4400 from blattms/use-cpr-from-datafile
Use CPR if specified in RUNSPEC / Make cprw the default
2023-01-19 16:59:48 +01:00
Bård Skaflestad
697179f584
Merge pull request #4403 from akva2/backend_includes
add missing includes
2023-01-19 16:10:44 +01:00
Markus Blatt
b961c93b15 Make sure the regression tests still use cpr_trueimpes. 2023-01-19 15:54:46 +01:00
Markus Blatt
a69c8436ad Use cprw as default CPR variant if CPR is requested. 2023-01-19 15:54:33 +01:00
Arne Morten Kvarving
bb70774902 add missing includes
and remove some unneeded ones
2023-01-19 15:16:33 +01:00
Markus Blatt
a1642d8c52
Merge pull request #4401 from akva2/pavgcalculatorcollection_hpp_include
eclgenericwriter.cc: add missing PAvgCalculatorCollection.hpp include
2023-01-19 14:05:37 +01:00
Arne Morten Kvarving
c5cfb19ace eclgenericwriter.cc: add missing PAvgCalculatorCollection.hpp include 2023-01-19 13:27:46 +01:00
Markus Blatt
b67388e6f0 Use cpr if requested in RUNSPEC section of data file.
Can be overwritten using command line parameter `--linear-solver=...`.
2023-01-18 22:02:35 +01:00
Bård Skaflestad
73968d9c6d
Merge pull request #4399 from akva2/fix_damaris
fix Damaris setup in Main
2023-01-18 17:54:13 +01:00
Bård Skaflestad
1f85b1640c
Merge pull request #4398 from akva2/summaryconfig_hpp_include
Cleanup SummaryConfig.hpp includes and forward
2023-01-18 15:43:49 +01:00
Arne Morten Kvarving
715e0e1c82 fix Damaris setup in Main 2023-01-18 15:37:41 +01:00
Arne Morten Kvarving
0a081adb54 ecloutputblackoilmodule.hh: remove unnecessary SummaryConfig.hpp include 2023-01-18 14:59:58 +01:00
Arne Morten Kvarving
dbcbb15449 EclOutputBlackoilModule: move code using SummaryConfig to compile unit 2023-01-18 14:59:58 +01:00
Arne Morten Kvarving
f4ea11cfba EclGenericOutputBlackoilModule: move destructor definition to compile unit 2023-01-18 14:59:58 +01:00
Arne Morten Kvarving
6a5fcd9d9e eclgenericoutputblackoilmodule.hh: forward SummaryConfig(Node) 2023-01-18 14:59:57 +01:00
Bård Skaflestad
da4e2deb6a
Merge pull request #4397 from akva2/summarystate_hpp_include
SummaryState.hpp: add missing and forward where possible
2023-01-18 14:58:47 +01:00
Arne Morten Kvarving
49fb1e1b6f
Merge pull request #4396 from akva2/main_cpp
Main: introduce a compile unit
2023-01-18 14:24:30 +01:00
Markus Blatt
212de0735c
Merge pull request #4394 from akva2/well_enums
Clean up Well.hpp includes
2023-01-18 14:13:35 +01:00
Arne Morten Kvarving
e89a68b2ff Main.hpp: forward WellTestState 2023-01-18 14:01:43 +01:00
Arne Morten Kvarving
2b756a8202 Main: forward Action::State 2023-01-18 14:01:42 +01:00
Arne Morten Kvarving
7991af9c66 Main.hpp: forward UDQState 2023-01-18 14:01:42 +01:00
Arne Morten Kvarving
4aab577275 Main: move code for setting up Damaris to compile unit 2023-01-18 14:01:42 +01:00
Arne Morten Kvarving
560b0e5cbb Main: move code for setting up Vanguard to compile unit 2023-01-18 14:01:42 +01:00
Arne Morten Kvarving
c901570c9b Main.hpp: remove unnecessary Python.hpp include 2023-01-18 14:01:42 +01:00
Arne Morten Kvarving
82d2146c90 Main: move code for reading deck to compile unit 2023-01-18 14:01:42 +01:00
Arne Morten Kvarving
308cda46b1 add missing SummaryState.hpp include 2023-01-18 13:51:40 +01:00
Arne Morten Kvarving
aa03b0c379 GasLiftGroupInfo.hpp: forward SummaryState 2023-01-18 13:42:32 +01:00
Arne Morten Kvarving
b29edb67d5 eclgenericoutputblackoilmodule.hh: forward SummaryState 2023-01-18 13:39:17 +01:00
Arne Morten Kvarving
1729c1a414 Main: move some code to separate compile unit 2023-01-18 12:26:10 +01:00
Arne Morten Kvarving
fef009f792 Main: remove unused method and associated filesystem include 2023-01-18 12:22:50 +01:00
Arne Morten Kvarving
aee8a764e2 GasLiftSingleWellGeneric.hpp: include WellProductionControls.hpp instead of Well.hpp 2023-01-18 11:56:21 +01:00
Arne Morten Kvarving
93b3e8151e WellInterface.hpp: remove unnecessary Well.hpp include 2023-01-18 11:53:15 +01:00