fixed y resolution in places to allow different modes in x y

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
+DEFS+= -DGIZA -DDEBUG

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

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
 
 

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)

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----------------------------------

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: