Skip to content

Commit 0095cda

Browse files
committed
pass 5e-5 test
1 parent b21e596 commit 0095cda

File tree

4 files changed

+599
-537
lines changed

4 files changed

+599
-537
lines changed

src/minimize/minimize.cu

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ void Minimize::parse_minimize(
107107
PRINT_INPUT_ERROR("Hydrostatic_strain should be 1 or 0.");
108108
}
109109
}
110-
}
111-
else {
110+
} else {
112111
PRINT_INPUT_ERROR("Invalid minimizer.");
113112
}
114113

@@ -120,7 +119,8 @@ void Minimize::parse_minimize(
120119
printf(" with a force tolerance of %g eV/A.\n", force_tolerance);
121120
printf(" for maximally %d steps.\n", number_of_steps);
122121

123-
minimizer.reset(new Minimizer_SD(fixed_group, number_of_atoms, number_of_steps, force_tolerance));
122+
minimizer.reset(
123+
new Minimizer_SD(fixed_group, number_of_atoms, number_of_steps, force_tolerance));
124124

125125
minimizer->compute(
126126
force,
@@ -139,31 +139,30 @@ void Minimize::parse_minimize(
139139
printf(" with fixed box.\n");
140140
printf(" with a force tolerance of %g eV/A.\n", force_tolerance);
141141
printf(" for maximally %d steps.\n", number_of_steps);
142-
if (number_of_atoms > 1000) {
142+
if (number_of_atoms > 999) {
143143
minimizer.reset(new Minimizer_FIRE(number_of_atoms, number_of_steps, force_tolerance));
144144

145-
minimizer->compute(
146-
force,
147-
box,
148-
position_per_atom,
149-
type,
150-
group,
151-
potential_per_atom,
152-
force_per_atom,
153-
virial_per_atom);
145+
minimizer->compute(
146+
force,
147+
box,
148+
position_per_atom,
149+
type,
150+
group,
151+
potential_per_atom,
152+
force_per_atom,
153+
virial_per_atom);
154154
} else {
155155
minimizer.reset(new Minimizer_FIRE2(number_of_atoms, number_of_steps, force_tolerance));
156156
minimizer->compute(
157-
force,
158-
box,
159-
position_per_atom,
160-
type,
161-
group,
162-
potential_per_atom,
163-
force_per_atom,
157+
force,
158+
box,
159+
position_per_atom,
160+
type,
161+
group,
162+
potential_per_atom,
163+
force_per_atom,
164164
virial_per_atom);
165165
}
166-
167166

168167
break;
169168
case 2:
@@ -175,33 +174,34 @@ void Minimize::parse_minimize(
175174
}
176175
printf(" with a force tolerance of %g eV/A.\n", force_tolerance);
177176
printf(" for maximally %d steps.\n", number_of_steps);
178-
179-
if (number_of_atoms > 1000) {
177+
178+
if (number_of_atoms > 999) {
180179
minimizer.reset(new Minimizer_FIRE_Box_Change(
181-
number_of_atoms, number_of_steps, force_tolerance, hydrostatic_strain));
180+
number_of_atoms, number_of_steps, force_tolerance, hydrostatic_strain));
182181

183-
minimizer->compute(
184-
force,
185-
box,
186-
position_per_atom,
187-
type,
188-
group,
189-
potential_per_atom,
190-
force_per_atom,
191-
virial_per_atom);
182+
minimizer->compute(
183+
force,
184+
box,
185+
position_per_atom,
186+
type,
187+
group,
188+
potential_per_atom,
189+
force_per_atom,
190+
virial_per_atom);
192191
} else {
193-
minimizer.reset(new Minimizer_FIRE2(number_of_atoms, number_of_steps, force_tolerance, true, hydrostatic_strain));
192+
minimizer.reset(new Minimizer_FIRE2(
193+
number_of_atoms, number_of_steps, force_tolerance, true, hydrostatic_strain));
194194
minimizer->compute(
195-
force,
196-
box,
197-
position_per_atom,
198-
type,
199-
group,
200-
potential_per_atom,
201-
force_per_atom,
195+
force,
196+
box,
197+
position_per_atom,
198+
type,
199+
group,
200+
potential_per_atom,
201+
force_per_atom,
202202
virial_per_atom);
203203
}
204-
204+
205205
break;
206206
default:
207207
PRINT_INPUT_ERROR("Invalid minimizer.");

0 commit comments

Comments
 (0)