From 6b7e0cdb18fe5e3890c1b15c59d673619f1738d9 Mon Sep 17 00:00:00 2001 From: allen Date: Mon, 27 Sep 1999 21:03:58 +0000 Subject: Changing a parameter name sor_maxit to maxit otherwise it is too many sors git-svn-id: http://svn.cactuscode.org/arrangements/CactusElliptic/EllSOR/trunk@21 fa3da13c-9f13-4301-a575-cf5b8c5e1907 --- param.ccl | 2 +- src/sor_confmetric.F | 4 ---- src/sor_flat.F | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/param.ccl b/param.ccl index ecfce41..e71e986 100644 --- a/param.ccl +++ b/param.ccl @@ -15,7 +15,7 @@ USES KEYWORD elliptic_verbose "" private: -CCTK_INT sor_maxit "Maximal number of iteration in the SOR loop" +CCTK_INT maxit "Maximal number of iteration in the SOR loop" { 0:* :: "" } 100 diff --git a/src/sor_confmetric.F b/src/sor_confmetric.F index 9d150c4..fafc8a5 100644 --- a/src/sor_confmetric.F +++ b/src/sor_confmetric.F @@ -92,8 +92,6 @@ c Coeeficients for the solver: 19 point stencil... CCTK_REAL ane,anw,ase,asw,ate,atw CCTK_REAL abe,abw,atn,ats,abn,asb - INTEGER maxit - logical cheb, const, none, verb integer Mlinear_storage,Nsource_storage @@ -122,8 +120,6 @@ c Set up shorthand for the grid spacings c write(*,*)'supper: still need to do something with params' c verb = contains("elliptic_verbose","yes").ne.0 octant = CCTK_Equals(domain,"octant").eq.1 -c maxit = geti("sor_maxit") - maxit = 100 c cheb = contains("sor_accel","cheb").ne.0 c const = contains("sor_accel","const").ne.0 diff --git a/src/sor_flat.F b/src/sor_flat.F index 4b0a477..a6d8b23 100644 --- a/src/sor_flat.F +++ b/src/sor_flat.F @@ -159,7 +159,7 @@ c ats = 0. c abn = 0. c asb = 0. - do sor_iteration=1,sor_maxit + do sor_iteration=1,maxit c We do not know the spectral radius of the Jacobi iteration, c so we will take it to be one which empirically seems to be pretty good @@ -169,7 +169,7 @@ c Set up the omega factor omega = 1.0D0 if (cheb) then do i=2,sor_iteration - omega = 1./(1. - .25*rjacobian**2*omega) + omega = 1.0D0/(1.0D0 - .25D0*rjacobian**2*omega) enddo endif if (const) then -- cgit v1.2.3