OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
15,233 Commits 31 Branches 117 Tags
62297b2a631e329ff171277d1bdf745f57b33ec9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 69b2df4e88 Merge pull request #4319 from atgeirr/silence-struct-class-warnings 
Silence warnings due to forward declaring structs as classes.
 2022-12-13 12:57:30 +01:00
Atgeirr Flø Rasmussen 6531fbc146 Silence warnings due to forward declaring structs as classes. 2022-12-13 11:57:33 +01:00
Atgeirr Flø Rasmussen e6a8686c77 Merge pull request #4309 from atgeirr/write-global-cell-index-to-damaris 
Write global cell index to damaris
 2022-12-07 15:38:40 +01:00
Atgeirr Flø Rasmussen 130f552dac Must set location for every variable. 2022-12-07 13:37:38 +01:00
Atgeirr Flø Rasmussen 18f6f5e4e3 Push index map to Damaris for output ordering. 2022-12-07 13:05:44 +01:00
Atgeirr Flø Rasmussen e23da0b6b7 Merge pull request #4301 from akva2/msw_avoid_mutable 
MultisegmentWell: avoid mutable matrices/vectors
 2022-12-01 08:03:01 +01:00
Atgeirr Flø Rasmussen 7e8b0d5700 Merge pull request #4290 from totto82/refactor_primaryVars_Meaning 
adapt to primary variable refactoring
 2022-11-30 11:10:47 +01:00
Atgeirr Flø Rasmussen 5107bcfada Merge pull request #4226 from hnil/remove_assert_cprw 
removed assert in cprw for strictly positive diagonal well coupling
 2022-11-14 12:42:37 +01:00
Atgeirr Flø Rasmussen e872cfb21d Merge pull request #4194 from hnil/trueimpes_scaling_fix 
- made heuristic scaling of trueimpes
 2022-11-01 12:00:06 +01:00
Atgeirr Flø Rasmussen 2192b3a86c Unhide NewtonMaxIterations. 2022-10-31 17:13:09 +01:00
Atgeirr Flø Rasmussen 16ca6a5ead Merge pull request #4217 from blattms/Debian-fixes 
Debian fixes (manpage and missing header include)
 2022-10-31 16:29:54 +01:00
Atgeirr Flø Rasmussen 58edf39330 Add data update capability for new test. 2022-10-27 15:22:05 +02:00
Atgeirr Flø Rasmussen 711b72f28e Merge pull request #4206 from Tongdongq/fix-default-param 
Removed default declaration in wrong place
 2022-10-27 12:55:42 +02:00
Atgeirr Flø Rasmussen 142921e3d5 Ensure linearizer is updated after transmissibility changes. 2022-10-27 09:54:40 +02:00
Atgeirr Flø Rasmussen 9547d55d96 Add regression test for MULTFLT in SCHEDULE. 2022-10-26 14:29:18 +02:00
Atgeirr Flø Rasmussen 5f058d3e0d Merge pull request #4187 from atgeirr/fix-damaris-cmake 
Use MPI_FOUND not MPI_Found.
 2022-10-19 15:24:32 +02:00
Atgeirr Flø Rasmussen a9c1a0998e Use MPI_FOUND not MPI_Found. 2022-10-19 14:13:39 +02:00
Atgeirr Flø Rasmussen 870e8db59a Bump version for master branch. 2022-10-18 17:30:43 +02:00
Atgeirr Flø Rasmussen 776180c081 Merge pull request #4175 from akva2/damaris_fixes 
fixed: damaris depends on mpi
 2022-10-18 15:22:46 +02:00
Atgeirr Flø Rasmussen 97ed033fdf Merge pull request #4094 from totto82/checkControl 
Check control
 2022-10-18 14:31:31 +02:00
Atgeirr Flø Rasmussen a2c5ec1127 Merge pull request #4037 from totto82/scaleEnergy 
scale energy residual to have the same relative order as the mass balance residuals
 2022-10-17 23:33:28 +02:00
Atgeirr Flø Rasmussen f177b69e84 Merge pull request #4172 from atgeirr/remove-unused-vars 
Remove unused variables.
 2022-10-17 17:39:01 +02:00
Atgeirr Flø Rasmussen a35f365e3e Merge pull request #4143 from totto82/simplifyWellReport 
only output final change of well control
 2022-10-17 17:28:53 +02:00
Atgeirr Flø Rasmussen 216f77f03f Remove unused variables. 2022-10-17 16:45:18 +02:00
Atgeirr Flø Rasmussen 1eec214c89 Merge pull request #4169 from blattms/dune-2.9-fix-deprecations 
Dune 2.9 fix deprecations
 2022-10-17 15:17:29 +02:00
Atgeirr Flø Rasmussen 5a90ced52d Merge pull request #4054 from totto82/gasliftthplim 
Allow for gaslift for wells that violate thp limit but are not allowed to switch
 2022-10-17 15:15:49 +02:00
Atgeirr Flø Rasmussen 6a13fe807a Merge pull request #4155 from totto82/fixTestGlift 
set alq before trying to solve the equation during well testing
 2022-10-17 15:08:57 +02:00
Atgeirr Flø Rasmussen 31ac961834 Merge pull request #4157 from blattms/wellcontrib-available-always 
Fix compilation with amgcl/vexcl and without CUDA/OpenCL.
 2022-10-17 15:03:37 +02:00
Atgeirr Flø Rasmussen c6b3e4c462 Hide all vtk parameters. 2022-10-14 10:46:45 +02:00
Atgeirr Flø Rasmussen 69f2ede363 Merge pull request #4165 from atgeirr/avoid-useless-call 
Do not call assignToSolution() and throw away the result.
 2022-10-14 10:31:26 +02:00
