Arne Morten Kvarving
4fcb1e9d37
changed: move calculateThpFromBhp to WellBhpThpCalculator
2022-10-31 13:15:18 +01:00
Arne Morten Kvarving
f7f4352b68
changed: move mostStrictBhpFromBhpLimits to WellBhpThpCalculator
2022-10-31 13:15:18 +01:00
Arne Morten Kvarving
d4e06536a0
changed: move getTHPConstraint to WellBhpThpCalculator
2022-10-31 13:15:18 +01:00
Arne Morten Kvarving
cd734f7a0d
added: WellBhpThpCalculator
...
this will hold the code for THP/BHP calculations.
first method moved there is wellHasThpConstraints
2022-10-31 13:15:18 +01:00
Arne Morten Kvarving
7d72af43de
BlackoilWellModelGeneric: use fmt::format
2022-10-31 11:07:20 +01:00
Arne Morten Kvarving
6a69a67f27
Merge pull request #4218 from akva2/use_return_value
...
changed: use return value
2022-10-31 11:06:54 +01:00
Arne Morten Kvarving
de13e5018a
BlackoilWellModelConstraints: use fmt::format
2022-10-31 10:46:50 +01:00
Arne Morten Kvarving
f367e4fb7b
changed: use return value
...
no reason to pass a reference here, just use return
2022-10-31 10:35:52 +01:00
Arne Morten Kvarving
6f49aee719
move getGroupProductionTargetRate into WellGroupControls
2022-10-31 09:08:35 +01:00
Arne Morten Kvarving
2d4c522082
move getGroupInjectionTargetRate into WellGroupControls
2022-10-31 09:08:35 +01:00
Arne Morten Kvarving
cdbeef0a3e
move getGroupProductionControl into WellGroupControls
2022-10-31 08:52:20 +01:00
Arne Morten Kvarving
cfd0eda7de
added: WellGroupControls
...
this holds the code for well group controls.
move getGroupInjectionControl into the new class
2022-10-31 08:52:19 +01:00
Arne Morten Kvarving
9f78e0454d
move guideRateUpdateIsNeeded into BlackoilWellModelGuideRates
2022-10-28 23:33:05 +02:00
Arne Morten Kvarving
d42cdd409b
move assignGroupGuideRates into BlackoilWellModelGuideRates
2022-10-28 23:33:05 +02:00
Arne Morten Kvarving
5e157cd23b
move calculateAllGroupGuideRates into BlackoilWellModelGuideRates
2022-10-28 23:33:05 +02:00
Arne Morten Kvarving
01dfe23a50
move assignWellGuideRates into BlackoilWellModelGuideRates
2022-10-28 23:24:29 +02:00
Arne Morten Kvarving
f19c7b2ee6
move getGuideRateInjectionGroupValues into BlackoilWellModelGuideRates
2022-10-28 22:54:54 +02:00
Arne Morten Kvarving
b6659d6960
move getGuideRateValues(Group) into BlackoilWellModelGuideRates
2022-10-28 22:53:33 +02:00
Arne Morten Kvarving
41b1a38de3
move getGuideRateValues(Well) into BlackoilWellModelGuideRates
2022-10-28 22:50:26 +02:00
Arne Morten Kvarving
dc607ce3ff
add BlackoilWellModelGuideRates
...
start by moving getGuideRateValues
2022-10-28 22:40:38 +02:00
Arne Morten Kvarving
f06264152c
remove now unnecessary Bhp_ member in StandardWellGeneric
2022-10-28 19:48:01 +02:00
Arne Morten Kvarving
5d4c7f49a2
move checkConvergencePolyMW into WellConvergence
2022-10-28 19:47:59 +02:00
Arne Morten Kvarving
0f8ca0c529
add WellConvergence
...
move checkConvergenceControlEq into it
2022-10-28 19:47:55 +02:00
Arne Morten Kvarving
cc306a45b4
move updateGroupIndividualControl into BlackoilWellModelConstraints
2022-10-28 19:32:06 +02:00
Arne Morten Kvarving
e04f20af8e
move actionOnBrokenConstraints into BlackoilWellModelConstraints
2022-10-28 19:32:02 +02:00
Arne Morten Kvarving
82cf0deef4
move checkGroupConstraints into BlackoilWellModelConstraints
2022-10-28 19:19:33 +02:00
Arne Morten Kvarving
df27ec5d4d
move checkGroupProductionConstraints into BlackoilWellModelConstraints
2022-10-28 18:59:40 +02:00
Arne Morten Kvarving
2d9d452fff
add BlackoilWellModelConstraints
...
start by moving hasTHPConstraints
2022-10-28 18:21:43 +02:00
Arne Morten Kvarving
3fdf28508f
move loadRestartData into BlackoilWellModelRestart
2022-10-28 15:30:09 +02:00
Arne Morten Kvarving
35386a79bf
move loadRestartGuideRates(Config) into BlackoilWellModelRestart
2022-10-28 15:24:59 +02:00
Arne Morten Kvarving
2e433a5bc2
move loadRestartGuideRates(Target) into BlackoilWellModelRestart
2022-10-28 15:22:17 +02:00
Arne Morten Kvarving
ffeddfe280
move loadRestartGroupData into BlackoilWellModelRestart
2022-10-28 15:20:09 +02:00
Arne Morten Kvarving
0f853a8566
move loadRestartWellData into BlackoilWellModelRestart
2022-10-28 15:18:29 +02:00
Arne Morten Kvarving
09c1127c34
move loadRestartSegmentData into BlackoilWellModelRestart
2022-10-28 15:15:13 +02:00
Arne Morten Kvarving
0b32c1afd9
add BlackoilWellModelRestart
...
start by moving loadRestartConnectionData
2022-10-28 15:13:06 +02:00
Arne Morten Kvarving
dfde087a23
fixed: some duplicate test case names
...
while it causes no harm, it's still wrong
2022-10-28 12:50:21 +02:00
Arne Morten Kvarving
b9ee7eae6f
use if constexpr
2022-10-26 11:23:55 +02:00
Arne Morten Kvarving
96ec2b0e96
comment out unused private variable (causes a warning)
2022-10-26 10:59:43 +02:00
Arne Morten Kvarving
0cc0b29a14
move updateWellTestState to WellInterfaceGeneric
2022-10-24 12:18:30 +02:00
Arne Morten Kvarving
8b503f9a00
move updateWellTestStatePhysical to WellTest
2022-10-24 12:10:57 +02:00
Arne Morten Kvarving
e2b5fc8082
move updateWellTestStateEconomic to WellTest
2022-10-24 12:06:09 +02:00
Arne Morten Kvarving
71d404336e
move checkRatioEconLimits to WellTest
2022-10-24 11:55:57 +02:00
Arne Morten Kvarving
1a0774ceab
move checkRateEconLimits to WellTest
2022-10-24 11:49:22 +02:00
Arne Morten Kvarving
2b152e67e1
move checkMaxWaterCutLimit to WellTest
2022-10-24 11:43:57 +02:00
Arne Morten Kvarving
e7273868f5
move checkMaxWGRLimit to WellTest
2022-10-24 11:40:30 +02:00
Arne Morten Kvarving
fe8259bb76
move checkMaxGORLimit to WellTest
2022-10-24 11:37:54 +02:00
Arne Morten Kvarving
37f51420f6
move checkMaxRatioLimitCompletions to WellTest
2022-10-24 11:28:06 +02:00
Arne Morten Kvarving
d56eb16837
WellInterfaceGeneric: add accessor for completions
2022-10-24 10:57:09 +02:00
Arne Morten Kvarving
9367335fe3
added: WellTest
...
this will hold the code for well tests.
start by moving checkMaxRatioLimitWell to the new class
2022-10-24 10:55:32 +02:00
Arne Morten Kvarving
cf6423bfce
Merge pull request #4186 from alfbr/master
...
Split up different tests in include files
2022-10-20 15:23:32 +02:00
Arne Morten Kvarving
fc96fe8359
Merge pull request #4179 from atgeirr/bump-version
...
Bump version for master branch.
2022-10-19 09:14:52 +02:00
Arne Morten Kvarving
ac6c7d82f5
fixed: damaris depends on mpi
2022-10-18 13:12:01 +02:00
Arne Morten Kvarving
83b7aec1f1
changed: do all assembleTracerEquations_() in one call
...
by looping over the tracer batches. this trades memory
for runtime efficiency as we cannot reuse one matrix
but rather need to have one matrix for each phase
2022-10-18 10:54:57 +02:00
Arne Morten Kvarving
2b2b0b085c
changed: avoid updating the whole element context for ghost cells
...
a small but obvious optimization
2022-10-18 08:43:40 +02:00
Arne Morten Kvarving
70a4cdc66b
changed: put well assembly for tracer in separate function
2022-10-18 08:43:40 +02:00
Arne Morten Kvarving
cb9d6566d5
changed: put flux assembly for tracer in separate function
2022-10-18 08:43:40 +02:00
Arne Morten Kvarving
b9c397e1ba
changed: put volume assembly for tracer in separate function
2022-10-18 08:43:40 +02:00
Arne Morten Kvarving
2c06152086
changed: do all advanceTracerFields in one call
...
by looping over the tracer batches
2022-10-18 08:43:40 +02:00
Arne Morten Kvarving
586b88d3ad
changed: use BCData struct for freebc
2022-10-17 15:01:27 +02:00
Arne Morten Kvarving
95ab3427e2
initialize nonTrivialBoundaryConditions inline
...
this way you don't have to read the code to find the
default value
2022-10-17 15:01:27 +02:00
Arne Morten Kvarving
d2a720e40c
changed: use a struct for holding BC data
...
keeps related data as a single class member.
use this for massratebc_
2022-10-17 15:01:27 +02:00
Arne Morten Kvarving
ff826aa939
RegionAverageCalculator: use elements range generator
2022-10-13 23:01:37 +02:00
Arne Morten Kvarving
5796396696
RateConverter: use elements range generator
2022-10-13 23:01:37 +02:00
Arne Morten Kvarving
15f1ec0c3a
BlackoilWellModel: use elements range generator
2022-10-13 23:01:37 +02:00
Arne Morten Kvarving
72dfc63167
BlackoilModelEbos: use elements range generator
2022-10-13 23:01:37 +02:00
Arne Morten Kvarving
ada17881cc
AquiferAnalytical: use elements and intersections range generators
2022-10-13 23:01:37 +02:00
Arne Morten Kvarving
72bed4449b
AquiferNumerical: use elements range generator
2022-10-13 23:01:37 +02:00
Arne Morten Kvarving
0da1ff494b
findOverlapRowsAndColumns: use elements range generator
2022-10-13 23:01:37 +02:00
Arne Morten Kvarving
3137cb5194
getQuasiImplesWeights: use elements range generator
2022-10-13 23:01:37 +02:00
Arne Morten Kvarving
a884e3c1d6
ecltracermodel: use elements range generator
2022-10-13 23:01:35 +02:00
Arne Morten Kvarving
7f21bc55b0
eclthresholdpressure: use elements range generator
2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
3599e0e5de
eclproblem: use elements range generator
2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
be84bc16be
ecloutputblackoilmodule: use elements range generator
2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
f85d388955
eclgenerictracermodel: use elements range generator
2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
998cd137a0
ecltransmissibility: use elements and intersections range generators
2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
da2c68ee08
eclwriter: use elements range generator
2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
0329ce08a7
eclgenericwriter: use elements and intersections range generators
2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
50e6ca16d6
eclgenericthresholdpressure: use elements and intersections range generators
2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
82b29f113a
eclbasevanguard: use elements range generator
2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
a6509fe077
collecttoiorank: use elements range generator
2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
ecc36f6ce8
fix cmake handling
...
- use imported target for linking
- use separate damaris cmake script
- handle HAVE_DAMARIS config variable in the usual way
fixing issues when user does not provide an outputDir via a command_line
avoid adding damaris's command lines when we dont have damaris
2022-10-13 12:23:06 +02:00
Arne Morten Kvarving
89d4798cca
changed: do all updateStorageCaches in one call
...
by looping over the tracer batches.
this avoids initializing the element contexts 3 times for each cell
2022-10-07 13:27:56 +02:00
Arne Morten Kvarving
9a88f56e7d
changed: put tracer batches in an array
...
now we can easily iterate over them
2022-10-07 13:27:56 +02:00
Arne Morten Kvarving
0d1c989a25
simplify updateStorageCache
...
use the elements() range generator. while at it, fix some cosmetics
2022-10-07 13:27:56 +02:00
Arne Morten Kvarving
2f80274100
changed: only update primary variables in tracer update
...
no reason to update the extensive quantities
2022-10-07 13:27:56 +02:00
Arne Morten Kvarving
d08ab74630
fixed: add missing includes
...
and mark parameter maybe_unused
2022-10-06 13:16:46 +02:00
Arne Morten Kvarving
c4e2ffea57
simplify updateProperty_: use elements() range generator
2022-10-05 15:36:22 +02:00
Arne Morten Kvarving
26b8fe01a3
changed: use updateProperty_ in updateCompositionChangeLimits_()
2022-10-05 15:36:19 +02:00
Arne Morten Kvarving
2d33932160
changed: use updateProperty_ in updateMaxPolymerAdsorption_
2022-10-05 15:31:13 +02:00
Arne Morten Kvarving
0841b2baf4
changed: use updateProperty_ in updateHysteresis_
2022-10-05 15:28:07 +02:00
Arne Morten Kvarving
f4cd69f422
changed: use updateProperty_ in updateMinPressure_
2022-10-05 15:25:07 +02:00
Arne Morten Kvarving
80b54a85ad
changed: use updateProperty_ in updateMaxWaterSaturation_
2022-10-05 15:21:52 +02:00
Arne Morten Kvarving
32995d34a1
changed: use updateProperty_ in updateMaxOilSaturation_
2022-10-05 15:18:49 +02:00
Arne Morten Kvarving
e4fe00413b
added: EclProblem::updateProperty_ function
...
this loops over the grid cells, extracts compressedDofIdx
and intensive quantities and then calls a passed function.
2022-10-05 15:11:49 +02:00
Arne Morten Kvarving
214f62f90c
adjust to renaming of serializeObject
2022-10-04 14:10:47 +02:00
Arne Morten Kvarving
49cb8fef93
Merge pull request #4141 from OPMUSER/NewtonMaxMinIterations
...
Rename option FlowNewtonMinIterations to NewtonMinIterations
2022-10-03 09:45:11 +02:00
Arne Morten Kvarving
38d0232364
Merge pull request #4140 from blattms/fix-finding-install.py
...
Use CMake's find_file to find install.py
2022-10-03 08:48:50 +02:00
Arne Morten Kvarving
5bf41a6a28
hide --zoltan-params from --help
...
as this is an expert option, it should only
be displayed with --help-all
2022-09-16 21:00:45 +02:00
Arne Morten Kvarving
cbba899fd7
SetupZoltanParams: make sure .json file exists
...
also check for unknown configuration and make sure supplied
boost version has a supported ptree version
2022-09-16 21:00:40 +02:00
Arne Morten Kvarving
2fa479873e
break long line
2022-09-16 21:00:30 +02:00