From 476eea3ffdbe4faff22ea6ef1ec75a0ebdb95e53 Mon Sep 17 00:00:00 2001 From: jcwright77 Date: Wed, 2 Oct 2024 17:56:26 -0400 Subject: [PATCH] fixed y resolution in places to allow different modes in x y --- makeopts.eofe7.intel | 4 ++-- src/aorsa2dMain.F | 9 --------- src/aorsaSubs.f | 8 ++++---- src/fieldws.f | 23 ++++++++++++++--------- src/rf2x_setup2.f | 4 ++-- src/size_mod.f90 | 2 +- 6 files changed, 23 insertions(+), 27 deletions(-) diff --git a/makeopts.eofe7.intel b/makeopts.eofe7.intel index a8b7a63..28c78fa 100644 --- a/makeopts.eofe7.intel +++ b/makeopts.eofe7.intel @@ -2,8 +2,8 @@ include compileropts.intel #-ftrapuv #there are a LOT of unitialized vars in aorsa FC = mpiifort -cpp -g -O0 -traceback -debug all -mkl=cluster -module mod PGPLOT_DIR := ${PKG_GIZA_ROOT}/lib -LIBS = -L$(PGPLOT_DIR) -Wl,-rpath,$(PGPLOT_DIR) -lpgplot -lgiza -L$(NETCDF_LIB) -Wl,-rpath,$(NETCDF_LIB) -L$(NETCDFF_LIB) -Wl,-rpath,$(NETCDFF_LIB) -lnetcdff -lnetcdf +LIBS = -L$(PGPLOT_DIR) -Wl,-rpath,$(PGPLOT_DIR) -lpgplot -lgiza -L$(NETCDF_LIB) -Wl,-rpath,$(NETCDF_LIB) -L$(NETCDFF_LIB) -Wl,-rpath,$(NETCDFF_LIB) -lnetcdff -lnetcdf -lsz #LIBS += -L /usr/lib64 -lX11 INCLUDE_DIRS = -I$(NETCDF_INC) -I$(NETCDFF_INC) -DEFS+= -DGIZA \ No newline at end of file +DEFS+= -DGIZA -DDEBUG diff --git a/src/aorsa2dMain.F b/src/aorsa2dMain.F index befc6cc..11eb66a 100755 --- a/src/aorsa2dMain.F +++ b/src/aorsa2dMain.F @@ -3300,11 +3300,6 @@ program aorsa2dMain if (i_antenna .eq. 0) then shapey = exp(- deltay**2 / yant_max**2) -! if (myid==0) then -! write(*,*) 'shapey-a', capr(i),y(j),deltay, shapey -! write(*,*) 'shapey-a ', dpsiant,gausspsi,rt -! end if - end if @@ -3327,10 +3322,6 @@ program aorsa2dMain xjy(i,j) = xjanty * shapey * gausspsi * Iy xjz(i,j) = xjantz * shapey * gausspsi * Iz - if (myid==0) then - write(*,*) "gausspsi", i,j,gausspsi,xjz(i,j),psiant, - & psi(i,j), dpsiant,xjantz,shapey,Iz,deltay,yant_max - end if end if if(i_antenna .eq. 2) then diff --git a/src/aorsaSubs.f b/src/aorsaSubs.f index 458ff4d..10a93c3 100755 --- a/src/aorsaSubs.f +++ b/src/aorsaSubs.f @@ -399,7 +399,7 @@ subroutine sgrator(x, y, f, nx1, nx2, ny1, ny2, ans, implicit none integer i, j, nx1, nx2, ny1, ny2, nxmax, nymax - real f(nxmax, nxmax), x(nxmax), y(nymax), ans, dx, dy + real f(nxmax, nymax), x(nxmax), y(nymax), ans, dx, dy real capr(nxmax), r0 @@ -431,7 +431,7 @@ subroutine sgrator_core(x, y, f, nx1, nx2, ny1, ny2, ans, implicit none integer i, j, nx1, nx2, ny1, ny2, nxmax, nymax - real f(nxmax, nxmax), x(nxmax), y(nymax), ans, dx, dy + real f(nxmax, nymax), x(nxmax), y(nymax), ans, dx, dy real capr(nxmax), r0, rho(nxmax, nymax) @@ -465,7 +465,7 @@ subroutine sgrator_edge(x, y, f, nx1, nx2, ny1, ny2, ans, implicit none integer i, j, nx1, nx2, ny1, ny2, nxmax, nymax - real f(nxmax, nxmax), x(nxmax), y(nymax), ans, dx, dy + real f(nxmax, nymax), x(nxmax), y(nymax), ans, dx, dy real capr(nxmax), r0, rho(nxmax, nymax) @@ -501,7 +501,7 @@ subroutine sgrator1(x, y, f, nx1, nx2, ny1, ny2, ans, implicit none integer i, j, nx1, nx2, ny1, ny2, nxmax, nymax - real f(nxmax, nxmax), x(nxmax), y(nymax), ans, dx, dy + real f(nxmax, nymax), x(nxmax), y(nymax), ans, dx, dy real capr(nxmax), r0 diff --git a/src/fieldws.f b/src/fieldws.f index 76be9d6..83d69d4 100755 --- a/src/fieldws.f +++ b/src/fieldws.f @@ -188,8 +188,8 @@ subroutine fieldws(dfquotient, rmin_zoom, rmax_zoom) parameter (nkdim1 = - nxmx / 2) parameter (nkdim2 = nxmx / 2) - parameter (mkdim1 = - nxmx / 2) - parameter (mkdim2 = nxmx / 2) + parameter (mkdim1 = - nymx / 2) + parameter (mkdim2 = nymx / 2) parameter (nkpltdim = 2 * nkdim2) parameter (mkpltdim = 2 * mkdim2) @@ -2750,14 +2750,14 @@ subroutine fieldws(dfquotient, rmin_zoom, rmax_zoom) & scalex) - +#ifdef skip title = 'Toroidal force' call ezconc(capr, y, fz0, ff, nnodex, nnodey, numb, & nxmx, nymx, nlevmax, title, titx, tity, iflag,scalex) if (iflag .eq. 0) call boundary (capr, y, rho, ff, nnodex, & nnodey, numb, nxmx, nymx, nlevmax, title, titx, tity, & scalex) - +#endif write(140, 3857) @@ -3195,7 +3195,7 @@ subroutine fieldws(dfquotient, rmin_zoom, rmax_zoom) end do end do - title = 'Real(E_minus)' + title = 'Real(E_{minus})' call ezconc(capr, y, freal, ff, nnodex, nnodey, numb, & nxmx, nymx, nlevmax, title, titx, tity, iflag,scalex) if (iflag .eq. 0) call boundary (capr, y, rho, ff, nnodex, @@ -5440,7 +5440,7 @@ subroutine ezconc(r, theta, f, flevel, nr, nth, nlevel, ! fmax = MAXVAL(f) !(2:nrmax-1,:)) #ifdef DEBUG - write(*,*) 'ezconc title: ', title,scale,scalex, + write(6,*) 'ezconc title: ', title,scale,scalex, & ymin,ymax,xmin,xmax #endif iflag = 0 @@ -6673,9 +6673,7 @@ subroutine ezplot70(title, titll, titlr, titlb, x1, integer:: nblack,nred,nyellow, ngreen,naqua,npink, & nwheat,ngrey,nbrown,nblue,nblueviolet,ncyan1, & nturquoise,nmagenta,nsalmon,nwhite,ncolln3, norange -#ifdef DEBUG - write(*,*) 'DEBUG ezplot70 ', title -#endif + nwhite = 0 nblack = 1 nred = 2 @@ -6696,6 +6694,13 @@ subroutine ezplot70(title, titll, titlr, titlb, x1, ymax = max(y1max, y2max, y3max, y4max, y5max, y6max, yemax) ymin = min(y1min, y2min, y3min, y4min, y5min, y6min, yemin) +#ifdef DEBUG + write(6,*) 'DEBUG ezplot70 ', title,scale,scalex,ymin,ymax + if (ymax /= ymax) then + write(6,*) 'Nan found in ymax' + return + end if +#endif ymin=0.0 rhomax=x1(nr) diff --git a/src/rf2x_setup2.f b/src/rf2x_setup2.f index b6a1d33..b29ea51 100755 --- a/src/rf2x_setup2.f +++ b/src/rf2x_setup2.f @@ -197,8 +197,8 @@ subroutine run_rf2x(nmodesx, nmodesy, rwleft, rwright, real betan, betan2, betan3, betate, betati, betati2, & betati3, taue - real yprimec(nxmx), ycourse(nxmx), - & yprime(nxmx), y(nxmx), dy, dyc + real yprimec(nymx), ycourse(nymx), + & yprime(nymx), y(nymx), dy, dyc !------------------end of declarations---------------------------------- diff --git a/src/size_mod.f90 b/src/size_mod.f90 index 287f3fc..d734882 100755 --- a/src/size_mod.f90 +++ b/src/size_mod.f90 @@ -1,7 +1,7 @@ module size_mod implicit none - integer, parameter:: nmodesmax=64, mmodesmax=64 + integer, parameter:: nmodesmax=512, mmodesmax=512 !JCW AORSA presently not happy if sizes are not 2x nmodex, ! --------------------------------------------------- ! Maximum number of modes allowed: