crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-28 14:15:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Applying clang format

Browse source
This commit is contained in:
Patrick Shriwise 2022-09-08 22:41:54 -05:00
parent b68e6e96e6
commit 2fa63f3302
2 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
include/openmc/interpolate.h
View file

@ -34,8 +34,8 @@ inline double interpolate_log_log(
return y0 * exp(f * log(y1 / y0));
}
inline double interpolate_lagrangian(
const std::vector<double>& xs, const std::vector<double>& ys, int idx, double x, int order)
inline double interpolate_lagrangian(const std::vector<double>& xs,
const std::vector<double>& ys, int idx, double x, int order)
{
std::vector<double> coeffs;
@ -55,9 +55,8 @@ inline double interpolate_lagrangian(
coeffs.begin(), coeffs.end(), ys.begin() + idx, 0.0);
}
double interpolate(const std::vector<double>& xs,
const std::vector<double>& ys, double x,
Interpolation i = Interpolation::lin_lin)
double interpolate(const std::vector<double>& xs, const std::vector<double>& ys,
double x, Interpolation i = Interpolation::lin_lin)
{
int idx = lower_bound_index(xs.begin(), xs.end(), x);
@ -75,20 +74,22 @@ double interpolate(const std::vector<double>& xs,
return interpolate_log_lin(xs[idx], xs[idx + 1], ys[idx], ys[idx + 1], x);
case Interpolation::quadratic:
// move back one point if x is in the last interval of the x-grid
if (idx == xs.size() - 2 && idx > 0) idx--;
if (idx == xs.size() - 2 && idx > 0)
idx--;
return interpolate_lagrangian(xs, ys, idx, x, 2);
case Interpolation::cubic:
// if x is not in the first interval of the x-grid, move back one
if (idx > 0) idx--;
if (idx > 0)
idx--;
// if the index was the last interval of the x-grid, move it back one more
if (idx == xs.size() - 3) idx--;
if (idx == xs.size() - 3)
idx--;
return interpolate_lagrangian(xs, ys, idx, x, 3);
default:
fatal_error("Unsupported interpolation");
}
}
} // namespace openmc
#endif

9
src/tallies/filter_energyfunc.cpp
View file

@ -40,11 +40,16 @@ void EnergyFunctionFilter::from_xml(pugi::xml_node node)
interpolation_ = Interpolation::log_log;
} else if (interpolation == "quadratic") {
if (energy.size() < 3)
fatal_error(fmt::format("Quadratic interpolation on EnergyFunctionFilter {} requires at least 3 data points.", id()));
fatal_error(
fmt::format("Quadratic interpolation on EnergyFunctionFilter {} "
"requires at least 3 data points.",
id()));
interpolation_ = Interpolation::quadratic;
} else if (interpolation == "cubic") {
if (energy.size() < 4)
fatal_error(fmt::format("Cubic interpolation on EnergyFunctionFilter {} requires at least 4 data points.", id()));
fatal_error(fmt::format("Cubic interpolation on EnergyFunctionFilter "
"{} requires at least 4 data points.",
id()));
interpolation_ = Interpolation::cubic;
} else {
fatal_error(fmt::format(