lijiext
/
lammps
mirror of https://github.com/lammps/lammps.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

redo fix for class member shadowing while avoiding overflowing levels

This commit is contained in:
Axel Kohlmeyer 2020-09-15 14:48:55 -04:00
parent 16749566f8
commit 3dd3c6a2a5
No known key found for this signature in database
GPG Key ID: D9B44E93BF0C375A
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/KSPACE/msm.cpp
View File

@ -1432,16 +1432,16 @@ void MSM::setup_grid()
return 1 if yes, 0 if no
------------------------------------------------------------------------- */
int MSM::factorable(int n, int &flag, int &levels)
int MSM::factorable(int n, int &flag, int &nlevels)
{
int i;
levels = 1;
nlevels = 1;
while (n > 1) {
for (i = 0; i < nfactors; i++) {
if (n % factors[i] == 0) {
n /= factors[i];
levels++;
nlevels++;
break;
}
}

60
unittest/force-styles/tests/kspace-msm_nopbc.yaml
View File

@ -1,6 +1,6 @@
---
lammps_version: 24 Aug 2020
date_generated: Sat Sep 12 10:33:36 202
date_generated: Tue Sep 15 14:47:38 202
epsilon: 5e-11
prerequisites: ! |
atom full
@ -58,33 +58,33 @@ run_coul: 0
run_stress: ! |2-
0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
run_forces: ! |2
1 -1.0348864007239668e-01 3.2761800817797082e-01 -2.7223154925249687e-01
2 1.1547721105281426e-02 -2.2227221129297944e-01 1.9829831292225819e-01
3 -6.1369788686855553e-03 1.1473670690755385e-02 -1.2235119385263003e-02
4 2.8809534480886322e-02 -4.5070713784827680e-02 4.5263724656363712e-02
5 4.2323185781698226e-02 -5.2976717776467216e-02 4.9736627529403242e-02
6 3.8194733647326694e-02 -2.4587855825158134e-01 4.1856615868672892e-01
7 4.5246314631942265e-02 2.0099417967365288e-01 -4.3512916657147588e-01
8 2.2478550451619471e-02 2.0362301286740869e-01 -4.3516590120465981e-01
9 -1.4178329999306901e-03 -1.5368030392367521e-01 2.6080100301013964e-01
10 -2.0495450209946312e-02 -2.0851530662446178e-02 7.4319850349891012e-02
11 -3.0029358892398838e-02 -2.0702279983167187e-02 9.8520949030575691e-02
12 1.3289689675296273e-01 9.3775108342107519e-02 -3.0419584939008770e-01
13 -5.5922486140088226e-02 -2.4843666409380370e-02 1.0515381624429042e-01
14 -4.4208019862361184e-02 -2.8633675987750289e-02 9.8140924300998925e-02
15 -3.8534805055538454e-02 -4.3447767456428393e-02 9.5052177465633700e-02
16 -2.0197663776900704e-01 -9.6067608908760441e-02 5.1267317994067874e-01
17 1.1536172816123620e-01 1.2150176721849106e-01 -4.0576909205923889e-01
18 3.2654836490027450e-01 4.3181659922436294e-01 -6.4631937847140064e-01
19 -1.7012391318923387e-01 -1.9294196901436866e-01 3.0171461650625692e-01
20 -1.6090393021018687e-01 -1.8797301084913640e-01 2.9016061976069074e-01
21 4.6464803590088510e-01 2.0966755173124815e-01 -8.4865286121979111e-01
22 -2.2714234064511640e-01 -1.1056430229170305e-01 3.8599855632265567e-01
23 -1.9865351580467286e-01 -1.1110079780224448e-01 3.9440435138483038e-01
24 -1.1755770692492392e-02 7.9361803570205403e-01 -3.4523386783293764e-01
25 5.0411795551073120e-02 -3.8916839645964540e-01 1.9278646898979940e-01
26 -2.9733815594164319e-02 -4.1142305819442143e-01 1.7495936527287648e-01
27 -5.2243746980854566e-01 2.4806539986837281e-01 -3.8666209074075969e-01
28 2.9308687168280761e-01 -1.5702803664966208e-01 2.0612286277862657e-01
29 2.5153793410884945e-01 -1.2745488321867574e-01 1.8930202039662150e-01
1 -1.0725057415020919e-01 3.3019907950838151e-01 -2.9323265400347975e-01
2 1.4273516924286595e-02 -2.2195304769099961e-01 2.1172398888943439e-01
3 -6.2191160687439613e-03 1.1636479086601327e-02 -1.3193542766995693e-02
4 2.8789530000554349e-02 -4.5707077957577419e-02 4.8949304170325961e-02
5 4.2918140819301939e-02 -5.3982290008046191e-02 5.4071851700930415e-02
6 4.0693195898835278e-02 -2.5124364388294529e-01 4.4409525619111351e-01
7 4.3902199408654773e-02 2.0718378754835146e-01 -4.5693181215217060e-01
8 1.8355056045104463e-02 2.1019458646438235e-01 -4.5977818830587547e-01
9 1.6926987410114289e-03 -1.5785316258950571e-01 2.7688718669924633e-01
10 -1.9845368939794925e-02 -2.2016564601343797e-02 7.7877659664832483e-02
11 -2.9242294066982408e-02 -2.2678746148089381e-02 1.0272772972867131e-01
12 1.2960469545860479e-01 9.7367043788644400e-02 -3.1763881493481549e-01
13 -5.4829808348627301e-02 -2.6026456048508360e-02 1.0948080578658986e-01
14 -4.3113220503693823e-02 -2.9962591673432723e-02 1.0219446255502410e-01
15 -3.7688395823574243e-02 -4.4115392571750824e-02 9.9676983434799277e-02
16 -1.9855722830658068e-01 -1.0361163893486998e-01 5.3648057305505858e-01
17 1.1217353766495122e-01 1.2665752635347602e-01 -4.2776774483665475e-01
18 3.1619456057296186e-01 4.2101932424007404e-01 -6.7203553906529401e-01
19 -1.6723605125535490e-01 -1.8745079364937817e-01 3.1118730606879103e-01
20 -1.5510498316646221e-01 -1.8060202958376245e-01 3.0126314730021070e-01
21 4.5618585311145787e-01 2.3416325579619782e-01 -8.7525764015858531e-01
22 -2.2272028927958532e-01 -1.2422014484239144e-01 3.9660449946839177e-01
23 -1.9381556909487696e-01 -1.2213865056926680e-01 4.0697283949615592e-01
24 -1.7632222754297714e-02 8.0868006192947306e-01 -3.6871343152445346e-01
25 5.5196078243586418e-02 -3.9602778003476646e-01 2.0694223014380941e-01
26 -2.8010525620160029e-02 -4.1949748612714061e-01 1.8579634676877732e-01
27 -5.3081154989654455e-01 2.5084075406488837e-01 -4.1028201045412238e-01
28 2.9697439332712672e-01 -1.5978637451711275e-01 2.1926787644097381e-01
29 2.5525638787732113e-01 -1.2899390363572455e-01 2.0303208126884240e-01
...