Skip to content

Commit

Permalink
formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
mbkuhn committed Jul 30, 2024
1 parent be39526 commit c8b6538
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 deletions.
32 changes: 16 additions & 16 deletions include/matrix_free/PolynomialOrders.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,27 +56,27 @@ enum {
#define P_INVOKEABLE(func) \
template <int p, typename... Args> \
auto func(Args&&... args) \
->decltype(IMPLNAME(func) < p > ::invoke(std::forward<Args>(args)...)) \
-> decltype(IMPLNAME(func) < p > ::invoke(std::forward<Args>(args)...)) \
{ \
return IMPLNAME(func)<p>::invoke(std::forward<Args>(args)...); \
}

// can't return a value dependent on template parameter
#define SWITCH_INVOKEABLE(func) \
template <typename... Args> \
auto func(int p, Args&&... args) \
->decltype(IMPLNAME(func) < inst::P1 > ::invoke(std::forward<Args>(args)...)) \
{ \
switch (p) { \
case inst::P2: \
return IMPLNAME(func)<inst::P2>::invoke(std::forward<Args>(args)...); \
case inst::P3: \
return IMPLNAME(func)<inst::P3>::invoke(std::forward<Args>(args)...); \
case inst::P4: \
return IMPLNAME(func)<inst::P4>::invoke(std::forward<Args>(args)...); \
default: \
return IMPLNAME(func)<inst::P1>::invoke(std::forward<Args>(args)...); \
} \
#define SWITCH_INVOKEABLE(func) \
template <typename... Args> \
auto func(int p, Args&&... args) \
-> decltype(IMPLNAME(func) < inst::P1 > ::invoke(std::forward<Args>(args)...)) \
{ \
switch (p) { \
case inst::P2: \
return IMPLNAME(func)<inst::P2>::invoke(std::forward<Args>(args)...); \
case inst::P3: \
return IMPLNAME(func)<inst::P3>::invoke(std::forward<Args>(args)...); \
case inst::P4: \
return IMPLNAME(func)<inst::P4>::invoke(std::forward<Args>(args)...); \
default: \
return IMPLNAME(func)<inst::P1>::invoke(std::forward<Args>(args)...); \
} \
}

} // namespace matrix_free
Expand Down
2 changes: 1 addition & 1 deletion src/aero/fsi/FSIturbine.C
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ fsiTurbine::write_nc_def_loads(const size_t tStep, const double curTime)
(0.5 * (brFSIdata_.bld_rloc[i + iStart + 1] -
brFSIdata_.bld_rloc[i + iStart - 1]));
}
brFSIdata_.bld_ld[(iStart)*6 + 4] =
brFSIdata_.bld_ld[(iStart) * 6 + 4] =
(0.5 * (brFSIdata_.bld_rloc[iStart + 1] - brFSIdata_.bld_rloc[iStart]));
brFSIdata_.bld_ld[(iStart + nBldPts - 1) * 6 + 4] =
(0.5 * (brFSIdata_.bld_rloc[iStart + nBldPts - 1] -
Expand Down
8 changes: 4 additions & 4 deletions src/aero/fsi/MapLoad.C
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,11 @@ mapTowerLoad(

// Find the interpolated reference position first
linInterpVec(
&twrRefPos[(loadMap_bip)*6], &twrRefPos[(loadMap_bip + 1) * 6],
&twrRefPos[(loadMap_bip) * 6], &twrRefPos[(loadMap_bip + 1) * 6],
loadMapInterp_bip, tmpNodePos.data());
// Find the interpolated linear displacement
linInterpVec(
&twrDef[(loadMap_bip)*6], &twrDef[(loadMap_bip + 1) * 6],
&twrDef[(loadMap_bip) * 6], &twrDef[(loadMap_bip + 1) * 6],
loadMapInterp_bip, tmpNodeDisp.data());
// Add displacement to find actual position
for (auto idim = 0; idim < 3; idim++)
Expand All @@ -130,8 +130,8 @@ mapTowerLoad(
// Split the force and moment into the two surrounding nodes in a
// variationally consistent manner using the interpolation factor
fsi::splitForceMoment(
tmpForceMoment.data(), loadMapInterp_bip, &(twrLoad[(loadMap_bip)*6]),
&(twrLoad[(loadMap_bip + 1) * 6]));
tmpForceMoment.data(), loadMapInterp_bip,
&(twrLoad[(loadMap_bip) * 6]), &(twrLoad[(loadMap_bip + 1) * 6]));
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/aero/fsi/OpenfastFSI.C
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,8 @@ OpenfastFSI::send_loads(const double curTime)
(fsiTurbineData_[i]->params_.nBRfsiPtsTwr) * 6, MPI_DOUBLE, MPI_SUM,
turbProc, bulk_->parallel());
iError = MPI_Reduce(
fsiTurbineData_[i]->brFSIdata_.bld_ld.data(), NULL, (nTotBldNodes)*6,
MPI_DOUBLE, MPI_SUM, turbProc, bulk_->parallel());
fsiTurbineData_[i]->brFSIdata_.bld_ld.data(), NULL,
(nTotBldNodes) * 6, MPI_DOUBLE, MPI_SUM, turbProc, bulk_->parallel());
}
}
}
Expand Down Expand Up @@ -664,8 +664,8 @@ OpenfastFSI::map_loads(const int tStep, const double curTime)
(fsiTurbineData_[i]->params_.nBRfsiPtsTwr) * 6, MPI_DOUBLE, MPI_SUM,
turbProc, bulk_->parallel());
iError = MPI_Reduce(
fsiTurbineData_[i]->brFSIdata_.bld_ld.data(), NULL, (nTotBldNodes)*6,
MPI_DOUBLE, MPI_SUM, turbProc, bulk_->parallel());
fsiTurbineData_[i]->brFSIdata_.bld_ld.data(), NULL,
(nTotBldNodes) * 6, MPI_DOUBLE, MPI_SUM, turbProc, bulk_->parallel());
}

fsiTurbineData_[i]->write_nc_def_loads(tStep, curTime);
Expand Down

0 comments on commit c8b6538

Please sign in to comment.