Merge remote-tracking branch 'origin/patch_2021.10.3' into dev

This commit is contained in:
Magne Sjaastad
2022-03-28 09:06:38 +02:00
17 changed files with 164 additions and 31 deletions

View File

@@ -1071,7 +1071,8 @@ double RimEclipseCase::characteristicCellSize() const
const RigEclipseCaseData* rigEclipseCase = eclipseCaseData();
if ( rigEclipseCase && rigEclipseCase->mainGrid() )
{
return rigEclipseCase->mainGrid()->characteristicIJCellSize();
double maxSize = 200.0;
return std::min( rigEclipseCase->mainGrid()->characteristicIJCellSize(), maxSize );
}
return 10.0;