Commits

Aron Ahmadia committed 925946e

output now working, but does not reproduce experiments from paper

Comments (0)

Files changed (2)

source/figure_7.1/shallow_4_Rossby_Haurwitz_wave.py

     # ====
     xlower = -3.0
     xupper = 1.0
-    mx = 200
+    mx = 400
 
     ylower = -1.0
     yupper = 1.0
-    my = 100
+    my = 200
 
     # Check whether or not the even number of cells are used in in both 
     # directions. If odd numbers are used a message is print at screen and the 
 if __name__=="__main__":
     from pyclaw.util import run_app_from_main
     output = run_app_from_main(shallow_4_Rossby_Haurwitz)
-    print 'Error: ',output

source/figure_7.1/step2qcor.f

 c     ==========================================================
-      subroutine step2(maxm,maxmx,maxmy,meqn,mwaves,maux,mbc,mx,my,
+      subroutine step2(maxm,meqn,mwaves,maux,mbc,mx,my,
      &               qold,qnew,aux,dx,dy,dt,method,mthlim,cfl,
      &               qadd,fadd,gadd,q1d,dtdx1d,dtdy1d,
      &                 aux1,aux2,aux3,work,mwork)
 c
       implicit double precision (a-h,o-z)
       external rpn2,rpt2
-      double precision qold(meqn,1-mbc:maxmx+mbc, 1-mbc:maxmy+mbc)
-      double precision qnew(meqn,1-mbc:maxmx+mbc, 1-mbc:maxmy+mbc)
+      double precision qold(meqn,1-mbc:mx+mbc, 1-mbc:my+mbc)
+      double precision qnew(meqn,1-mbc:mx+mbc, 1-mbc:my+mbc)
       double precision  q1d(meqn,1-mbc:maxm+mbc)
       double precision qadd(meqn,1-mbc:maxm+mbc)
       double precision fadd(meqn,1-mbc:maxm+mbc)
       double precision gadd(meqn, 2, 1-mbc:maxm+mbc)
-      double precision aux(maux, 1-mbc:maxmx+mbc, 1-mbc:maxmy+mbc)
+      double precision aux(maux, 1-mbc:mx+mbc, 1-mbc:my+mbc)
       double precision aux1(maux, 1-mbc:maxm+mbc)
       double precision aux2(maux, 1-mbc:maxm+mbc)
       double precision aux3(maux, 1-mbc:maxm+mbc)
       dimension qc(4)
 
 
-cf2py intent(in,out) cfl
+cf2py intent(out) cfl
 cf2py intent(in,out) qnew
 cf2py optional q1d, qadd, fadd, gadd, dtdx1d, dtdy1d