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

clang-format on all files in ApplicationCode, run two

Browse Source
This commit is contained in:
Magne Sjaastad 2019-09-06 10:43:12 +02:00
parent fe9e567825
commit c2b4e6b6ca
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ReservoirDataModel/Completions/RigCompletionData.h
View File

@ -149,13 +149,13 @@ private:
QString m_wellName; QString m_wellName;
RigCompletionDataGridCell m_cellIndex; RigCompletionDataGridCell m_cellIndex;
WellConnectionState m_connectionState; WellConnectionState m_connectionState;
double m_saturation; // TODO: remove, always use default in Eclipse? double m_saturation; // TODO: remove, always use default in Eclipse?
double m_transmissibility; double m_transmissibility;
double m_diameter; double m_diameter;
double m_kh; // TODO: Remove, always use default in Eclipse? double m_kh; // TODO: Remove, always use default in Eclipse?
double m_skinFactor; double m_skinFactor;
double m_dFactor; // TODO: Remove, always use default in Eclipse? double m_dFactor; // TODO: Remove, always use default in Eclipse?
CellDirection m_direction; CellDirection m_direction;
bool m_isMainBore; // to use mainbore for Eclipse calculation bool m_isMainBore; // to use mainbore for Eclipse calculation

2
ApplicationCode/ReservoirDataModel/RigCell.cpp
View File

@ -132,7 +132,7 @@ bool RigCell::isLongPyramidCell( double maxHeightFactor, double nodeNearToleranc
return true; return true;
#if 0 // More advanced checks turned off since the start. Why did I do that ? #if 0 // More advanced checks turned off since the start. Why did I do that ?
// Collapse of a complete face is detected. This is possibly the top of a pyramid // Collapse of a complete face is detected. This is possibly the top of a pyramid
// "face" has the index to the collapsed face. We need the size of the opposite face // "face" has the index to the collapsed face. We need the size of the opposite face
// to compare it with the pyramid "roof" length. // to compare it with the pyramid "roof" length.

2
ApplicationCode/ReservoirDataModel/RigWellResultPoint.h
View File

@ -51,7 +51,7 @@ struct RigWellResultPoint
int m_ertSegmentId; int m_ertSegmentId;
cvf::Vec3d m_bottomPosition; //< The estimated bottom position of the well segment, when we have no grid cell cvf::Vec3d m_bottomPosition; //< The estimated bottom position of the well segment, when we have no grid cell
//connections for the segment. // connections for the segment.
double m_flowRate; //< Total reservoir rate double m_flowRate; //< Total reservoir rate
double m_oilRate; //< Surface oil rate double m_oilRate; //< Surface oil rate
double m_gasRate; //< Surface gas rate For Field-unit, converted to [stb/day] to align with oil and water. double m_gasRate; //< Surface gas rate For Field-unit, converted to [stb/day] to align with oil and water.

4
ApplicationCode/UnitTests/Ert-Test.cpp
View File

@ -29,8 +29,8 @@ TEST(RigReservoirTest, WellTestErt)
{ {
char filename[1024] = char filename[1024] =
"d:/Models/Statoil_multipleRealisations/MultipleRealisations/Case_with_10_timesteps/Real0/BRUGGE_0000.X0000"; ecl_file_type* "d:/Models/Statoil_multipleRealisations/MultipleRealisations/Case_with_10_timesteps/Real0/BRUGGE_0000.X0000";
ecl_file = ecl_file_open(filename, ECL_FILE_CLOSE_STREAM); ecl_file_close(ecl_file); ecl_file_type* ecl_file = ecl_file_open(filename, ECL_FILE_CLOSE_STREAM); ecl_file_close(ecl_file);
} }
{ {

4
ApplicationCode/UserInterface/RiuGridStatisticsHistogramWidget.cpp
View File

@ -63,8 +63,8 @@ void RiuGridStatisticsHistogramWidget::draw( QPainter* painter, int x, int y, in
QRect r1( x, y, width, height ); QRect r1( x, y, width, height );
// Frame around it all; // Frame around it all;
QColor windowColor = palette().color( QPalette::Window ); // QColor(144, 173, 208, 180); QColor windowColor = palette().color( QPalette::Window ); // QColor(144, 173, 208, 180);
QColor frameColor = palette().color( QPalette::WindowText ); // QColor(220, 240, 255, 100); QColor frameColor = palette().color( QPalette::WindowText ); // QColor(220, 240, 255, 100);
QColor foregroundColor = palette().color( QPalette::Dark ); // QColor(100, 141, 189); QColor foregroundColor = palette().color( QPalette::Dark ); // QColor(100, 141, 189);
// painter->fillRect(r1, windowColor); // painter->fillRect(r1, windowColor);

4
ApplicationCode/UserInterface/RiuSimpleHistogramWidget.cpp
View File

@ -67,8 +67,8 @@ void RiuSimpleHistogramWidget::draw( QPainter* painter, int x, int y, int width,
QRect r1( x, y, width, height ); QRect r1( x, y, width, height );
// Frame around it all; // Frame around it all;
QColor windowColor = palette().color( QPalette::Window ); // QColor(144, 173, 208, 180); QColor windowColor = palette().color( QPalette::Window ); // QColor(144, 173, 208, 180);
QColor frameColor = palette().color( QPalette::Midlight ); // QColor(220, 240, 255, 100); QColor frameColor = palette().color( QPalette::Midlight ); // QColor(220, 240, 255, 100);
QColor foregroundColor = palette().color( QPalette::Dark ); // QColor(100, 141, 189); QColor foregroundColor = palette().color( QPalette::Dark ); // QColor(100, 141, 189);
// painter->fillRect(r1, windowColor); // painter->fillRect(r1, windowColor);