<p><b>ringler@lanl.gov</b> 2011-08-18 16:26:56 -0600 (Thu, 18 Aug 2011)</p><p>updated initial conditions<br>
</p><hr noshade><pre><font color="gray">Modified: branches/pv_based_swm/grid_gen/periodic_hex/namelist.input
===================================================================
--- branches/pv_based_swm/grid_gen/periodic_hex/namelist.input        2011-08-18 17:04:32 UTC (rev 946)
+++ branches/pv_based_swm/grid_gen/periodic_hex/namelist.input        2011-08-18 22:26:56 UTC (rev 947)
@@ -1,8 +1,8 @@
 &amp;periodic_grid
-   nx = 246,
-   ny = 284,
-   dc = 10000.,
+   nx = 4032,
+   ny = 4656,
+   dc = 2500.,
    nVertLevels = 1,
    nTracers = 1,
-   nproc = 2, 4, 8, 12, 16, 32
+   nproc = 2, 4, 8, 12, 16, 32, 64, 128, 256, 512, 1024
 /

Modified: branches/pv_based_swm/grid_gen/periodic_hex/periodic_grid.F
===================================================================
--- branches/pv_based_swm/grid_gen/periodic_hex/periodic_grid.F        2011-08-18 17:04:32 UTC (rev 946)
+++ branches/pv_based_swm/grid_gen/periodic_hex/periodic_grid.F        2011-08-18 22:26:56 UTC (rev 947)
@@ -313,43 +313,31 @@
    psi(:,:,:) = 0.0
    chi(:,:,:) = 0.0
 
-   amplitude = 18000.0
+   amplitude = 375000.0
    ndx = 2.0*pi / (nx*dc)
    ndy = 2.0*pi / (ny*dc*sqrt(3.0)/2.0)
-   kx(1)=6; kx(2)=6; kx(3)=2
-   ky(1)=5; ky(2)=4; ky(3)=5
-   phix(1)=4.0; phix(2)=2.0; phix(3)=1.2
-   phiy(1)=0.1; phiy(2)=4.5; phiy(3)=5.0
+   kx(1)=4; kx(2)=6; kx(3)=2
+   ky(1)=0; ky(2)=4; ky(3)=5
+   phix(1)=0.0; phix(2)=2.0; phix(3)=1.2
+   phiy(1)=0.0; phiy(2)=4.5; phiy(3)=5.0
+
    write(6,*) ndx, ndy
    write(6,*) kx
    write(6,*) ky
    write(6,*) phix
    write(6,*) phiy
 
-!  s = 0
-!  do iCell=1,nCells
-!   x = xCell(iCell)
-!   y = yCell(iCell)
-!   psi(1,iCell,1) = cos( kx(1)*ndx*x + phix(1) ) * cos( ky(1)*ndy*y + phiy(1) ) + &amp;
-!                    cos( kx(2)*ndx*x + phix(2) ) * cos( ky(2)*ndy*y + phiy(2) ) + &amp;
-!                    cos( kx(3)*ndx*x + phix(3) ) * cos( ky(3)*ndy*y + phiy(3) )
-!   psi(1,iCell,1) = psi(1,iCell,1) * amplitude
-!   s = s + psi(1,iCell,1)
-!  end do
-!  psi(1,:,1) = psi(1,:,1) - s/nCells
-!  write(6,*) ' minval/maxval psi',minval(psi),maxval(psi)
-
    s = 0
    do iCell=1,nCells
     x = xCell(iCell)
     y = yCell(iCell)
 
-    vor(1,iCell,1) = -(kx(1)*ndx)**2 * cos( kx(1)*ndx*x + phix(1) ) * cos( ky(1)*ndy*y + phiy(1) ) + &amp;
-                     -(kx(2)*ndx)**2 * cos( kx(2)*ndx*x + phix(2) ) * cos( ky(2)*ndy*y + phiy(2) ) + &amp;
-                     -(kx(3)*ndx)**2 * cos( kx(3)*ndx*x + phix(3) ) * cos( ky(3)*ndy*y + phiy(3) ) + &amp;
-                     -(ky(1)*ndy)**2 * cos( kx(1)*ndx*x + phix(1) ) * cos( ky(1)*ndy*y + phiy(1) ) + &amp;
-                     -(ky(2)*ndy)**2 * cos( kx(2)*ndx*x + phix(2) ) * cos( ky(2)*ndy*y + phiy(2) ) + &amp;
-                     -(ky(3)*ndy)**2 * cos( kx(3)*ndx*x + phix(3) ) * cos( ky(3)*ndy*y + phiy(3) )
+    vor(1,iCell,1) =       -(kx(1)*ndx)**2 * cos( kx(1)*ndx*x + phix(1) ) * cos( ky(1)*ndy*y + phiy(1) )&amp;
+                           -(kx(2)*ndx)**2 * cos( kx(2)*ndx*x + phix(2) ) * cos( ky(2)*ndy*y + phiy(2) )&amp;
+                           -(kx(3)*ndx)**2 * cos( kx(3)*ndx*x + phix(3) ) * cos( ky(3)*ndy*y + phiy(3) )&amp;
+                           -(ky(1)*ndy)**2 * cos( kx(1)*ndx*x + phix(1) ) * cos( ky(1)*ndy*y + phiy(1) )&amp;
+                           -(ky(2)*ndy)**2 * cos( kx(2)*ndx*x + phix(2) ) * cos( ky(2)*ndy*y + phiy(2) )&amp;
+                           -(ky(3)*ndy)**2 * cos( kx(3)*ndx*x + phix(3) ) * cos( ky(3)*ndy*y + phiy(3) )
 
     vor(1,iCell,1) = vor(1,iCell,1) * amplitude
     s = s + vor(1,iCell,1)
@@ -357,27 +345,6 @@
    vor(1,:,1) = vor(1,:,1) - s/nCells
    write(6,*) ' minval/maxval vor',minval(vor),maxval(vor)
 
-
-
-!  do iCell=1,nCells
-!    do j=1,nEdgesOnCell(iCell)
-!       jCell = cellsOnCell(j,iCell)
-!       vor(1,iCell,1) = vor(1,iCell,1) + (sqrt(3.0)/3.0)*(psi(1,jCell,1)-psi(1,iCell,1))
-!       if(iCell.eq.50.or.iCell.eq.302) then
-!         write(6,21) iCell,jCell
-!         write(6,20) vor(1,iCell,1),psi(1,jCell,1),psi(1,iCell,1),areaCell(iCell)
-!       endif
-!    enddo
-!    vor(1,iCell,1) = vor(1,iCell,1) / areaCell(iCell)
-!    if(iCell.eq.50.or.iCell.eq.302) then
-!       write(6,20) xCell(iCell),yCell(iCell)
-!       write(6,21) cellsOnCell(:,iCell)
-!       write(6,20) vor(1,iCell,1),psi(1,iCell,1)
-!    endif
-!20  format(8e23.10)
-!21  format(10i8)
-!  enddo
-
    tracers(1,1,:,1) = (vor(1,:,1) + fCell(:))/h(1,:,1)
    pv(1,:,1) = tracers(1,1,:,1)
    write(6,*) ' minval/maxval vor',minval(vor),maxval(vor)

</font>
</pre>