Skip to content
Snippets Groups Projects

M214003/develop

Merged Uwe Schulzweida requested to merge m214003/develop into develop
14 files
+ 67
46
Compare changes
  • Side-by-side
  • Inline
Files
14
+ 7
7
@@ -124,9 +124,9 @@ public:
auto &paramB = work[1][varID][levelID].vec_d;
auto &sumj = work[0][varID][levelID].vec_d;
auto &sumjj = work[1][varID][levelID].vec_d;
const auto &sumjx = work[2][varID][levelID].vec_d;
const auto &sumx = work[3][varID][levelID].vec_d;
const auto &zn = work[4][varID][levelID].vec_d;
auto const &sumjx = work[2][varID][levelID].vec_d;
auto const &sumx = work[3][varID][levelID].vec_d;
auto const &zn = work[4][varID][levelID].vec_d;
auto trend_kernel = [&](auto i, auto is_EQ) {
auto temp1 = SUBM(sumjx[i], DIVM(MULM(sumj[i], sumx[i]), zn[i]));
@@ -151,13 +151,13 @@ public:
auto numVars = varList.numVars();
for (int varID = 0; varID < numVars; ++varID)
{
const auto &var = varList.vars[varID];
auto const &var = varList.vars[varID];
if (var.isConstant) continue;
for (int levelID = 0; levelID < var.nlevels; ++levelID)
{
auto &field = varsData[varID][levelID];
const auto &paramA = work[0][varID][levelID];
const auto &paramB = work[1][varID][levelID];
auto const &paramA = work[0][varID][levelID];
auto const &paramB = work[1][varID][levelID];
sub_trend(zj, field, paramA, paramB);
}
}
@@ -181,7 +181,7 @@ public:
void
run() override
{
auto runAsync = (Options::CDO_Parallel_Read > 0);
auto runAsync = (Options::CDO_Async_Read > 0);
auto task = runAsync ? std::make_unique<cdo::Task>() : nullptr;
auto calendar = taxisInqCalendar(taxisID1);
Loading