Merge branch 'master' into Adding_SHRATE_RELATED

This commit is contained in:
Kai Bao
2015-06-23 13:31:20 +02:00

View File

@@ -1,5 +1,5 @@
/*
Copyright 2015 SINTEF ICT, Applied Mathematics.
Copyright 2015 Statoil ASA.
This file is part of the Open Porous Media project (OPM).
@@ -22,7 +22,11 @@
namespace Opm {
namespace detail {
class Point2D
{
public:
@@ -51,7 +55,8 @@ namespace Opm {
x_ = x;
}
void setY(const double y){
void setY(const double y)
{
y_ = y;
}
@@ -94,8 +99,11 @@ namespace Opm {
}; // class Point2D
} // namespace detail
} // namespace Opm
#endif // OPM_POINT2D_HEADER_INCLUDED