1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
|
--- Mixing_H.c.orig 2018-08-29 05:53:55 UTC
+++ Mixing_H.c
@@ -74,7 +74,7 @@ void Pulay_Mixing_H_MultiSecant(int MD_i
double sum,my_sum,tmp1,tmp2,alpha;
double r,r10,r11,r12,r13,r20,r21,r22;
double h,h10,h11,h12,h13,h20,h21,h22;
- double my_sy,my_yy,sy,yy,norm,s,y,or,al,be;
+ double my_sy,my_yy,sy,yy,norm,s,y,orx,al,be;
double **A,**IA,*coes,*coes2,*ror;
char nanchar[300];
@@ -635,44 +635,44 @@ void Pulay_Mixing_H_MultiSecant(int MD_i
s = HisH1[m][0][Mc_AN][h_AN][i][j] - HisH1[m+1][0][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH1[m][0][Mc_AN][h_AN][i][j] - ResidualH1[m+1][0][Mc_AN][h_AN][i][j]; /* y */
r = s - al*y; /* r */
- or = ResidualH1[dim+1][0][Mc_AN][h_AN][i][j]; /* OptResidualH */
- my_sum += r*or;
+ orx = ResidualH1[dim+1][0][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ my_sum += r*orx;
s = HisH1[m][1][Mc_AN][h_AN][i][j] - HisH1[m+1][1][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH1[m][1][Mc_AN][h_AN][i][j] - ResidualH1[m+1][1][Mc_AN][h_AN][i][j]; /* y */
r = s - al*y; /* r */
- or = ResidualH1[dim+1][1][Mc_AN][h_AN][i][j]; /* OptResidualH */
- my_sum += r*or;
+ orx = ResidualH1[dim+1][1][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ my_sum += r*orx;
s = HisH1[m][2][Mc_AN][h_AN][i][j] - HisH1[m+1][2][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH1[m][2][Mc_AN][h_AN][i][j] - ResidualH1[m+1][2][Mc_AN][h_AN][i][j]; /* y */
r = s - al*y; /* r */
- or = ResidualH1[dim+1][2][Mc_AN][h_AN][i][j]; /* OptResidualH */
- my_sum += r*or;
+ orx = ResidualH1[dim+1][2][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ my_sum += r*orx;
s = HisH1[m][3][Mc_AN][h_AN][i][j] - HisH1[m+1][3][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH1[m][3][Mc_AN][h_AN][i][j] - ResidualH1[m+1][3][Mc_AN][h_AN][i][j]; /* y */
r = s - al*y; /* r */
- or = ResidualH1[dim+1][3][Mc_AN][h_AN][i][j]; /* OptResidualH */
- my_sum += r*or;
+ orx = ResidualH1[dim+1][3][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ my_sum += r*orx;
s = HisH2[m][0][Mc_AN][h_AN][i][j] - HisH2[m+1][0][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH2[m][0][Mc_AN][h_AN][i][j] - ResidualH2[m+1][0][Mc_AN][h_AN][i][j]; /* y */
r = s - al*y; /* r */
- or = ResidualH2[dim+1][0][Mc_AN][h_AN][i][j]; /* OptResidualH */
- my_sum += r*or;
+ orx = ResidualH2[dim+1][0][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ my_sum += r*orx;
s = HisH2[m][1][Mc_AN][h_AN][i][j] - HisH2[m+1][1][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH2[m][1][Mc_AN][h_AN][i][j] - ResidualH2[m+1][1][Mc_AN][h_AN][i][j]; /* y */
r = s - al*y; /* r */
- or = ResidualH2[dim+1][1][Mc_AN][h_AN][i][j]; /* OptResidualH */
- my_sum += r*or;
+ orx = ResidualH2[dim+1][1][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ my_sum += r*orx;
s = HisH2[m][2][Mc_AN][h_AN][i][j] - HisH2[m+1][2][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH2[m][2][Mc_AN][h_AN][i][j] - ResidualH2[m+1][2][Mc_AN][h_AN][i][j]; /* y */
r = s - al*y; /* r */
- or = ResidualH2[dim+1][2][Mc_AN][h_AN][i][j]; /* OptResidualH */
- my_sum += r*or;
+ orx = ResidualH2[dim+1][2][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ my_sum += r*orx;
}
}
@@ -696,8 +696,8 @@ void Pulay_Mixing_H_MultiSecant(int MD_i
s = HisH1[m][spin][Mc_AN][h_AN][i][j] - HisH1[m+1][spin][Mc_AN][h_AN][i][j];
y = ResidualH1[m][spin][Mc_AN][h_AN][i][j] - ResidualH1[m+1][spin][Mc_AN][h_AN][i][j];
r = s - al*y;
- or = ResidualH1[dim+1][spin][Mc_AN][h_AN][i][j];
- my_sum += r*or;
+ orx = ResidualH1[dim+1][spin][Mc_AN][h_AN][i][j];
+ my_sum += r*orx;
}
}
}
@@ -986,7 +986,7 @@ void Pulay_Mixing_H_with_One_Shot_Hessia
double my_sum,tmp1,tmp2,alpha;
double r,r10,r11,r12,r13,r20,r21,r22;
double h,h10,h11,h12,h13,h20,h21,h22;
- double my_sy,my_yy,sy,yy,norm,s,y,or,al,be;
+ double my_sy,my_yy,sy,yy,norm,s,y,orx,al,be;
double **A,**IA,*coes;
char nanchar[300];
@@ -1427,38 +1427,38 @@ void Pulay_Mixing_H_with_One_Shot_Hessia
s = HisH1[0][0][Mc_AN][h_AN][i][j] - HisH1[1][0][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH1[0][0][Mc_AN][h_AN][i][j] - ResidualH1[1][0][Mc_AN][h_AN][i][j]; /* y */
- or = ResidualH1[dim][0][Mc_AN][h_AN][i][j]; /* OptResidualH */
- my_sum += (s-al*y)*or;
+ orx = ResidualH1[dim][0][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ my_sum += (s-al*y)*orx;
s = HisH1[0][1][Mc_AN][h_AN][i][j] - HisH1[1][1][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH1[0][1][Mc_AN][h_AN][i][j] - ResidualH1[1][1][Mc_AN][h_AN][i][j]; /* y */
- or = ResidualH1[dim][1][Mc_AN][h_AN][i][j]; /* OptResidualH */
- my_sum += (s-al*y)*or;
+ orx = ResidualH1[dim][1][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ my_sum += (s-al*y)*orx;
s = HisH1[0][2][Mc_AN][h_AN][i][j] - HisH1[1][2][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH1[0][2][Mc_AN][h_AN][i][j] - ResidualH1[1][2][Mc_AN][h_AN][i][j]; /* y */
- or = ResidualH1[dim][2][Mc_AN][h_AN][i][j]; /* OptResidualH */
- my_sum += (s-al*y)*or;
+ orx = ResidualH1[dim][2][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ my_sum += (s-al*y)*orx;
s = HisH1[0][3][Mc_AN][h_AN][i][j] - HisH1[1][3][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH1[0][3][Mc_AN][h_AN][i][j] - ResidualH1[1][3][Mc_AN][h_AN][i][j]; /* y */
- or = ResidualH1[dim][3][Mc_AN][h_AN][i][j]; /* OptResidualH */
- my_sum += (s-al*y)*or;
+ orx = ResidualH1[dim][3][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ my_sum += (s-al*y)*orx;
s = HisH2[0][0][Mc_AN][h_AN][i][j] - HisH2[1][0][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH2[0][0][Mc_AN][h_AN][i][j] - ResidualH2[1][0][Mc_AN][h_AN][i][j]; /* y */
- or = ResidualH2[dim][0][Mc_AN][h_AN][i][j]; /* OptResidualH */
- my_sum += (s-al*y)*or;
+ orx = ResidualH2[dim][0][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ my_sum += (s-al*y)*orx;
s = HisH2[0][1][Mc_AN][h_AN][i][j] - HisH2[1][1][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH2[0][1][Mc_AN][h_AN][i][j] - ResidualH2[1][1][Mc_AN][h_AN][i][j]; /* y */
- or = ResidualH2[dim][1][Mc_AN][h_AN][i][j]; /* OptResidualH */
- my_sum += (s-al*y)*or;
+ orx = ResidualH2[dim][1][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ my_sum += (s-al*y)*orx;
s = HisH2[0][2][Mc_AN][h_AN][i][j] - HisH2[1][2][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH2[0][2][Mc_AN][h_AN][i][j] - ResidualH2[1][2][Mc_AN][h_AN][i][j]; /* y */
- or = ResidualH2[dim][2][Mc_AN][h_AN][i][j]; /* OptResidualH */
- my_sum += (s-al*y)*or;
+ orx = ResidualH2[dim][2][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ my_sum += (s-al*y)*orx;
}
}
}
@@ -1479,8 +1479,8 @@ void Pulay_Mixing_H_with_One_Shot_Hessia
for (j=0; j<Spe_Total_NO[Hwan]; j++){
s = HisH1[0][spin][Mc_AN][h_AN][i][j] - HisH1[1][spin][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH1[0][spin][Mc_AN][h_AN][i][j] - ResidualH1[1][spin][Mc_AN][h_AN][i][j]; /* y */
- or = ResidualH1[dim][spin][Mc_AN][h_AN][i][j]; /* OptResidualH */
- my_sum += (s-al*y)*or;
+ orx = ResidualH1[dim][spin][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ my_sum += (s-al*y)*orx;
}
}
}
@@ -1541,38 +1541,38 @@ void Pulay_Mixing_H_with_One_Shot_Hessia
s = HisH1[0][0][Mc_AN][h_AN][i][j] - HisH1[1][0][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH1[0][0][Mc_AN][h_AN][i][j] - ResidualH1[1][0][Mc_AN][h_AN][i][j]; /* y */
- or = ResidualH1[dim][0][Mc_AN][h_AN][i][j]; /* OptResidualH */
- H[0][Mc_AN][h_AN][i][j] = h10 - alpha*(al*or + (s-al*y)*be);
+ orx = ResidualH1[dim][0][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ H[0][Mc_AN][h_AN][i][j] = h10 - alpha*(al*orx + (s-al*y)*be);
s = HisH1[0][1][Mc_AN][h_AN][i][j] - HisH1[1][1][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH1[0][1][Mc_AN][h_AN][i][j] - ResidualH1[1][1][Mc_AN][h_AN][i][j]; /* y */
- or = ResidualH1[dim][1][Mc_AN][h_AN][i][j]; /* OptResidualH */
- H[1][Mc_AN][h_AN][i][j] = h11 - alpha*(al*or + (s-al*y)*be);
+ orx = ResidualH1[dim][1][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ H[1][Mc_AN][h_AN][i][j] = h11 - alpha*(al*orx + (s-al*y)*be);
s = HisH1[0][2][Mc_AN][h_AN][i][j] - HisH1[1][2][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH1[0][2][Mc_AN][h_AN][i][j] - ResidualH1[1][2][Mc_AN][h_AN][i][j]; /* y */
- or = ResidualH1[dim][2][Mc_AN][h_AN][i][j]; /* OptResidualH */
- H[2][Mc_AN][h_AN][i][j] = h12 - alpha*(al*or + (s-al*y)*be);
+ orx = ResidualH1[dim][2][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ H[2][Mc_AN][h_AN][i][j] = h12 - alpha*(al*orx + (s-al*y)*be);
s = HisH1[0][3][Mc_AN][h_AN][i][j] - HisH1[1][3][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH1[0][3][Mc_AN][h_AN][i][j] - ResidualH1[1][3][Mc_AN][h_AN][i][j]; /* y */
- or = ResidualH1[dim][3][Mc_AN][h_AN][i][j]; /* OptResidualH */
- H[3][Mc_AN][h_AN][i][j] = h13 - alpha*(al*or + (s-al*y)*be);
+ orx = ResidualH1[dim][3][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ H[3][Mc_AN][h_AN][i][j] = h13 - alpha*(al*orx + (s-al*y)*be);
s = HisH2[0][0][Mc_AN][h_AN][i][j] - HisH2[1][0][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH2[0][0][Mc_AN][h_AN][i][j] - ResidualH2[1][0][Mc_AN][h_AN][i][j]; /* y */
- or = ResidualH2[dim][0][Mc_AN][h_AN][i][j]; /* OptResidualH */
- iHNL[0][Mc_AN][h_AN][i][j] = h20 - alpha*(al*or + (s-al*y)*be);
+ orx = ResidualH2[dim][0][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ iHNL[0][Mc_AN][h_AN][i][j] = h20 - alpha*(al*orx + (s-al*y)*be);
s = HisH2[0][1][Mc_AN][h_AN][i][j] - HisH2[1][1][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH2[0][1][Mc_AN][h_AN][i][j] - ResidualH2[1][1][Mc_AN][h_AN][i][j]; /* y */
- or = ResidualH2[dim][1][Mc_AN][h_AN][i][j]; /* OptResidualH */
- iHNL[1][Mc_AN][h_AN][i][j] = h21 - alpha*(al*or + (s-al*y)*be);
+ orx = ResidualH2[dim][1][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ iHNL[1][Mc_AN][h_AN][i][j] = h21 - alpha*(al*orx + (s-al*y)*be);
s = HisH2[0][2][Mc_AN][h_AN][i][j] - HisH2[1][2][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH2[0][2][Mc_AN][h_AN][i][j] - ResidualH2[1][2][Mc_AN][h_AN][i][j]; /* y */
- or = ResidualH2[dim][2][Mc_AN][h_AN][i][j]; /* OptResidualH */
- iHNL[2][Mc_AN][h_AN][i][j] = h22 - alpha*(al*or + (s-al*y)*be);
+ orx = ResidualH2[dim][2][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ iHNL[2][Mc_AN][h_AN][i][j] = h22 - alpha*(al*orx + (s-al*y)*be);
}
}
}
@@ -1599,8 +1599,8 @@ void Pulay_Mixing_H_with_One_Shot_Hessia
s = HisH1[0][spin][Mc_AN][h_AN][i][j] - HisH1[1][spin][Mc_AN][h_AN][i][j]; /* s */
y = ResidualH1[0][spin][Mc_AN][h_AN][i][j] - ResidualH1[1][spin][Mc_AN][h_AN][i][j]; /* y */
- or = ResidualH1[dim][spin][Mc_AN][h_AN][i][j]; /* OptResidualH */
- H[spin][Mc_AN][h_AN][i][j] = h - alpha*(al*or + (s-al*y)*be);
+ orx = ResidualH1[dim][spin][Mc_AN][h_AN][i][j]; /* OptResidualH */
+ H[spin][Mc_AN][h_AN][i][j] = h - alpha*(al*orx + (s-al*y)*be);
}
}
|
