Skip to content

Commit c2e3862

Browse files
committed
set up expol parameter array for current structure
1 parent d8b38a1 commit c2e3862

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

include/ff/hippomod.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,8 @@ TINKER_EXTERN virial_prec virial_ect[9];
6666
TINKER_EXTERN Chgtrn ctrntyp;
6767
}
6868

69-
// kexpl and expol
69+
// expol
7070
namespace tinker {
71-
TINKER_EXTERN real* pepk;
72-
TINKER_EXTERN real* peppre;
73-
TINKER_EXTERN real* pepdmp;
74-
TINKER_EXTERN int* pepl;
75-
7671
TINKER_EXTERN CountBuffer nexpol;
7772
TINKER_EXTERN real* kpep;
7873
TINKER_EXTERN real* prepep;

src/hippo/expol.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22
#include "ff/atom.h"
33
#include "ff/hippomod.h"
44
#include "tool/darray.h"
5-
#include <tinker/detail/kexpl.hh>
5+
#include <tinker/detail/expol.hh>
66
#include <tinker/detail/polpot.hh>
77

88
namespace tinker {
99
void expolData(RcOp op)
1010
{
11-
// TODO Return if expol not used
11+
// TODO Use format like "Potent::EXPOL"
1212
if (not polpot::use_expol)
1313
return;
1414

1515
if (op & RcOp::DEALLOC) {
16-
darray::deallocate(pepk, peppre, pepdmp, pepl);
16+
darray::deallocate(kpep, prepep, dmppep, lpep);
1717
}
1818

1919
if (op & RcOp::ALLOC) {
20-
darray::allocate(n, &pepk, &peppre, &pepdmp, &pepl);
20+
darray::allocate(n, &kpep, &prepep, &dmppep, &lpep);
2121
}
2222

2323
if (op & RcOp::INIT) {
24-
darray::copyin(g::q0, n, pepk, kexpl::pepk);
25-
darray::copyin(g::q0, n, peppre, kexpl::peppre);
26-
darray::copyin(g::q0, n, pepdmp, kexpl::pepdmp);
27-
darray::copyin(g::q0, n, pepl, kexpl::pepl);
24+
darray::copyin(g::q0, n, kpep, expol::kpep);
25+
darray::copyin(g::q0, n, prepep, expol::prepep);
26+
darray::copyin(g::q0, n, dmppep, expol::dmppep);
27+
darray::copyin(g::q0, n, lpep, expol::lpep);
2828
}
2929
}
3030
}

0 commit comments

Comments
 (0)