diff --git a/ApplicationLibCode/FileInterface/RifOpmGridTools.cpp b/ApplicationLibCode/FileInterface/RifOpmGridTools.cpp index 2789556f95..b7eef1dcc1 100644 --- a/ApplicationLibCode/FileInterface/RifOpmGridTools.cpp +++ b/ApplicationLibCode/FileInterface/RifOpmGridTools.cpp @@ -128,6 +128,32 @@ bool RifOpmGridTools::importGrid( const std::string& gridFilePath, RigMainGrid* transferCoordinatesCartesian( opmGrid, opmGrid, mainGrid, mainGrid, caseData ); + auto opmMapAxes = opmGrid.get_mapaxes(); + if ( opmMapAxes.size() == 6 ) + { + std::array mapAxes; + for ( size_t i = 0; i < opmMapAxes.size(); ++i ) + { + mapAxes[i] = opmMapAxes[i]; + } + + // Set the map axes transformation matrix on the main grid + mainGrid->setMapAxes( mapAxes ); + mainGrid->setUseMapAxes( true ); + + auto transform = mainGrid->mapAxisTransform(); + + // Invert the transformation matrix to convert from file coordinates to domain coordinates + transform.invert(); + +#pragma omp parallel for + for ( long i = 0; i < static_cast( mainGrid->nodes().size() ); i++ ) + { + auto& n = mainGrid->nodes()[i]; + n.transformPoint( transform ); + } + } + return true; } diff --git a/ResInsightVersion.cmake b/ResInsightVersion.cmake index 12760b95cb..a64c192064 100644 --- a/ResInsightVersion.cmake +++ b/ResInsightVersion.cmake @@ -11,7 +11,7 @@ set(RESINSIGHT_VERSION_TEXT "-dev") # Must be unique and increasing within one combination of major/minor/patch version # The uniqueness of this text is independent of RESINSIGHT_VERSION_TEXT # Format of text must be ".xx" -set(RESINSIGHT_DEV_VERSION ".02") +set(RESINSIGHT_DEV_VERSION ".03") # https://github.com/CRAVA/crava/tree/master/libs/nrlib set(NRLIB_GITHUB_SHA "ba35d4359882f1c6f5e9dc30eb95fe52af50fd6f")