Skip to content

Commit e01c0ca

Browse files
zhi-wangzhi-wang
committed
Fix more warnings (bool cast)
1 parent 382fcbc commit e01c0ca

File tree

14 files changed

+72
-72
lines changed

14 files changed

+72
-72
lines changed

‎src/acc/mdintg.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void mdrest_acc(int istep)
6262

6363
// print the translational velocity of the overall system
6464

65-
mdrestPrintP1(inform::debug, vtot1, vtot2, vtot3, totmass);
65+
mdrestPrintP1(static_cast<bool>(inform::debug), vtot1, vtot2, vtot3, totmass);
6666

6767
if (not bound::use_bounds) {
6868
energy_prec erot = 0;

‎src/amoeba/emplar.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace tinker {
88
TINKER_FVOID2(acc0, cu1, emplar, int);
99
void emplar(int vers)
1010
{
11-
bool do_v = vers & calc::virial;
11+
auto do_v = vers & calc::virial;
1212

1313
zeroOnHost(energy_em, virial_em);
1414

‎src/amoeba/empole.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void empoleData(RcOp op)
1717
if (mplpot::use_chgpen)
1818
return;
1919

20-
bool rc_a = rc_flag & calc::analyz;
20+
auto rc_a = rc_flag & calc::analyz;
2121

2222
if (op & RcOp::DEALLOC) {
2323
if (rc_a) {
@@ -80,11 +80,11 @@ static void empoleEwald(int vers)
8080
namespace tinker {
8181
void empole(int vers)
8282
{
83-
bool rc_a = rc_flag & calc::analyz;
84-
bool do_a = vers & calc::analyz;
85-
bool do_e = vers & calc::energy;
86-
bool do_v = vers & calc::virial;
87-
bool do_g = vers & calc::grad;
83+
auto rc_a = rc_flag & calc::analyz;
84+
auto do_a = vers & calc::analyz;
85+
auto do_e = vers & calc::energy;
86+
auto do_v = vers & calc::virial;
87+
auto do_g = vers & calc::grad;
8888

8989
zeroOnHost(energy_em, virial_em);
9090
size_t bsize = bufferSize();

‎src/amoeba/epolar.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void epolarData(RcOp op)
2828
if (mplpot::use_chgpen and not polpot::use_dirdamp) // HIPPO Polarization
2929
return;
3030

31-
bool rc_a = rc_flag & calc::analyz;
31+
auto rc_a = rc_flag & calc::analyz;
3232

3333
if (op & RcOp::DEALLOC) {
3434
nuexclude = 0;
@@ -514,9 +514,9 @@ static void epolarNonEwald(int vers)
514514
// v4: EG = E_dot + G
515515
// v5: G
516516
// v6: GV
517-
bool edot = vers & calc::energy; // if not do_e, edot = false
517+
auto edot = vers & calc::energy; // if not do_e, edot = false
518518
if (vers & calc::energy and vers & calc::analyz)
519-
edot = false; // if do_e and do_a, edot = false
519+
edot = 0; // if do_e and do_a, edot = false
520520
int ver2 = vers;
521521
if (edot)
522522
ver2 &= ~calc::energy; // toggle off the calc::energy flag
@@ -548,9 +548,9 @@ static void epolarEwald(int vers)
548548
// v4: EG = E_dot + G
549549
// v5: G
550550
// v6: GV
551-
bool edot = vers & calc::energy; // if not do_e, edot = false
551+
auto edot = vers & calc::energy; // if not do_e, edot = false
552552
if (vers & calc::energy and vers & calc::analyz)
553-
edot = false; // if do_e and do_a, edot = false
553+
edot = 0; // if do_e and do_a, edot = false
554554
int ver2 = vers;
555555
if (edot)
556556
ver2 &= ~calc::energy; // toggle off the calc::energy flag
@@ -566,13 +566,13 @@ static void epolarEwald(int vers)
566566

567567
void epolar(int vers)
568568
{
569-
bool rc_a = rc_flag & calc::analyz;
570-
bool do_a = vers & calc::analyz;
571-
bool do_e = vers & calc::energy;
572-
bool do_v = vers & calc::virial;
573-
bool do_g = vers & calc::grad;
569+
auto rc_a = rc_flag & calc::analyz;
570+
auto do_a = vers & calc::analyz;
571+
auto do_e = vers & calc::energy;
572+
auto do_v = vers & calc::virial;
573+
auto do_g = vers & calc::grad;
574574
bool use_cf = use(Potent::CHGFLX);
575-
bool use_cfgrad = use_cf and do_g;
575+
bool use_cfgrad = use_cf and static_cast<bool>(do_g);
576576

577577
zeroOnHost(energy_ep, virial_ep);
578578
size_t bsize = bufferSize();

‎src/aplus/epolar.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ static void epolarAplusEwaldRecipSelf(int vers, int use_cf)
1919

2020
void epolarAplusEwald(int vers, int use_cf)
2121
{
22-
bool edot = vers & calc::energy; // if not do_e, edot = false
22+
auto edot = vers & calc::energy; // if not do_e, edot = false
2323
if (vers & calc::energy and vers & calc::analyz)
24-
edot = false; // if do_e and do_a, edot = false
24+
edot = 0; // if do_e and do_a, edot = false
2525
int ver2 = vers;
2626
if (edot)
2727
ver2 &= ~calc::energy; // toggle off the calc::energy flag
@@ -40,9 +40,9 @@ namespace tinker {
4040
TINKER_FVOID2(acc1, cu1, epolarAplusNonEwald, int, int, const real (*)[3]);
4141
void epolarAplusNonEwald(int vers, int use_cf)
4242
{
43-
bool edot = vers & calc::energy; // if not do_e, edot = false
43+
auto edot = vers & calc::energy; // if not do_e, edot = false
4444
if (vers & calc::energy and vers & calc::analyz)
45-
edot = false; // if do_e and do_a, edot = false
45+
edot = 0; // if do_e and do_a, edot = false
4646
int ver2 = vers;
4747
if (edot)
4848
ver2 &= ~calc::energy; // toggle off the calc::energy flag

‎src/hippo/echgtrn.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ void echgtrnData(RcOp op)
1414
if (not use(Potent::CHGTRN))
1515
return;
1616

17-
bool rc_a = rc_flag & calc::analyz;
17+
auto rc_a = rc_flag & calc::analyz;
1818

1919
if (op & RcOp::DEALLOC) {
2020
ctrntyp = Chgtrn::NONE;
@@ -73,11 +73,11 @@ TINKER_FVOID2(acc1, cu1, echgtrn, int);
7373
TINKER_FVOID2(acc1, cu1, echgtrnAplus, int);
7474
void echgtrn(int vers)
7575
{
76-
bool rc_a = rc_flag & calc::analyz;
77-
bool do_a = vers & calc::analyz;
78-
bool do_e = vers & calc::energy;
79-
bool do_v = vers & calc::virial;
80-
bool do_g = vers & calc::grad;
76+
auto rc_a = rc_flag & calc::analyz;
77+
auto do_a = vers & calc::analyz;
78+
auto do_e = vers & calc::energy;
79+
auto do_v = vers & calc::virial;
80+
auto do_g = vers & calc::grad;
8181

8282
zeroOnHost(energy_ect, virial_ect);
8383
size_t bsize = bufferSize();

‎src/hippo/edisp.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
namespace tinker {
1515
bool useDEwald()
1616
{
17-
return use(Potent::DISP) and limits::use_dewald;
17+
return use(Potent::DISP) and static_cast<bool>(limits::use_dewald);
1818
}
1919

2020
void edispData(RcOp op)
2121
{
2222
if (not use(Potent::DISP))
2323
return;
2424

25-
bool rc_a = rc_flag & calc::analyz;
25+
auto rc_a = rc_flag & calc::analyz;
2626

2727
if (op & RcOp::DEALLOC) {
2828
darray::deallocate(csix, adisp);
@@ -166,9 +166,9 @@ static void edispEwald(int vers)
166166
TINKER_FCALL2(acc1, cu1, edispEwaldReal, vers);
167167

168168
// recip and self
169-
bool do_e = vers & calc::energy;
170-
bool do_v = vers & calc::virial;
171-
bool do_g = vers & calc::grad;
169+
auto do_e = vers & calc::energy;
170+
auto do_v = vers & calc::virial;
171+
auto do_g = vers & calc::grad;
172172
PMEUnit u = dpme_unit;
173173

174174
gridDisp(u, csix);
@@ -201,11 +201,11 @@ static void edispEwald(int vers)
201201

202202
void edisp(int vers)
203203
{
204-
bool rc_a = rc_flag & calc::analyz;
205-
bool do_a = vers & calc::analyz;
206-
bool do_e = vers & calc::energy;
207-
bool do_v = vers & calc::virial;
208-
bool do_g = vers & calc::grad;
204+
auto rc_a = rc_flag & calc::analyz;
205+
auto do_a = vers & calc::analyz;
206+
auto do_e = vers & calc::energy;
207+
auto do_v = vers & calc::virial;
208+
auto do_g = vers & calc::grad;
209209

210210
zeroOnHost(energy_edsp, virial_edsp);
211211
size_t bsize = bufferSize();

‎src/hippo/empole.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ void empoleChgpenData(RcOp op)
1919
if (not mplpot::use_chgpen)
2020
return;
2121

22-
bool rc_a = rc_flag & calc::analyz;
22+
auto rc_a = rc_flag & calc::analyz;
2323

2424
if (op & RcOp::DEALLOC) {
2525
if (rc_a) {
@@ -83,12 +83,12 @@ static void empoleChgpenEwald(int vers, int use_cf)
8383
namespace tinker {
8484
void empoleChgpen(int vers)
8585
{
86-
bool rc_a = rc_flag & calc::analyz;
87-
bool do_a = vers & calc::analyz;
88-
bool do_e = vers & calc::energy;
89-
bool do_v = vers & calc::virial;
90-
bool do_g = vers & calc::grad;
91-
int use_cf = use(Potent::CHGFLX);
86+
auto rc_a = rc_flag & calc::analyz;
87+
auto do_a = vers & calc::analyz;
88+
auto do_e = vers & calc::energy;
89+
auto do_v = vers & calc::virial;
90+
auto do_g = vers & calc::grad;
91+
auto use_cf = use(Potent::CHGFLX);
9292
int use_cfgrad = use_cf and do_g;
9393

9494
zeroOnHost(energy_em, virial_em);

‎src/hippo/epolar.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void epolarChgpenData(RcOp op)
2525
if (not mplpot::use_chgpen)
2626
return;
2727

28-
bool rc_a = rc_flag & calc::analyz;
28+
auto rc_a = rc_flag & calc::analyz;
2929

3030
if (op & RcOp::DEALLOC) {
3131
darray::deallocate(polarity, polarity_inv);
@@ -146,9 +146,9 @@ static void epolarChgpenNonEwald(int vers, int use_cf)
146146
// v4: EG = E_dot + G
147147
// v5: G
148148
// v6: GV
149-
bool edot = vers & calc::energy; // if not do_e, edot = false
149+
auto edot = vers & calc::energy; // if not do_e, edot = false
150150
if (vers & calc::energy && vers & calc::analyz)
151-
edot = false; // if do_e and do_a, edot = false
151+
edot = 0; // if do_e and do_a, edot = false
152152
int ver2 = vers;
153153
if (edot)
154154
ver2 &= ~calc::energy; // toggle off the calc::energy flag
@@ -182,9 +182,9 @@ static void epolarChgpenEwald(int vers, int use_cf)
182182
// v4: EG = E_dot + G
183183
// v5: G
184184
// v6: GV
185-
bool edot = vers & calc::energy; // if not do_e, edot = false
185+
auto edot = vers & calc::energy; // if not do_e, edot = false
186186
if (vers & calc::energy && vers & calc::analyz)
187-
edot = false; // if do_e and do_a, edot = false
187+
edot = 0; // if do_e and do_a, edot = false
188188
int ver2 = vers;
189189
if (edot)
190190
ver2 &= ~calc::energy; // toggle off the calc::energy flag
@@ -202,12 +202,12 @@ static void epolarChgpenEwald(int vers, int use_cf)
202202
namespace tinker {
203203
void epolarChgpen(int vers)
204204
{
205-
bool rc_a = rc_flag & calc::analyz;
206-
bool do_a = vers & calc::analyz;
207-
bool do_e = vers & calc::energy;
208-
bool do_v = vers & calc::virial;
209-
bool do_g = vers & calc::grad;
210-
int use_cf = use(Potent::CHGFLX);
205+
auto rc_a = rc_flag & calc::analyz;
206+
auto do_a = vers & calc::analyz;
207+
auto do_e = vers & calc::energy;
208+
auto do_v = vers & calc::virial;
209+
auto do_g = vers & calc::grad;
210+
auto use_cf = use(Potent::CHGFLX);
211211
int use_cfgrad = use_cf and do_g;
212212

213213
zeroOnHost(energy_ep, virial_ep);

‎src/hippo/erepel.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void erepelData(RcOp op)
1717
if (not use(Potent::REPULS))
1818
return;
1919

20-
bool rc_a = rc_flag & calc::analyz;
20+
auto rc_a = rc_flag & calc::analyz;
2121

2222
if (op & RcOp::DEALLOC) {
2323
darray::deallocate(sizpr, dmppr, elepr);
@@ -137,11 +137,11 @@ void erepelData(RcOp op)
137137
TINKER_FVOID2(acc1, cu1, erepel, int);
138138
void erepel(int vers)
139139
{
140-
bool rc_a = rc_flag & calc::analyz;
141-
bool do_a = vers & calc::analyz;
142-
bool do_e = vers & calc::energy;
143-
bool do_v = vers & calc::virial;
144-
bool do_g = vers & calc::grad;
140+
auto rc_a = rc_flag & calc::analyz;
141+
auto do_a = vers & calc::analyz;
142+
auto do_e = vers & calc::energy;
143+
auto do_v = vers & calc::virial;
144+
auto do_g = vers & calc::grad;
145145

146146
zeroOnHost(energy_er, virial_er);
147147
size_t bsize = bufferSize();

0 commit comments

Comments
 (0)