Commit 22f9075d authored by Thibault Hallouin's avatar Thibault Hallouin
Browse files

replace bitwise operators with logical operators where relevant

Showing with 19 additions and 19 deletions
+19 -19
......@@ -77,7 +77,7 @@ namespace evalhyd
for (std::size_t m = 0; m < n_msk; m++)
{
xt::view(t_msk, m) =
xt::where(obs_nan | prd_nan,
xt::where(obs_nan || prd_nan,
false, xt::view(t_msk, m));
}
};
......
......@@ -303,43 +303,43 @@ namespace evalhyd
{
if ((opr1 == "<") && (opr2 == ">"))
{
t_msk = xt::where((q < val1) & (q > val2),
t_msk = xt::where((q < val1) && (q > val2),
1, t_msk);
}
else if ((opr1 == "<=") && (opr2 == ">"))
{
t_msk = xt::where((q <= val1) & (q > val2),
t_msk = xt::where((q <= val1) && (q > val2),
1, t_msk);
}
else if ((opr1 == "<") && (opr2 == ">="))
{
t_msk = xt::where((q < val1) & (q >= val2),
t_msk = xt::where((q < val1) && (q >= val2),
1, t_msk);
}
else if ((opr1 == "<=") && (opr2 == ">="))
{
t_msk = xt::where((q <= val1) & (q >= val2),
t_msk = xt::where((q <= val1) && (q >= val2),
1, t_msk);
}
if ((opr2 == "<") && (opr1 == ">"))
{
t_msk = xt::where((q < val2) & (q > val1),
t_msk = xt::where((q < val2) && (q > val1),
1, t_msk);
}
else if ((opr2 == "<=") && (opr1 == ">"))
{
t_msk = xt::where((q <= val2) & (q > val1),
t_msk = xt::where((q <= val2) && (q > val1),
1, t_msk);
}
else if ((opr2 == "<") && (opr1 == ">="))
{
t_msk = xt::where((q < val2) & (q >= val1),
t_msk = xt::where((q < val2) && (q >= val1),
1, t_msk);
}
else if ((opr2 == "<=") && (opr1 == ">="))
{
t_msk = xt::where((q <= val2) & (q >= val1),
t_msk = xt::where((q <= val2) && (q >= val1),
1, t_msk);
}
}
......@@ -347,43 +347,43 @@ namespace evalhyd
{
if ((opr1 == "<") && (opr2 == ">"))
{
t_msk = xt::where((q < val1) | (q > val2),
t_msk = xt::where((q < val1) || (q > val2),
1, t_msk);
}
else if ((opr1 == "<=") && (opr2 == ">"))
{
t_msk = xt::where((q <= val1) | (q > val2),
t_msk = xt::where((q <= val1) || (q > val2),
1, t_msk);
}
else if ((opr1 == "<") && (opr2 == ">="))
{
t_msk = xt::where((q < val1) | (q >= val2),
t_msk = xt::where((q < val1) || (q >= val2),
1, t_msk);
}
else if ((opr1 == "<=") && (opr2 == ">="))
{
t_msk = xt::where((q <= val1) & (q >= val2),
t_msk = xt::where((q <= val1) && (q >= val2),
1, t_msk);
}
if ((opr2 == "<") && (opr1 == ">"))
{
t_msk = xt::where((q < val2) | (q > val1),
t_msk = xt::where((q < val2) || (q > val1),
1, t_msk);
}
else if ((opr2 == "<=") && (opr1 == ">"))
{
t_msk = xt::where((q <= val2) | (q > val1),
t_msk = xt::where((q <= val2) || (q > val1),
1, t_msk);
}
else if ((opr2 == "<") && (opr1 == ">="))
{
t_msk = xt::where((q < val2) | (q >= val1),
t_msk = xt::where((q < val2) || (q >= val1),
1, t_msk);
}
else if ((opr2 == "<=") && (opr1 == ">="))
{
t_msk = xt::where((q <= val2) | (q >= val1),
t_msk = xt::where((q <= val2) || (q >= val1),
1, t_msk);
}
}
......
......@@ -104,7 +104,7 @@ namespace evalhyd
);
}
auto msk_nan = xt::where(obs_nan | xt::row(prd_nan, 0))[0];
auto msk_nan = xt::where(obs_nan || xt::row(prd_nan, 0))[0];
xt::view(t_msk, xt::all(), xt::keep(msk_nan)) = false;
};
......
......@@ -90,7 +90,7 @@ namespace evalhyd
);
xt::xtensor<bool, 1> wdw =
(x_timepoints >= start) & (x_timepoints < end);
(x_timepoints >= start) && (x_timepoints < end);
// check that year is complete (without a rigorous leap year check)
int n_days = xt::sum(wdw)();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment