biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7b9c6af
)
Fix MSVC 2019 test failures
author
Roland Schulz
<roland@rschulz.eu>
Sun, 26 Apr 2020 07:58:56 +0000
(
00:58
-0700)
committer
Mark Abraham
<mark.j.abraham@gmail.com>
Tue, 28 Apr 2020 08:24:19 +0000
(08:24 +0000)
Related #3495
src/gromacs/listed_forces/bonded.cpp
patch
|
blob
|
history
diff --git
a/src/gromacs/listed_forces/bonded.cpp
b/src/gromacs/listed_forces/bonded.cpp
index 792542b87e81ad63c4bdaddae545c547ea606210..4f90a315850d776230a6872ed8362b80cd98d207 100644
(file)
--- a/
src/gromacs/listed_forces/bonded.cpp
+++ b/
src/gromacs/listed_forces/bonded.cpp
@@
-3972,7
+3972,7
@@
struct BondedInteractions
*
* This must have as many entries as interaction_function in ifunc.cpp */
template<BondedKernelFlavor flavor>
*
* This must have as many entries as interaction_function in ifunc.cpp */
template<BondedKernelFlavor flavor>
-const std::array<BondedInteractions, F_NRE> c_bondedInteractionFunctions = {
+const
expr
std::array<BondedInteractions, F_NRE> c_bondedInteractionFunctions = {
BondedInteractions{ bonds<flavor>, eNR_BONDS }, // F_BONDS
BondedInteractions{ g96bonds<flavor>, eNR_BONDS }, // F_G96BONDS
BondedInteractions{ morse_bonds<flavor>, eNR_MORSE }, // F_MORSE
BondedInteractions{ bonds<flavor>, eNR_BONDS }, // F_BONDS
BondedInteractions{ g96bonds<flavor>, eNR_BONDS }, // F_G96BONDS
BondedInteractions{ morse_bonds<flavor>, eNR_MORSE }, // F_MORSE
@@
-4068,7
+4068,7
@@
const std::array<BondedInteractions, F_NRE> c_bondedInteractionFunctions = {
};
/*! \brief List of instantiated BondedInteractions list */
};
/*! \brief List of instantiated BondedInteractions list */
-const gmx::EnumerationArray<BondedKernelFlavor, std::array<BondedInteractions, F_NRE>> c_bondedInteractionFunctionsPerFlavor = {
+const
expr
gmx::EnumerationArray<BondedKernelFlavor, std::array<BondedInteractions, F_NRE>> c_bondedInteractionFunctionsPerFlavor = {
c_bondedInteractionFunctions<BondedKernelFlavor::ForcesSimdWhenAvailable>,
c_bondedInteractionFunctions<BondedKernelFlavor::ForcesNoSimd>,
c_bondedInteractionFunctions<BondedKernelFlavor::ForcesAndVirialAndEnergy>,
c_bondedInteractionFunctions<BondedKernelFlavor::ForcesSimdWhenAvailable>,
c_bondedInteractionFunctions<BondedKernelFlavor::ForcesNoSimd>,
c_bondedInteractionFunctions<BondedKernelFlavor::ForcesAndVirialAndEnergy>,