OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

GitHub Actions: Add apt mirror to make package download more robust

Browse Source 
- Download of Ubuntu packages from Azure is unstable. Add mirror sites to improve reliability.
- Improve use of clang-format and include source code changes
This commit is contained in:
Magne Sjaastad
2023-02-07 07:22:57 +01:00
committed by GitHub
parent 527be5f644
commit 8028444018
11 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/Commands/CompletionExportCommands/RicMswSegmentCellIntersection.h
View File

@@ -30,9 +30,9 @@ class RicMswSegmentCellIntersection
{
public:
RicMswSegmentCellIntersection( const QString& gridName, // Pass in empty string for main grid
size_t globalCellIndex,
const cvf::Vec3st& gridLocalCellIJK,
const cvf::Vec3d& lengthsInCell );
size_t globalCellIndex,
const cvf::Vec3st& gridLocalCellIJK,
const cvf::Vec3d& lengthsInCell );
const QString& gridName() const;
size_t globalCellIndex() const;
cvf::Vec3st gridLocalCellIJK() const;

9
ApplicationLibCode/Commands/ExportCommands/RicExportLgrFeature.h
View File

@@ -117,10 +117,11 @@ public:
int priority() const
{
return type == RigCompletionData::CompletionType::FRACTURE ? 1
: type == RigCompletionData::CompletionType::FISHBONES ? 2
: type == RigCompletionData::CompletionType::PERFORATION ? 3
: 4;
return type == RigCompletionData::CompletionType::FRACTURE
? 1
: type == RigCompletionData::CompletionType::FISHBONES
? 2
: type == RigCompletionData::CompletionType::PERFORATION ? 3 : 4;
}
// Sort by priority, then name, then number