Refactor use of grid dimensions

This commit is contained in:
Magne Sjaastad committed 2024-01-22 14:52:49 +01:00
1 parent 833a0e8584
commit a090992f5a
7 files changed
+19 -29

No files matched your search

@@ -708,7 +708,7 @@ void RimEclipseCase::loadAndSynchronizeInputProperties( bool importGridOrFaultDa
// Make sure we actually have reservoir data
CVF_ASSERT( eclipseCaseData() );
CVF_ASSERT( eclipseCaseData()->mainGrid()->gridPointDimensions() != cvf::Vec3st( 0, 0, 0 ) );
CVF_ASSERT( eclipseCaseData()->mainGrid()->cellCount() != 0 );
// Then read the properties from all the files referenced by the InputReservoir
@@ -114,7 +114,7 @@ bool RimEclipseInputCase::openDataFileSet( const QStringList& fileNames )
QString gridFileName;
// First find and read the grid data
if ( eclipseCaseData()->mainGrid()->gridPointDimensions() == cvf::Vec3st( 0, 0, 0 ) )
if ( eclipseCaseData()->mainGrid()->cellCount() == 0 )
{
for ( int i = 0; i < fileNames.size(); i++ )
{
@@ -142,7 +142,7 @@ bool RimEclipseInputCase::openDataFileSet( const QStringList& fileNames )
}
}
if ( eclipseCaseData()->mainGrid()->gridPointDimensions() == cvf::Vec3st( 0, 0, 0 ) )
if ( eclipseCaseData()->mainGrid()->cellCount() == 0 )
{
for ( QString errorMessages : allErrorMessages )
{
@@ -73,7 +73,7 @@ bool RimRoffCase::openEclipseGridFile()
QString fileName = gridFileName();
// First find and read the grid data
if ( eclipseCaseData()->mainGrid()->gridPointDimensions() == cvf::Vec3st( 0, 0, 0 ) )
if ( eclipseCaseData()->mainGrid()->cellCount() == 0 )
{
QString errorMessages;
if ( RifRoffFileTools::openGridFile( fileName, eclipseCaseData(), &errorMessages ) )