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
parent 63bc352a2b
commit c4993b6869
11 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/Application/RiaThermalFractureDefines.h
View File

@@ -22,8 +22,6 @@
#include <QString>
namespace RiaDefines
{
QString leakoffPressureDropResultName();

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

1
ApplicationLibCode/FileInterface/RifSurfaceImporter.h
View File

@@ -23,7 +23,6 @@
#include <limits>
#include <utility>
#include <vector>
#include <limits>
#include <QString>

2
ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.h
View File

@@ -71,7 +71,7 @@ protected:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* objectToggleField() override;
void defineEditorAttribute( const caf::PdmFieldHandle* field,
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute ) override;

2
ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.h
View File

@@ -43,7 +43,7 @@ public:
protected:
caf::PdmFieldHandle* objectToggleField() override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void initAfterRead() override;
void initAfterRead() override;
private:
caf::PdmField<bool> m_isActive;

6
ApplicationLibCode/ReservoirDataModel/RigFlowDiagInterfaceTools.h
View File

@@ -62,9 +62,9 @@ inline Opm::FlowDiagnostics::ConnectionValues
{
using ConnVals = Opm::FlowDiagnostics::ConnectionValues;
auto flux = ConnVals( ConnVals::NumConnections{G.numConnections()}, ConnVals::NumPhases{actPh.size()} );
auto flux = ConnVals( ConnVals::NumConnections{ G.numConnections() }, ConnVals::NumPhases{ actPh.size() } );
auto phas = ConnVals::PhaseID{0};
auto phas = ConnVals::PhaseID{ 0 };
for ( const auto& p : actPh )
{
@@ -74,7 +74,7 @@ inline Opm::FlowDiagnostics::ConnectionValues
{
assert( pflux.size() == flux.numConnections() );
auto conn = ConnVals::ConnID{0};
auto conn = ConnVals::ConnID{ 0 };
for ( const auto& v : pflux )
{
flux( conn, phas ) = v;

2
ApplicationLibCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.h
View File

@@ -22,9 +22,9 @@
#include <QString>
#include <QVector>
#include <limits>
#include <map>
#include <set>
#include <limits>
class QwtPlot;
class QColor;