Commit Graph
100 Commits
Author SHA1 Message Date
Arne Morten Kvarving cd3c36042b eclgenericcpgridvanguard.hh: cleanup headers 2023-08-02 11:53:35 +02:00
Arne Morten Kvarving 0d7b373983 eclequilinitializer.hh: cleanup headers 2023-08-02 11:49:18 +02:00
Arne Morten Kvarving 46455ab65f ecldummygradientcalcultor.hh: cleanup headers 2023-08-02 11:45:51 +02:00
Arne Morten Kvarving a976ec5c13 eclcpgridvanguard.hh: cleanup headers 2023-08-02 11:43:39 +02:00
Arne Morten Kvarving fe9fefd004 eclbasevanguard.hh: cleanup headers 2023-08-02 11:41:02 +02:00
Arne Morten Kvarving 87665c8843 eclalugridvanguard.hh: cleanup headers 2023-08-02 11:36:47 +02:00
Arne Morten Kvarving 516cf5caab ebos.hh: cleanup headers 2023-08-02 11:31:21 +02:00
Arne Morten Kvarving c644ff755a collecttoiorank.hh: cleanup headers 2023-08-02 11:24:46 +02:00
Arne Morten Kvarving 26e9428ced alucartesianindexmapper.hh: cleanup headers 2023-08-02 11:21:09 +02:00
Arne Morten Kvarving 2ec1a98998 eclfluxmodule.hh: cleanup headers
add needed, remove unneeded and reorder
2023-08-02 11:15:26 +02:00
Arne Morten Kvarving eaa3281485 changed: add a container for micp solution components
makes it easy to pass data around to enable some refactoring
2023-08-01 13:45:29 +02:00
Arne Morten Kvarving 841d11efed changed: add a container for polymer solution components
makes it easy to pass data around to enable some refactoring
2023-08-01 13:45:14 +02:00
Arne Morten Kvarving 1e6b7f889a Merge pull request #4761 from hnil/fix_temp_boundary
Fix temp boundary
2023-08-01 09:02:26 +02:00
Arne Morten Kvarving 60b92d02eb WellFilterCake: make stateful 2023-07-07 16:08:42 +02:00
Arne Morten Kvarving dcf8a444fd changed: put calculation of filter cake multiplier in WellFilterCake 2023-07-07 16:08:20 +02:00
Arne Morten Kvarving aaeedf4091 put updating of FilterCake multiplier in separate method 2023-07-07 16:08:20 +02:00
Arne Morten Kvarving 1e7ca08702 changed: put handling of filtration particle volume in separate class 2023-07-07 16:08:17 +02:00
Arne Morten Kvarving 1b905f884c Merge pull request #4743 from akva2/blackoilmodelebos_nldd_separate
BlackoilModelEbos: separate out NLDD code to separate class
2023-07-05 14:23:29 +02:00
Arne Morten Kvarving 8e7de83218 BlackoilModelEbos: put Nldd solver in separate class 2023-07-05 13:40:13 +02:00
Arne Morten Kvarving 241c1d3279 BlackoilModelEbos: use value in localAccumulatedReports
cheap to copy and aids refactoring
2023-07-05 10:26:14 +02:00
Arne Morten Kvarving 184c6128cd BlackoilModelEbos: add acccessor for component names 2023-07-05 10:26:14 +02:00
Arne Morten Kvarving 0c8446eed3 BlackoilModelEbos: add acccessor for model parameters 2023-07-05 10:26:14 +02:00
Arne Morten Kvarving 6f726049ce BlackoilModelEbos: add accessor to linear solve setup time
to allow for external usage
2023-07-05 09:38:08 +02:00
Arne Morten Kvarving cee8dc4c6e BlackoilModelEbos: make getMaxCoeff public
to make it possible to call externally
2023-07-05 09:38:08 +02:00
Arne Morten Kvarving 8fc2b83948 BlackoilModelEbos: make initialLinearization public
to make it possible to call externally
2023-07-05 09:38:08 +02:00
Arne Morten Kvarving db41bfb55c ISTLSolverEbos: add missing include 2023-07-04 15:25:47 +02:00
Arne Morten Kvarving 4d35ec26de isNumericalAquiferCell: put in separate struct for easier reuse 2023-07-04 14:56:10 +02:00
Arne Morten Kvarving e89c43e54d Merge pull request #4736 from akva2/simplify_tuning_tests
simplify cmake code for tuning tests
2023-07-04 11:28:05 +02:00
Arne Morten Kvarving c6cd74270b BlackoilModelEbos: enumerate solver approach for NLDD
adds command line validation and allows us to remove an assert on
user provided data
2023-07-03 15:51:07 +02:00
Arne Morten Kvarving 8eb5e173c3 BlackoilModelEbos: put Gauss-Seidel NLDD solve in separate method
increases readability of nonlinearIterationNldd
2023-07-03 14:53:12 +02:00
Arne Morten Kvarving faa4bb25d7 BlackoilModelEbos: put jacobi NLDD solve in separate method
increases readability of nonlinearIterationNldd
2023-07-03 14:53:12 +02:00
Arne Morten Kvarving cf6697b630 BlackoilModelEbos: make domain ordering measure configurable 2023-07-03 12:24:41 +02:00
Arne Morten Kvarving e17b696a7e BlackoilModelEbos: put selection of domain order in separate method
to increase readability of nonlinearIterationNldd code
2023-07-03 12:24:41 +02:00
Arne Morten Kvarving c7f9d2d357 put initial linearization in separate method
to share code between newton and nldd
2023-07-03 10:51:10 +02:00
Arne Morten Kvarving 3656196684 put calculation of max coefficient in separate method
to reduce code duplication
2023-07-03 10:51:10 +02:00
Arne Morten Kvarving c3847e8325 simplify cmake code for tuning tests
add a post command to the runSimulator script and use this to
execute the unit test at the end of the run
2023-07-03 09:05:45 +02:00
Arne Morten Kvarving fae3859c5a Merge pull request #4702 from goncalvesmachadoc/regressionSalt
add gas condensate case to regression test
2023-06-30 19:24:08 +02:00
Arne Morten Kvarving ab3f6474aa fixed: parallel super builds
commit e5e7ff7287 introduced a dependency on a generated header in a
header file. this is problematic with super-builds as there is no
explicit dependency for the simulator objects to these generated
headers.