Atgeirr Flø Rasmussen de12a990aa Do not call assignToSolution() and throw away the result. 2022-10-13 21:42:53 +02:00
Atgeirr Flø Rasmussen 2064e8725f Merge pull request #4121 from ElyesAhmed/damaris_integ_v3 
Damaris integ v3
 2022-10-13 14:02:30 +02:00
Atgeirr Flø Rasmussen d27ed995bf Use OpmLog. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen b7bc8437e7 Minor fixes and formatting issues addressed. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen c1b3c5e973 Rename option to EnableDamarisOutputCollective. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen 066897bbf9 Remove file added by mistake. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen 2c86a61b70 Remove extra whitespace. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen 430d8995eb Reformatting with clang-format. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen 76bacff3cf Move XML template to separate file, fix formatting, and use path. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen fd1d1d15a4 Bugfix: remove quotes around _File_Mode. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen 926c213628 Make ensureOutputDirExists() callable outside readDeck.cpp, and use it. 
This is necessary because when using Damaris we must have the output dir ready
when we initialize Damaris. In the existing code, this was ensured only
from the setupLogging() call.
 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen fae71df32d Fix initialization and stopping Damaris. 
With this, flow no longer hangs on exit.
 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen e347959d79 Set _PATH_REGEX_ for non-async, also reformat. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen 408fadca8e Add #define to fix compile on clang. 
Necessary due to primitive check for std::unique_ptr in the XSD library.
 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen 38e38fd1c2 Merge pull request #4161 from blattms/do-no-include-config.h-in-headers 
Move include of config.h to cpp-file
 2022-10-13 09:09:42 +02:00
Atgeirr Flø Rasmussen a7a5a7a98d Make the Python interface use the TpfaLinearizer. 2022-10-04 11:44:35 +02:00
Atgeirr Flø Rasmussen d7ba860bf1 Rename so that flow_blackoil_tpfa becomes flow_blackoil. 2022-10-03 14:14:15 +02:00
Atgeirr Flø Rasmussen dacb77425a Merge pull request #4017 from atgeirr/make-fast-assembly-default 
Make the TPFA linearizer default for 1/2/3 phase blackoil.
 2022-10-03 12:01:22 +02:00
Atgeirr Flø Rasmussen 2542f0c549 Flag NETBALAN as partially supported. 2022-09-30 15:41:11 +02:00
Atgeirr Flø Rasmussen 67b95afdd9 Support NETBALAN (partially). 
NETBALAN can be used to choose balancing frequency (limited: either start
of timestep, or first NUPCOL iterations), balancing tolerance, and maximum
balancing iterations. These correspond to items 1, 2 and 3 of NETBALAN.
 2022-09-30 15:41:11 +02:00
Atgeirr Flø Rasmussen f6033702c9 Ensure DIFFUSE is supported. 
This is only instantiated for two-phase gas/oil and for 3-phase blackoil.
Runtime safeguards have been added to avoid the mistake of running with
a simulator combination that silently ignores DIFFUSE.
 2022-09-30 15:28:58 +02:00
Atgeirr Flø Rasmussen b9e157e3f5 Bugfix: fix dis/en-abling dissolution in the fluid state. 
This affects the gas/water model, which should not have dissolution,
to be consistent with definitions of FluidState and ScalarFluidState
in the BlackOilIntensiveQuantities class.
 2022-09-30 10:58:05 +02:00
Atgeirr Flø Rasmussen 616b145469 Make one- and two-phase sims also use fast assembly. 2022-09-30 09:21:34 +02:00
Atgeirr Flø Rasmussen f1762a1abd Make the TPFA linearizer default for 3 phase blackoil. 2022-09-30 09:21:34 +02:00
Atgeirr Flø Rasmussen 54284fad7f Remove unneeded timeIdx argument. 2022-09-29 14:13:49 +02:00
Atgeirr Flø Rasmussen 95fdea67a8 Do not re-solve network after NUPCOL Newton iterations. 2022-09-28 10:44:42 +02:00
Atgeirr Flø Rasmussen cc15b29372 Add network model iterations. 
Implemented by conditionally recursing in BlackoilWellModel::assembleImpl().
 2022-09-28 10:44:42 +02:00
Atgeirr Flø Rasmussen 6104a01468 Add WellInterfaceGeneric::getDynamicThpLimit() method. 2022-09-28 10:44:42 +02:00
Atgeirr Flø Rasmussen 04183dea31 Ensure solvent boundary fluxes work. 
This does the job for the element-context-based linearizer,
but not for the TpfaLinearizer, which when combined with the
solvent model will require a bit more work for bcs.
 2022-09-28 08:47:04 +02:00
Atgeirr Flø Rasmussen b7758aa706 Use std::array rather than C arrays. 2022-09-28 08:47:04 +02:00
Atgeirr Flø Rasmussen bc13f57e95 Simplify the boundaryCondition() method. 2022-09-28 08:47:04 +02:00
Atgeirr Flø Rasmussen 5e08a9fc12 Make boundary condition data accessor function. 2022-09-28 08:47:04 +02:00
Atgeirr Flø Rasmussen 68e1479caf [WIP] Refactor calculateBoundaryGradients_() 
Not addressing solvent yet.
 2022-09-28 08:47:04 +02:00
Atgeirr Flø Rasmussen b65f5e9808 Add new overload for transmissibilityBoundary() without element context. 2022-09-28 08:47:04 +02:00
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