Commit Graph

16215 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
98b7f4d986 Fix header order and remove dead code. 2023-06-26 17:37:13 +02:00
Bård Skaflestad
a31f1cefd5
Merge pull request #4705 from totto82/guardAgainstinvalidRegions
Add guard against invalid satnum, pvtnum, imbnum, eqlnum
2023-06-26 14:29:01 +02:00
Bård Skaflestad
5d52ff46b0
Merge pull request #4720 from totto82/fixinitrv
Fix  rv initialization
2023-06-26 14:19:36 +02:00
Tor Harald Sandve
40bd07a3b5 Add guard against invalid satnum, pvtnum, imbnum, eqlnum 2023-06-26 13:11:19 +02:00
Tor Harald Sandve
bf5413d853 Use sqrt of numerical_limit epsilon instead of zero to check for non zero saturations
The reason is to make it more robust in terms of numerical noise.
2023-06-26 13:04:49 +02:00
Atgeirr Flø Rasmussen
424ee2174d Make sure micp and energy fixes are not discarded.
Also do not change getting intensive quantities in convergence
checks.
2023-06-26 11:18:57 +02:00
Atgeirr Flø Rasmussen
15c1e38533 Silence unused variable/parameter warnings. 2023-06-23 16:24:18 +02:00
Atgeirr Flø Rasmussen
cbfe25d0f0 Add NLDD nonlinear solver option. 2023-06-23 16:24:18 +02:00
Bård Skaflestad
712b00dbdf
Merge pull request #4629 from akva2/perf_rate_refactor
Refactor perforation rate calculations
2023-06-23 13:00:22 +02:00
Arne Morten Kvarving
9f681e8193 put formating of invalid d-value error in helper function 2023-06-23 10:49:19 +02:00
Arne Morten Kvarving
bbdfa35a62 changed: put calculation of injection gas-water perf rates in separate method 2023-06-23 10:45:10 +02:00
Arne Morten Kvarving
79c4797cd5 changed: put calculation of injection gas-oil perf rates in separate method 2023-06-23 10:33:07 +02:00
Arne Morten Kvarving
e0003eb6d6 changed: put calculation of gas-oil volume ratio in separate method 2023-06-23 09:40:09 +02:00
Arne Morten Kvarving
fdfd181629 changed: put calculation of vaporized and dissolved water volume ratio in separate method 2023-06-23 09:40:07 +02:00
Arne Morten Kvarving
516320699e changed: put calculation of production gas-water perf rates in separate method 2023-06-23 09:35:02 +02:00
Arne Morten Kvarving
21aa783d88 changed: put calculation of production gas-oil perf rates in separate method 2023-06-23 09:29:49 +02:00
Arne Morten Kvarving
e7bb51740e cosmetics 2023-06-23 08:47:11 +02:00
Vegard Kippe
31ecb416be Adding default value to the InitialStateComputer constructor to avoid specifying the number of pressure points when using outside simulator (i.e., in testing..) 2023-06-22 16:53:08 +02:00
Bård Skaflestad
f06e7dc165
Merge pull request #4628 from akva2/connection_rate_refactor
Refactor connection rate calculations
2023-06-22 15:49:55 +02:00
Vegard Kippe
ea587d53b2 Adding --num-pressure-points-equil as a developer parameter (not visible to end users) 2023-06-22 14:58:09 +02:00
Arne Morten Kvarving
a994394dca changed: use {fmt} in connectionRateEnergy 2023-06-22 14:40:45 +02:00
Arne Morten Kvarving
9574e40ac4 changed: put calculation of energy connection rate in separate method 2023-06-22 14:40:45 +02:00
Arne Morten Kvarving
b3fd64d915 changed: put calculation of polymer connection rate in separate method 2023-06-22 14:40:45 +02:00
Arne Morten Kvarving
4041644171 changed: put calculation of foam connection rate in separate method 2023-06-22 14:40:45 +02:00
Arne Morten Kvarving
c239cbd14f changed: put calculation of zFraction connection rate in separate method 2023-06-22 14:35:41 +02:00
Arne Morten Kvarving
b1cafa25ca changed: put calculation of micp connection rates in separate method 2023-06-22 14:35:41 +02:00
Arne Morten Kvarving
8b38943485 changed: put calculation of brine connection rate in separate method 2023-06-22 14:35:40 +02:00
Bård Skaflestad
a363ad6028
Merge pull request #4653 from akva2/wellpotentials_shared
introduce WellInterfaceGeneric::computeWellPotentials and checkNegativeWellPotentials
2023-06-22 12:41:33 +02:00
Arne Morten Kvarving
768a4903a3 reorganize (Std|MS)Well::computeWellPotentials
put shared parts in WellInterfaceGeneric::computeWellPotentials and
WellInterfaceGeneric::checkNegativeWellPotentials
2023-06-22 11:28:59 +02:00
Bård Skaflestad
4528f7800b
Merge pull request #4656 from akva2/conn_level_ind_to_iface
Move computeConnLevel(Inj|Prod)Ind to WellInterface
2023-06-22 10:52:25 +02:00
Arne Morten Kvarving
7b33cc6d62 move computeConnLevel(Inj|Prod)Ind to WellInterface
now code is shared between STW and MSW
2023-06-22 09:58:58 +02:00
Arne Morten Kvarving
c234d4faa5 StandardWell: use scalar mobilities in computeConnLevel(Inj|Prod)Ind
unifies code with MultisegmentWell
2023-06-22 09:56:48 +02:00
Bård Skaflestad
b5517c8600
Merge pull request #4652 from akva2/update_ws_thp_prod_shared
move updateWellStateWithTHPTargetProd to WellInterface
2023-06-22 09:54:35 +02:00
Bård Skaflestad
3219b9d36e
Merge pull request #4631 from akva2/unify_perf_rate
changed: unify computePerfRate(Eval|Scalar)
2023-06-22 09:35:36 +02:00
Arne Morten Kvarving
01c4aa1927 move updateWellStateWithTHPTargetProd to WellInterface
to share implementation between STW and MSW
2023-06-22 09:10:38 +02:00
Bård Skaflestad
06e9247887
Merge pull request #4663 from akva2/blackoilwellmodel_more_generic
BlackoilWellModel: move some more code to generic class
2023-06-22 09:09:46 +02:00
Arne Morten Kvarving
b55ca83917 changed: unify MultisegmentdWell::computePerfRate(Eval|Scalar) 2023-06-22 08:46:06 +02:00
Arne Morten Kvarving
58bed1e30a changed: unify StandardWell::computePerfRate(Eval|Scalar) 2023-06-22 08:46:06 +02:00
Arne Morten Kvarving
e7738e70dc BlackoilWellModel: move numLocalNonshutWells to generic class 2023-06-22 08:27:05 +02:00
Arne Morten Kvarving
aaa1006e2b BlackoilWellModel: move numLocalWellsEnd to generic class 2023-06-22 08:26:01 +02:00
Arne Morten Kvarving
dd9a2835fe BlackoilWellModel: move getMaxWellConnections to generic class 2023-06-22 08:26:01 +02:00
Arne Morten Kvarving
7ab8d94215 BlackoilWellModel: move assignWellTracerRates to generic class 2023-06-22 08:26:00 +02:00
Bård Skaflestad
815bb7a493
Merge pull request #4692 from bska/wbp-source-values
Add Container for Dynamic WBPn Source Values
2023-06-21 13:06:08 +02:00
Bård Skaflestad
77adc6ea3b Add Container for Dynamic WBPn Source Values
This commit adds a new container class,

    ParallelPAvgDynamicSourceData

which inherits from PAvgDynamicSourceData and provides a parallel
view of source contributions.  Member function

    collectLocalSources

will call the user-provided source term evaluation function for each
source location in its purview--typically those locations owned by
the current MPI rank.  Those values will be distributed to other MPI
ranks through member function synchroniseSources which will fill the
base class' 'src_' data member, and become available to clients
through read-only item spans.
2023-06-21 12:06:49 +02:00
Bård Skaflestad
6464f5ee4e
Merge pull request #4716 from akva2/janitoring
Some janitoring
2023-06-21 09:46:57 +02:00
Bård Skaflestad
a4820d1e92
Merge pull request #4715 from GitPaean/fixing_zero_scaling
avoid dividing by zero in updateWellStateRates()
2023-06-21 09:46:23 +02:00
Arne Morten Kvarving
3c566a9e4e avoid dead store 2023-06-21 08:59:26 +02:00
Arne Morten Kvarving
c8924d67ca PreconditionerAdapter: use override 2023-06-21 08:59:03 +02:00
Arne Morten Kvarving
2327768db6 anonymize unused parameter 2023-06-21 08:55:11 +02:00
Arne Morten Kvarving
f88bf57388 use temporary helper variable 2023-06-21 08:54:53 +02:00