Commit Graph
100 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen 6834fafe15 Remove misleading dummy ISAI config.
Added comment explaining a bit.
2022-09-21 09:32:06 +02:00
Atgeirr Flø Rasmussen caca77dc67 Rename command line option --linsolver to --linear-solver. 2022-09-21 09:31:19 +02:00
Atgeirr Flø Rasmussen f3b536889d Merge pull request #4097 from totto82/cleanDBG
remove computeBhpAtThpLimitProd() output from .DBG file
2022-09-14 10:11:50 +02:00
Atgeirr Flø Rasmussen e9cba9e0c1 Use compressedIndexForInterior() for mapping cartesian indices. 2022-09-05 12:42:54 +02:00
Atgeirr Flø Rasmussen 92538b0612 Ensure intensive quantities are calculated at start of simulation.
Moving it ensures it is also done for restart simulation runs. Without
this, the well model will actually initialize the IQs, but only for
owned cells, not overlap/ghost cells, which caused parallel failure.
2022-09-01 14:00:42 +02:00
Atgeirr Flø Rasmussen 432df26ecc Merge pull request #4025 from bska/remove-dune-unused
Prefer Attributes to Macros
2022-08-25 08:29:33 +02:00
Atgeirr Flø Rasmussen c0e5996b70 Merge pull request #4024 from atgeirr/silence-override-warning
Add override qualifier to silence warning.
2022-08-24 16:07:04 +02:00
Atgeirr Flø Rasmussen 6cf02813e5 Add override qualifier to silence warning. 2022-08-24 15:36:56 +02:00
Atgeirr Flø Rasmussen 51e5459be5 Add packing support for classes needing it.
Since Rates is not longer a POD, it needs explicit
packSize()/pack()/unpack() support. This also applies
to classes containing Rates, namely Connection and Segment.
Similarly, SegmentPressures is not a POD.
2022-08-24 15:11:27 +02:00
Atgeirr Flø Rasmussen 04fe35a82e Merge pull request #4013 from GitPaean/num_aquifer_construct_simpli
simplifying the constructor for AquiferNumerical
2022-08-22 08:20:34 +02:00
Atgeirr Flø Rasmussen 6afb386070 Merge pull request #4009 from atgeirr/fix-cartesian-mapping
Bugfix and simplification of cartesian mapping.
2022-08-17 14:50:21 +02:00
Atgeirr Flø Rasmussen c94ff12e4c Bugfix and simplification of cartesian mapping.
We already have the mapping available, and using the equilGrid() is only valid
on rank 0.
2022-08-17 14:13:13 +02:00
Atgeirr Flø Rasmussen 04180031e1 Limit warnings to terminal during deck input.
With this, the tag limit of 10 is used from the very start of the run,
and not only after the deck has been read.
2022-08-16 14:43:07 +02:00
Atgeirr Flø Rasmussen 03352ff0fc Fix missing angle bracket. 2022-08-15 11:29:26 +02:00
Atgeirr Flø Rasmussen a242dadb6f Merge pull request #3988 from atgeirr/faster_assembly_minimal
Faster assembly minimal
2022-08-10 11:20:59 +02:00
Atgeirr Flø Rasmussen a5c8d40cfa Remove unneeded timeIdx arguments, also silence other warnings. 2022-08-10 10:01:54 +02:00
Atgeirr Flø Rasmussen 923b1c555c Make flow_blackoil_tpfa.cpp an OPM Flow variant in the build system. 2022-08-09 14:53:58 +02:00
Atgeirr Flø Rasmussen 90e8a9af69 Do not change true impes weights. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen 727bf8d01f Do not make changes to eclthresholdpressure.hh and ecltracermodel.hh.
Not required for first version, but should be added later.
2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen 322dcbfb36 Make getWaterFlux() take const ref argument. Minor formatting cleanups. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen 254330463e Disable diffusion for flow_blackoil_tpfa. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen cabe64cc58 Further reduction of modifications. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen 5fba14373b Modification to reduce PR to minimal changes. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen 9de8d12276 [WIP] not using the SmallElementContext or BlackOilIntensiveQuantitiesSimple. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen cd729e5bd3 Simplify formatting. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen 5042b02138 Rename method and move to impl file. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen 0da2b68e0b Adapt to changed interface. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen 750e7ac5dd Clean up and remove unnecessary parts from flow_blackoil_tpfa.cpp. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen 55b637aedd Remove unneded class.
All functionality is now in EclFluxModule.
2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen 0bf508daf7 Refactor EclFluxModule.
This makes that class have the same methods as the EclFluxModuleTpfa, so
the latter can be removed.
2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen d61e578194 Remove unneeded data member. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen 8c0a8eda2c Fix: Use correct gravity. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen 9603a1643e Continue refactoring flux module.
At current commit, see differences (added this commit).
2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen fb0bc3d55a Continue cleanup of flux module. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen fdce3e590d WIP, now runs with just this flux module replacing original versions. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen c48770dc5f Remove EclProblemTpfa, folding all methods into EclProblem. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen 64474c0267 Remove unused code. 2022-08-09 11:09:48 +02:00
Atgeirr Flø Rasmussen f19b6f723d Refactor to avoid twin codepaths most places. 2022-08-09 11:09:48 +02:00
Atgeirr Flø Rasmussen b1bcab31b9 Refactor addToSource to add interface not using element context. 2022-08-09 11:09:48 +02:00
Atgeirr Flø Rasmussen 66a1c46413 Remove unused code branch. 2022-08-09 11:09:48 +02:00
Atgeirr Flø Rasmussen 657f4f5b8e Use separate TpfaLinearizer (again). 2022-08-09 11:09:48 +02:00
Atgeirr Flø Rasmussen 4d0fc84b1f No need for specific base local residual class. 2022-08-09 11:09:48 +02:00
Atgeirr Flø Rasmussen 9dba7865e9 No need for specific variant of base ad local linearizer. 2022-08-09 11:09:48 +02:00
Atgeirr Flø Rasmussen 743eff9cf6 Set prop for using tpfa linearizer to true. 2022-08-09 11:09:48 +02:00
Atgeirr Flø Rasmussen 6e46d332de Do not use the separate LinearizerTpfa class. 2022-08-09 11:09:48 +02:00
Atgeirr Flø Rasmussen 5d0ae333f4 Fix: add template argument. 2022-08-09 11:09:48 +02:00
Atgeirr Flø Rasmussen 93ce28e9a2 Merge pull request #3972 from ElyesAhmed/alugrid2
Alugrid2
2022-08-04 15:43:24 +02:00
Atgeirr Flø Rasmussen ffb09ee53e Merge pull request #3937 from atgeirr/pressure-bhp-cpr
Pressure bhp cpr
2022-06-16 17:15:49 +02:00
Atgeirr Flø Rasmussen c871e603f8 Do not insert unused options. 2022-06-16 16:24:41 +02:00
Atgeirr Flø Rasmussen e8e915b9eb Use stricter CNV tolerance for test.
This makes the serial and parallel runs closer to each other.
2022-06-16 12:24:22 +02:00
Atgeirr Flø Rasmussen 66ff942b2f Move MatrixBlock specializations inside namespace.
This is necessary since the calls are ns-qualified in the
matrix market code.
2022-06-16 11:37:40 +02:00
Atgeirr Flø Rasmussen 2992ec25d8 Address issues raised in review. 2022-06-10 15:59:45 +02:00
Atgeirr Flø Rasmussen 7fe3839500 Use MatrixBlock consistently, also whitespace cleanup. 2022-06-10 11:08:24 +02:00
Atgeirr Flø Rasmussen 16b1756339 Add necessary include statements. 2022-06-09 10:38:47 +02:00
Atgeirr Flø Rasmussen a0f16089f7 Re-add explicit instantiation of FlexibleSolver to reduce compile time. 2022-06-08 17:03:27 +02:00
Atgeirr Flø Rasmussen 6c5988f011 Instantiate test program with MatrixBlock not FieldMatrix.
Cuts down on the necessary instantiation combinations for FlexibleSolver.
2022-06-08 17:03:27 +02:00
Atgeirr Flø Rasmussen fef06a77af Updated for upstream changes. 2022-06-08 17:02:02 +02:00
Atgeirr Flø Rasmussen 1aed863956 Re-add grid view argument to doLoadBalance_(). 2022-06-08 15:33:32 +02:00
Atgeirr Flø Rasmussen 75ccd88f4f Merge pull request #3888 from totto82/stop_tgr2
fix trivial group target
2022-04-26 08:34:06 +02:00
Atgeirr Flø Rasmussen 374b25639e Merge pull request #3872 from totto82/fix_stop_inoperable
Fix STOP in combination with inoperable/unsolvable
2022-04-25 10:31:02 +02:00
Atgeirr Flø Rasmussen 245a87e296 Merge pull request #3851 from totto82/doublecheckecon
Avoid premature closing of wells due to econ limits
2022-04-01 10:01:47 +02:00
Atgeirr Flø Rasmussen 131bb6585f Merge pull request #3827 from bska/smry-phase-press-blk
Support Calculating Phase Pressures for Water/Gas at Block Level
2022-03-01 09:44:20 +01:00
Atgeirr Flø Rasmussen 357ba55de5 Merge pull request #3773 from GitPaean/return_zero_thp_zero_rate_inj
return zero thp value for extremely small injection rate
2022-01-20 14:49:25 +01:00
Atgeirr Flø Rasmussen 9f7d4f2fc2 Merge pull request #3760 from GitPaean/thp_fixing_model_2
fixing the failure that bhp could not be calculated with thp limit
2022-01-19 12:48:39 +01:00
Atgeirr Flø Rasmussen e970449667 Merge pull request #3753 from hakonhagland/glgi_const2
Made some methods in GasLiftGroupInfo const
2021-12-22 07:27:16 +01:00
Atgeirr Flø Rasmussen c94a940770 Add test for the custom communicator feature. 2021-12-20 09:58:13 +01:00
Atgeirr Flø Rasmussen 74b79d4626 Merge pull request #3743 from akva2/adjust_material_adjustments
adjust to upstream changes
2021-12-16 09:34:46 +01:00
Atgeirr Flø Rasmussen e22d1177fd Merge pull request #3738 from OPMUSER/WILL_STOP
Update PartiallySupportedFlowKeywords.cpp All STOP Version
2021-12-13 09:23:44 +01:00
Atgeirr Flø Rasmussen eec32ec581 Replace DEMONSTRATE_RUN_WITH_NONWORLD_COMM macro with runtime bool.
This allows for testing the simulator with the artifically split communicator,
in order to verify that there is no inappropriate usage of the world communicator.
2021-12-10 17:42:44 +01:00
Atgeirr Flø Rasmussen e2cdab208b Merge pull request #3730 from atgeirr/fix-efficiency-alq-network
Account for efficiency when adding lift gas to network flows.
2021-12-09 07:49:16 +01:00
Atgeirr Flø Rasmussen 819d88a1a7 Account for efficiency when adding lift gas to network flows. 2021-12-08 15:54:12 +01:00
Atgeirr Flø Rasmussen 69b81c4fbf Merge pull request #3724 from totto82/CO2STORETHERMAL
Add gasoil + thermal simulator
2021-12-08 08:33:46 +01:00
Atgeirr Flø Rasmussen 84392a25b4 Merge pull request #3648 from joakim-hove/phase-usage-constructor
Create PhaseUsage constructor
2021-11-05 15:35:50 +01:00
Atgeirr Flø Rasmussen 0dc743421e Merge pull request #3662 from atgeirr/fix-extra-mpi-init
Remove extra MPI initialization.
2021-11-03 09:19:03 +01:00
Atgeirr Flø Rasmussen c8828ad43b Remove extra MPI initialization.
Initialization is now done in the Main::initMPI() method.
For configurations with dune-fem, this also caused crashes
with dune-fem versions prior to 2.8.
2021-11-02 20:35:20 +01:00
Atgeirr Flø Rasmussen 2cf78c6da0 Merge pull request #3660 from atgeirr/remove-redundant-class
Remove ISTLSolverEbosFlexible and flow_blackoil_dunecpr.
2021-11-02 15:32:53 +01:00
Atgeirr Flø Rasmussen 5503e6ca06 Remove ISTLSolverEbosFlexible and flow_blackoil_dunecpr.
The class ISTLSolverEbos has all features of the removed class, and
is not much more complex. The flow_blackoil_dunecpr is the only
program using it, and is redundant.
2021-11-02 15:02:48 +01:00
Atgeirr Flø Rasmussen 624d8b1343 Merge pull request #3651 from akva2/remove_gcc7_compat
use std::filesystem directly
2021-11-01 15:30:03 +01:00
Atgeirr Flø Rasmussen 5f81b77d14 Merge pull request #3639 from blattms/dune-fem-master
Fixes compilation with dune-fem 2.8
2021-11-01 13:10:17 +01:00
Atgeirr Flø Rasmussen 16eafcca04 Merge pull request #3649 from akva2/separate_flow_binaries
changed: build separate simulator binaries for flow
2021-11-01 13:07:07 +01:00
Atgeirr Flø Rasmussen fa3b619ec9 Merge pull request #3644 from blattms/use-cl2.hpp
[enhancement][opencl} Use cl2.hpp instead of cl.hpp (missing on bullseye)
2021-11-01 10:10:30 +01:00
Atgeirr Flø Rasmussen fe8df97266 Merge pull request #3637 from akva2/fix_mpiabort_no_input_case
changed: special case no input deck given handling
2021-10-29 15:35:35 +02:00
Atgeirr Flø Rasmussen 2a7a9d46ce Merge pull request #3640 from totto82/inj_comm
communicate inj_resv/surface_rates
2021-10-29 15:35:24 +02:00
Atgeirr Flø Rasmussen b4fe98b739 Merge pull request #3636 from joakim-hove/mark-as-supported-diffuse-diffc-gpmaint
Mark keywords DIFFC, DIFFUSE and GPMAINT as supported
2021-10-29 12:25:00 +02:00
Atgeirr Flø Rasmussen b568237c04 Merge pull request #3625 from atgeirr/bump-version
Bump version.
2021-10-25 09:06:06 +02:00
Atgeirr Flø Rasmussen 760099a692 Bump version. 2021-10-22 10:18:22 +02:00
Atgeirr Flø Rasmussen 8ae8e07212 Merge pull request #3609 from atgeirr/fix-init-order
Silence init order and unused argument warnings
2021-10-15 13:41:29 +02:00
Atgeirr Flø Rasmussen fc80451e3d Silence unused argument warning. 2021-10-15 13:26:44 +02:00
Atgeirr Flø Rasmussen 4c213b25e0 Order of initialization should match order of definition. 2021-10-15 13:24:55 +02:00
Atgeirr Flø Rasmussen 5e1853b8e4 Merge pull request #3588 from totto82/improve_switch_output
make multiple well control switching output more readable
2021-10-14 10:56:53 +02:00
Atgeirr Flø Rasmussen dead95ba18 Merge pull request #3519 from totto82/continueOnConvergenceFailure
Option for continue on solver convergence failure
2021-10-14 09:31:23 +02:00
Atgeirr Flø Rasmussen 347ad2da6b Reinstate tests that were commented out due to EclWellManager issues. 2021-10-13 11:10:48 +02:00
Atgeirr Flø Rasmussen 432f4d8247 Remove unused class EclPeacemanWell 2021-10-13 11:00:08 +02:00
Atgeirr Flø Rasmussen e6e8eab6d2 Remove unused EclWellManager class. 2021-10-13 10:56:33 +02:00
Atgeirr Flø Rasmussen 2da4165b3e Stop using EclWellManager in test_ecl_output.cc. 2021-10-13 10:55:05 +02:00
Atgeirr Flø Rasmussen 72be136529 Stop using EclWellManager in test_equil.cc. 2021-10-13 10:50:33 +02:00
Atgeirr Flø Rasmussen 54599f3fc6 Merge pull request #3603 from akva2/fix_mpi_double_finalize
fixed: double call to MPI_Finalize
2021-10-13 10:13:12 +02:00
Atgeirr Flø Rasmussen 7e5cd73254 Set communication object before constructing vanguard. 2021-10-06 08:52:19 +02:00
Atgeirr Flø Rasmussen 09a5320e21 Silence unused variable warning. 2021-10-06 08:52:06 +02:00
Atgeirr Flø Rasmussen e519bb32ec Use correct communicator in EclGenericVanguard::init(). 2021-10-06 08:51:31 +02:00