remove all trailing white space
this is just the result of ``` find -iname "*.[ch]pp" | xargs sed -i "s/ *$//" find opm/parser/share/keywords -type f | xargs sed -i "s/ *$//" ``` so if it causes conflicts with other patches, the others should get priority. The rationale behind this patch is that some people tell their editor to remove white space which leads to larger than necessary patches...
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
namespace Opm {
|
||||
|
||||
namespace FaceDir {
|
||||
|
||||
|
||||
DirEnum FromString(const std::string& stringValue) {
|
||||
if ((stringValue == "X") || (stringValue == "I"))
|
||||
return XPlus;
|
||||
@@ -42,7 +42,7 @@ namespace Opm {
|
||||
return ZPlus;
|
||||
if ((stringValue == "Z-") || (stringValue == "K-"))
|
||||
return ZMinus;
|
||||
|
||||
|
||||
throw std::invalid_argument("The string value " + stringValue + " could not be converted to a FaceDir enum value");
|
||||
}
|
||||
|
||||
@@ -56,22 +56,22 @@ namespace Opm {
|
||||
|
||||
if (stringValue == "Z")
|
||||
return ZPlus + ZMinus;
|
||||
|
||||
|
||||
if (stringValue == "XY")
|
||||
return XPlus + YPlus + XMinus + YMinus;
|
||||
|
||||
if (stringValue == "XZ")
|
||||
return XPlus + ZPlus + XMinus + ZMinus;
|
||||
|
||||
|
||||
if (stringValue == "YZ")
|
||||
return YPlus + ZPlus + YMinus + ZMinus;
|
||||
|
||||
|
||||
if (stringValue == "XYZ")
|
||||
return XPlus + YPlus + ZPlus + XMinus + YMinus + ZMinus;
|
||||
|
||||
throw std::invalid_argument("The string " + stringValue + " is not a valid MULTREGT direction value");
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user