From ecb41dfbbf05deed38d4978a75c864794695fd30 Mon Sep 17 00:00:00 2001 From: sfilippone Date: Tue, 16 Jul 2024 13:41:51 +0200 Subject: [PATCH] Update pde3d.inp --- samples/advanced/pdegen/runs/amg_pde3d.inp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/samples/advanced/pdegen/runs/amg_pde3d.inp b/samples/advanced/pdegen/runs/amg_pde3d.inp index 2a4524eb..4ed1ab01 100644 --- a/samples/advanced/pdegen/runs/amg_pde3d.inp +++ b/samples/advanced/pdegen/runs/amg_pde3d.inp @@ -1,12 +1,7 @@ %%%%%%%%%%% General arguments % Lines starting with % are ignored. CSR ! Storage format CSR COO JAD -<<<<<<< HEAD -0040 ! IDIM; domain size. Linear system size is IDIM**3 -CONST ! PDECOEFF: CONST, EXP, GAUSS Coefficients of the PDE -======= 0150 ! IDIM; domain size. Linear system size is IDIM**3 CONST ! PDECOEFF: CONST, EXP, BOX, GAUSS Coefficients of the PDE ->>>>>>> PolySmooth CG ! Iterative method: BiCGSTAB BiCGSTABL BiCG CG CGS FCG GCR RGMRES 2 ! ISTOPC 00008 ! ITMAX @@ -15,12 +10,6 @@ CG ! Iterative method: BiCGSTAB BiCGSTABL BiCG CG CGS F 1.d-6 ! EPS %%%%%%%%%%% Main preconditioner choices %%%%%%%%%%%%%%%% ML-VBM-VCYCLE-FBGS-D-BJAC ! Longer descriptive name for preconditioner (up to 20 chars) -<<<<<<< HEAD -L1-JACOBI ! Preconditioner type: NONE JACOBI GS FBGS BJAC AS ML -%%%%%%%%%%% First smoother (for all levels but coarsest) %%%%%%%%%%%%%%%% -L1-JACOBI ! Smoother type JACOBI FBGS GS BWGS BJAC AS. For 1-level, repeats previous. -4 ! Number of sweeps for smoother -======= ML ! Preconditioner type: NONE JACOBI GS FBGS BJAC AS ML POLY % %%%%%%%%%%% First smoother (for all levels but coarsest) %%%%%%%%%%%%%%%% @@ -33,7 +22,6 @@ CHEB_4_OPT ! Polynomial variant % POLY_RHO_ESTIMATE_ITERATIONS default = 20 % POLY_RHO_BA set to value % ->>>>>>> PolySmooth 0 ! Number of overlap layers for AS preconditioner HALO ! AS restriction operator: NONE HALO NONE ! AS prolongation operator: NONE SUM AVG