with the ninja-generator it is smart enough to figure out this across
the subdirectories, but the make generator is not. hence we explicitly
add a dependency on the opmcommon target in this case. ideally we would
only depend on the generated header to allow compiling opmcommon and
simulator objects in parallel. however there is as far as i know no way to
depend on OUTPUT targets across subdirectories.
2023-06-30 14:58:31 +02:00
Arne Morten Kvarving 64ce4a206e Merge pull request #4729 from akva2/partitioncells_reorg
PartitionCells: move all related code to compile unit
2023-06-30 13:02:20 +02:00
Arne Morten Kvarving 3e58d191e8 Merge pull request #4731 from akva2/componentnames_separate
ComponentName: put in separate file
2023-06-30 13:01:22 +02:00
Arne Morten Kvarving b95b342517 partitionCells: drop indent for namespace 2023-06-30 12:14:47 +02:00
Arne Morten Kvarving e8f04eec68 changed: move all partitionCells code to partitionCells.cpp 2023-06-30 12:14:11 +02:00
Arne Morten Kvarving c746986dc7 ComponentName: add compile unit 2023-06-30 11:51:08 +02:00
Arne Morten Kvarving 35bb329022 put BlackoilModelEbos::ComponentName in separate header
more tidy and potentially easier to reuse
2023-06-30 11:18:27 +02:00
Arne Morten Kvarving 4201d94241 BlackoilModelEbos: remove unused includes 2023-06-30 09:53:59 +02:00
Arne Morten Kvarving 034f20c37e BlackoilModelEbos: include tuple 2023-06-30 09:53:50 +02:00
Arne Morten Kvarving e008c76a80 BlackoilModelEbos: output error message using OpmLog 2023-06-30 08:57:14 +02:00
Arne Morten Kvarving e88c44eaaf BlackoilModelEbos: remove unused member function 2023-06-30 08:57:14 +02:00
Arne Morten Kvarving 0a670f3694 BlackoilModelEbos: use constexpr where appropriate 2023-06-30 08:57:14 +02:00
Arne Morten Kvarving 5874377937 BlackoilModelEbos: prefer using 2023-06-30 08:57:14 +02:00
Arne Morten Kvarving b29f24c9be BlackoilModelEbos: use Parallel::Communication type alias 2023-06-30 08:57:14 +02:00
Arne Morten Kvarving 953cf36c69 Merge pull request #4725 from totto82/addCO2STORE_GW_tests
Add CO2STORE_GW and CO2STORE_GASWAT to regression tests
2023-06-28 14:06:50 +02:00
Arne Morten Kvarving ef6c215fb8 Merge pull request #4722 from blattms/add-more-pinch-regression-tests
Added more supported PINCH test cases to regression testing.
2023-06-27 18:13:38 +02:00
Arne Morten Kvarving 1205a38802 Merge pull request #4724 from akva2/janitoring
Some janitoring
2023-06-27 15:08:48 +02:00
Arne Morten Kvarving fffb3d9f0e suppress unused lambda capture warnings with clang 2023-06-27 14:35:35 +02:00
Arne Morten Kvarving adfe80cba0 avoid dead stores 2023-06-27 13:40:54 +02:00
Arne Morten Kvarving 62a2ee1713 StandardWell: move connectionRatezFraction to Connections class 2023-06-27 13:23:21 +02:00
Arne Morten Kvarving 56014ccff9 StandardWell: move connectionRatePolymer to Connections class 2023-06-27 13:22:08 +02:00
Arne Morten Kvarving bf5108d09f StandardWell: move connectionRatesMICP to Connections class 2023-06-27 13:22:08 +02:00
Arne Morten Kvarving 2f6623993a StandardWell: move connectionRateFoam to Connections class 2023-06-27 13:22:08 +02:00
Arne Morten Kvarving 73ece47d97 StandardWell: move connectionRateBrine to Connections class 2023-06-27 13:22:08 +02:00
Arne Morten Kvarving 41a38cc9d6 WellInterfaceGeneric: add accessor for well_efficiency_factor 2023-06-27 13:22:08 +02:00
Arne Morten Kvarving d1a2d27acb changed: move Eval and restrictEval to WellInterfaceIndices 2023-06-27 13:22:08 +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
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
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
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
Arne Morten Kvarving 01c4aa1927 move updateWellStateWithTHPTargetProd to WellInterface
to share implementation between STW and MSW
2023-06-22 09:10:38 +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
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
Arne Morten Kvarving 90821b5a45 add some timing blocks 2023-06-19 11:55:34 +02:00
Arne Morten Kvarving 75deb81d44 Merge pull request #4698 from bska/document-getprop-awk
Add Brief Documentation Block to Test Property AWK Script
2023-06-08 12:55:43 +02:00
Arne Morten Kvarving 4a3a47c764 changed: no need to manually specify test data in update script
rather specify it as properties on the tests themself and extract
using some awk-ing.
2023-06-08 10:33:36 +02:00
Arne Morten Kvarving 9fa5f9d36d added: set vappars in fluidsystem/pvt at start of report step
to properly handle vappars updates in SCHEDULE
2023-06-01 11:05:21 +02:00
Arne Morten Kvarving f50c9a70ed fixed: forward struct as struct 2023-05-31 09:35:16 +02:00
Arne Morten Kvarving 127ddd44a2 supress unused capture warning with clang
a bug in clang causes it to emit unused lambda captures
here due to the if constexpr usage. use standard (void)
trick to suppress it
2023-05-31 09:35:16 +02:00
Arne Morten Kvarving 3ca1102d6f remove unused lambda capture 2023-05-31 09:35:16 +02:00
Arne Morten Kvarving 0f010daaf8 remove unused variables 2023-05-31 09:35:16 +02:00