Copy changes from dev-branch into main

History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.
This commit is contained in:
Magne Sjaastad
2023-10-23 08:12:19 +02:00
parent 5688838899
commit 06f9c6126d
1778 changed files with 35036 additions and 12457 deletions

View File

@@ -154,7 +154,7 @@ TEST( RifEclipseUserDataKeywordToolsTest, CreationOfSummaryAddresses )
EXPECT_EQ( address.category(), RifEclipseSummaryAddress::SUMMARY_WELL_GROUP );
EXPECT_STREQ( quantity.data(), address.quantityName().data() );
EXPECT_STREQ( columnData[0].data(), address.wellGroupName().data() );
EXPECT_STREQ( columnData[0].data(), address.groupName().data() );
}
// Well