Index: eddy/SIZE =================================================================== --- eddy/SIZE (revision 986) +++ eddy/SIZE (working copy) @@ -2,13 +2,23 @@ C C HCUBE array dimensions C + integer*8 lelt + integer lx1, ly1, lz1 + integer ldim + integer lelv + integer lxd, lyd, lzd + integer lelx, lely, lelz parameter (ldim=2) - parameter (lx1=8,ly1=lx1,lz1=1,lelt=300,lelv=lelt) - parameter (lxd=12,lyd=lxd,lzd=1) +C parameter (lx1=256,ly1=lx1,lz1=1,lelt=300,lelv=lelt) + parameter (lx1=192,ly1=lx1,lz1=1,lelt=100,lelv=lelt) + parameter (lxd=lx1*3.0/2.0,lyd=lxd,lzd=1) parameter (lelx=20,lely=20,lelz=1) + integer lzl parameter (lzl=3 + 2*(ldim-3)) + integer lx2, ly2, lz2 + integer lx3, ly3, lz3 parameter (lx2=lx1-2) parameter (ly2=ly1-2) parameter (lz2=lz1 ) @@ -16,13 +26,18 @@ parameter (ly3=ly1) parameter (lz3=lz1) - parameter (lp = 512) + integer lp, lelg + parameter (lp = 256) parameter (lelg = 4100) c c parameter (lpelv=lelv,lpelt=lelt,lpert=3) ! perturbation c parameter (lpx1=lx1,lpy1=ly1,lpz1=lz1) ! array sizes c parameter (lpx2=lx2,lpy2=ly2,lpz2=lz2) c + + integer lpelv, lpelt, lpert + integer lpx1, lpy1, lpz1 + integer lpx2, lpy2, lpz2 parameter (lpelv=1,lpelt=1,lpert=1) ! perturbation parameter (lpx1=1,lpy1=1,lpz1=1) ! array sizes parameter (lpx2=1,lpy2=1,lpz2=1) @@ -31,10 +46,15 @@ c parameter (lbx1=lx1,lby1=ly1,lbz1=lz1) ! array sizes c parameter (lbx2=lx2,lby2=ly2,lbz2=lz2) c + integer lbelv, lbelt + integer lbx1, lby1, lbz1 + integer lbx2, lby2, lbz2 parameter (lbelv=1,lbelt=1) ! MHD parameter (lbx1=1,lby1=1,lbz1=1) ! array sizes parameter (lbx2=1,lby2=1,lbz2=1) + integer lx1m, ly1m, lz1m + integer ldimt, ldimt1, ldimt3 C LX1M=LX1 when there are moving meshes; =1 otherwise parameter (lx1m=1,ly1m=1,lz1m=1) parameter (ldimt= 2) ! 2 passive scalars + T @@ -43,21 +63,30 @@ c c Note: In the new code, LELGEC should be about sqrt(LELG) c + integer LELGEC + integer LXYZ2 + integer LXZ21 PARAMETER (LELGEC = 1) PARAMETER (LXYZ2 = 1) PARAMETER (LXZ21 = 1) + integer LMAXV, LMAXT, LMAXP + integer LXZ + integer LORDER + integer MAXOBJ, MAXMBR PARAMETER (LMAXV=LX1*LY1*LZ1*LELV) PARAMETER (LMAXT=LX1*LY1*LZ1*LELT) PARAMETER (LMAXP=LX2*LY2*LZ2*LELV) PARAMETER (LXZ=LX1*LZ1) PARAMETER (LORDER=3) - PARAMETER (MAXOBJ=4,MAXMBR=LELT*6) + PARAMETER (MAXOBJ=8,MAXMBR=LELT*6) + integer lhis PARAMETER (lhis=100) ! # of pts a proc reads from hpts.in ! Note: lhis*np > npoints in hpts.in C C Common Block Dimensions C + integer LCTMP0, LCTMP1 PARAMETER (LCTMP0 =2*LX1*LY1*LZ1*LELT) PARAMETER (LCTMP1 =4*LX1*LY1*LZ1*LELT) C @@ -65,21 +94,25 @@ C are required for Steady State Solutions. If you are not using C Steady State, it is recommended that LVEC=1. C + integer lvec PARAMETER (LVEC=1) C C Uzawa projection array dimensions C + integer mxprev, lgmres parameter (mxprev = 20) parameter (lgmres = 30) C C Split projection array dimensions C + integer lmvec, lsvec, lstore parameter(lmvec = 1) parameter(lsvec = 1) parameter(lstore=lmvec*lsvec) c c NONCONFORMING STUFF c + integer maxmor parameter (maxmor = lelt) C C Array dimensions @@ -89,11 +122,21 @@ $,NXD,NYD,NZD c automatically added by makenek + integer*8 lxo parameter(lxo = lx1) ! max output grid size (lxo>=lx1) c automatically added by makenek + integer lpart parameter(lpart = 1 ) ! max number of particles c automatically added by makenek integer ax1,ay1,az1,ax2,ay2,az2 parameter (ax1=lx1,ay1=ly1,az1=lz1,ax2=lx2,ay2=ly2,az2=lz2) ! running averages + +c automatically added by makenek + integer lxs, lys, lzs + parameter (lxs=1,lys=lxs,lzs=(lxs-1)*(ldim-2)+1) !New Pressure Preconditioner + +c automatically added by makenek + integer lfdm + parameter (lfdm=0) ! == 1 for fast diagonalization method