Commit Graph

16198 Commits

Author SHA1 Message Date
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
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
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
Kai Bao
5f344eef26 avoid dividing by zero in updateWellStateRates() 2023-06-20 23:14:50 +02:00
Bård Skaflestad
f47cceda63
Merge pull request #4714 from akva2/timing_blocks
add some timing blocks
2023-06-19 13:33:57 +02:00
Arne Morten Kvarving
90821b5a45 add some timing blocks 2023-06-19 11:55:34 +02:00
Bård Skaflestad
57d846f563
Merge pull request #4713 from tskille/multflt
start regression testing of MULTFLT-01
2023-06-16 17:33:14 +02:00
Bård Skaflestad
59e0d9904e
Merge pull request #4707 from svenn-t/ppcwmax
Equilibration with PPCWMAX
2023-06-16 15:15:33 +02:00
Torbjørn Skille
8cb9b5a0f8 start regression testing of MULTFLT-01 2023-06-16 14:37:13 +02:00
Kai Bao
8bfec82fdd
Merge pull request #4712 from vkip/network_solver_params
Parameterized iteration limits in network solver
2023-06-16 13:43:07 +02:00
Vegard Kippe
d6d4b94b25 Parameterized iteration limits in network solver 2023-06-16 12:15:06 +02:00
Bård Skaflestad
a2d4153830
Merge pull request #4711 from atgeirr/well-additions-for-local-solves
Well additions for local solves.
2023-06-15 18:15:43 +02:00
Atgeirr Flø Rasmussen
654df6fd59 Well additions for local solves.
Also, remove uneeded function updatePerforationIntensiveQuantities().
2023-06-15 16:49:12 +02:00
Bård Skaflestad
7374982ce0
Merge pull request #4710 from totto82/wagHysteresis
Wag hysteresis
2023-06-15 16:47:21 +02:00
Svenn Tveit
264ac8e0c0 std::tuple to pair and revert unnecessary changes.
Minor changes according to review comments as well.
2023-06-15 15:03:03 +02:00
Svenn Tveit
a6cbb2a7bb Added ppcwmax to regression tests 2023-06-15 13:04:55 +02:00
Tor Harald Sandve
e1a1c78537 Add regression test wag hysteresis 2023-06-15 12:27:28 +02:00
Ove Sævareid
9dbadfdaae Some support for WAG hysteresis. 2023-06-15 12:03:39 +02:00
Atgeirr Flø Rasmussen
81bda54c67
Merge pull request #4709 from blattms/omp-allow-oversubscribe
OpenMP: allow oversubscribing to prevent only 1 thread on some hardware
2023-06-14 13:58:12 +02:00
Markus Blatt
2906d7157d Allow oversubscribing OpenMP threads.
There is a strange interaction when using MPI and OpenMP on some
hardware/MPI implementations. I a serial run omp_get_num_procs() would
return the number of processors but when started under mpirun it would
always return 1.

With this we now allow users to use any amount of threads.
2023-06-14 12:03:56 +02:00