Skip to content

Commit e716c0c

Browse files
author
huiscliu
committed
fix verb
1 parent 7d0c003 commit e716c0c

File tree

1 file changed

+27
-3
lines changed

1 file changed

+27
-3
lines changed

src/sxamg.c

+27-3
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,12 @@ SX_RTN sx_solver_amg(SX_MAT *A, SX_VEC *x, SX_VEC *b, SX_AMG_PARS *pars)
158158
// Step 1: AMG setup phase
159159
sx_amg_setup(&mg, A, pars);
160160

161+
// print out CPU time if needed
162+
if (verb > 0) {
163+
AMG_end = sx_get_time();
164+
sx_printf("AMG setup time: %"fFMTg" s\n", AMG_end - AMG_start);
165+
}
166+
161167
// Step 2: AMG solve phase
162168
rtn = sx_solver_amg_solve(&mg, x, b);
163169

@@ -201,7 +207,7 @@ SX_RTN sx_solver_gmres(SX_KRYLOV *ks, SX_AMG_PARS *pars)
201207
pars = &npars;
202208
}
203209

204-
verb = pars->verb;
210+
verb = ks->verb;
205211

206212
nnz = A->num_nnzs;
207213
m = A->num_rows;
@@ -223,6 +229,12 @@ SX_RTN sx_solver_gmres(SX_KRYLOV *ks, SX_AMG_PARS *pars)
223229
// Step 1: AMG setup phase
224230
sx_amg_setup(&mg, A, pars);
225231

232+
// print out CPU time if needed
233+
if (verb > 0) {
234+
AMG_end = sx_get_time();
235+
sx_printf("AMG setup time: %"fFMTg" s\n", AMG_end - AMG_start);
236+
}
237+
226238
// Step 2: solve phase
227239
rtn = sx_solver_gmres_itnl(ks, &mg);
228240

@@ -265,7 +277,7 @@ SX_RTN sx_solver_cg(SX_KRYLOV *ks, SX_AMG_PARS *pars)
265277
pars = &npars;
266278
}
267279

268-
verb = pars->verb;
280+
verb = ks->verb;
269281

270282
nnz = A->num_nnzs;
271283
m = A->num_rows;
@@ -287,6 +299,12 @@ SX_RTN sx_solver_cg(SX_KRYLOV *ks, SX_AMG_PARS *pars)
287299
// Step 1: AMG setup phase
288300
sx_amg_setup(&mg, A, pars);
289301

302+
// print out CPU time if needed
303+
if (verb > 0) {
304+
AMG_end = sx_get_time();
305+
sx_printf("AMG setup time: %"fFMTg" s\n", AMG_end - AMG_start);
306+
}
307+
290308
// Step 2: solve phase
291309
rtn = sx_solver_cg_itnl(ks, &mg);
292310

@@ -329,7 +347,7 @@ SX_RTN sx_solver_bicgstab(SX_KRYLOV *ks, SX_AMG_PARS *pars)
329347
pars = &npars;
330348
}
331349

332-
verb = pars->verb;
350+
verb = ks->verb;
333351

334352
nnz = A->num_nnzs;
335353
m = A->num_rows;
@@ -351,6 +369,12 @@ SX_RTN sx_solver_bicgstab(SX_KRYLOV *ks, SX_AMG_PARS *pars)
351369
// Step 1: AMG setup phase
352370
sx_amg_setup(&mg, A, pars);
353371

372+
// print out CPU time if needed
373+
if (verb > 0) {
374+
AMG_end = sx_get_time();
375+
sx_printf("AMG setup time: %"fFMTg" s\n", AMG_end - AMG_start);
376+
}
377+
354378
// Step 2: solve phase
355379
rtn = sx_solver_bicgstab_itnl(ks, &mg);
356380

0 commit comments

Comments
 (0)