Adjustments before release

* Make sure existing project files do not filter intersection geometry by cell filters

* #10241 Temporarily revert changes to resampling changes
These fixes had unintended side effect on well flow plot and rft plots seen in regression tests
https://github.com/OPM/ResInsight/issues/10241

* Update version number
This commit is contained in:
Magne Sjaastad
2023-06-08 09:13:22 +02:00
committed by GitHub
parent 76102a8396
commit 5bd492dc56
7 changed files with 73 additions and 288 deletions

View File

@@ -1,17 +1,17 @@
set(RESINSIGHT_MAJOR_VERSION 2023)
set(RESINSIGHT_MINOR_VERSION 03)
set(RESINSIGHT_PATCH_VERSION 1)
set(RESINSIGHT_MINOR_VERSION 06)
set(RESINSIGHT_PATCH_VERSION 0)
# Opional text with no restrictions
set(RESINSIGHT_VERSION_TEXT "-dev")
#set(RESINSIGHT_VERSION_TEXT "-RC_04")
#set(RESINSIGHT_VERSION_TEXT "-dev")
set(RESINSIGHT_VERSION_TEXT "-RC_01")
# Optional text
# 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 ".01")
#set(RESINSIGHT_DEV_VERSION ".01")
# https://github.com/CRAVA/crava/tree/master/libs/nrlib
set(NRLIB_GITHUB_SHA "ba35d4359882f1c6f5e9dc30eb95fe52af50fd6f")