Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating comments, making chkmth slightly more proper #50

Merged
merged 1 commit into from
Aug 20, 2013
Merged

Updating comments, making chkmth slightly more proper #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions src/1d/claw1.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,16 @@ subroutine claw1(meqn,mwaves,maux,mbc,mx,
c along each edge of the grid that are used for boundary
c conditions.
c
c q(1-mbc:mx+mbc, meqn)
c q(meqn, 1-mbc:mx+mbc)
c On input: initial data at time tstart.
c On output: final solution at time tend.
c q(i,m) = value of mth component in the i'th cell.
c Values within the physical domain are in q(i,m)
c q(m,i) = value of mth component in the i'th cell.
c Values within the physical domain are in q(m,i)
c for i = 1,2,...,mx
c mbc extra cells on each end are needed for boundary conditions
c as specified in the routine bc1.
c
c aux(1-mbc:mx+mbc, maux)
c aux(maux, 1-mbc:mx+mbc)
c Array of auxiliary variables that are used in specifying the problem.
c If method(7) = 0 then there are no auxiliary variables and aux
c can be a dummy variable.
Expand All @@ -99,7 +99,7 @@ subroutine claw1(meqn,mwaves,maux,mbc,mx,
c If method(6) = 0 then there is no capacity function.
c If method(6) = mcapa > 0 then there is a capacity function and
c capa(i), the "capacity" of the i'th cell, is assumed to be
c stored in aux(i,mcapa).
c stored in aux(mcapa,i).
c In this case we require method(7).ge.mcapa.
c
c dx = grid spacing in x.
Expand Down Expand Up @@ -247,10 +247,10 @@ subroutine claw1(meqn,mwaves,maux,mbc,mx,
c
c The form of this subroutine is
c -------------------------------------------------
c subroutine bc1(meqn,mbc,mx,xlower,dx,q,maux,aux,t,mthbc)
c subroutine bc1(meqn,mbc,mx,xlower,dx,q,maux,aux,t,dt,mthbc)
c implicit double precision (a-h,o-z)
c dimension q(1-mbc:mx+mbc, meqn)
c dimension aux(1-mbc:mx+mbc, *)
c dimension q(meqn, 1-mbc:mx+mbc)
c dimension aux(maux, 1-mbc:mx+mbc)
c dimension mthbc(2)
c -------------------------------------------------
c
Expand All @@ -262,25 +262,25 @@ subroutine claw1(meqn,mwaves,maux,mbc,mx,
c
c The form of this subroutine is
c -------------------------------------------------
c subroutine rp1(meqn,mwaves,mbc,mx,ql,qr,auxl,auxr,wave,s,amdq,apdq)
c subroutine rp1(meqn,mwaves,mbc,mx,ql,qr,auxl,auxr,wave,s,amdq,apdq,maux)
c implicit double precision (a-h,o-z)
c dimension ql(1-mbc:mx+mbc, meqn)
c dimension qr(1-mbc:mx+mbc, meqn)
c dimension auxl(1-mbc:mx+mbc, *)
c dimension auxr(1-mbc:mx+mbc, *)
c dimension wave(1-mbc:mx+mbc, meqn, mwaves)
c dimension s(1-mbc:mx+mbc, mwaves)
c dimension amdq(1-mbc:mx+mbc, meqn)
c dimension apdq(1-mbc:mx+mbc, meqn)
c dimension ql(meqn, 1-mbc:mx+mbc)
c dimension qr(meqn, 1-mbc:mx+mbc)
c dimension auxl(maux, 1-mbc:mx+mbc)
c dimension auxr(maux, 1-mbc:mx+mbc)
c dimension wave(meqn, mwaves, 1-mbc:mx+mbc)
c dimension s(mwaves, 1-mbc:mx+mbc)
c dimension amdq(meqn, 1-mbc:mx+mbc)
c dimension apdq(meqn, 1-mbc:mx+mbc)
c -------------------------------------------------
c
c On input, ql contains the state vector at the left edge of each cell
c qr contains the state vector at the right edge of each cell
c auxl contains auxiliary values at the left edge of each cell
c auxr contains auxiliary values at the right edge of each cell
c
c Note that the i'th Riemann problem has left state qr(i-1,:)
c and right state ql(i,:)
c Note that the i'th Riemann problem has left state qr(:,i-1)
c and right state ql(:,i)
c In the standard clawpack routines, this Riemann solver is
c called with ql=qr=q along this slice. More flexibility is allowed
c in case the user wishes to implement another solution method
Expand All @@ -291,12 +291,12 @@ subroutine claw1(meqn,mwaves,maux,mbc,mx,
c auxl=auxr=aux in the call to rp1.
c
c On output,
c wave(i,m,mw) is the m'th component of the jump across
c wave(m,mw,i) is the m'th component of the jump across
c wave number mw in the ith Riemann problem.
c s(i,mw) is the wave speed of wave number mw in the
c s(mw,i) is the wave speed of wave number mw in the
c ith Riemann problem.
c amdq(i,m) = m'th component of A^- Delta q,
c apdq(i,m) = m'th component of A^+ Delta q,
c amdq(m,i) = m'th component of A^- Delta q,
c apdq(m,i) = m'th component of A^+ Delta q,
c the decomposition of the flux difference
c f(qr(i-1)) - f(ql(i))
c into leftgoing and rightgoing parts respectively.
Expand All @@ -318,18 +318,18 @@ subroutine claw1(meqn,mwaves,maux,mbc,mx,
c
c The form of this subroutine is
c -------------------------------------------------
c subroutine src1(mx,meqn,mbc,mx,xlower,dx,q,maux,aux,t,dt)
c subroutine src1(meqn,mbc,mx,xlower,dx,q,maux,aux,t,dt)
c implicit double precision (a-h,o-z)
c dimension q(1-mbc:mx+mbc, meqn)
c dimension aux(1-mbc:mx+mbc, *)
c dimension q(meqn, 1-mbc:mx+mbc)
c dimension aux(maux, 1-mbc:mx+mbc)
c -------------------------------------------------
c If method(7)=0 or the auxiliary variables are not needed in this solver,
c then the latter dimension statement can be omitted, but aux should
c still appear in the argument list.
c
c On input, q(i,m) contains the data for solving the
c On input, q(m,i) contains the data for solving the
c source term equation.
c On output, q(i,m) should have been replaced by the solution to
c On output, q(m,i) should have been replaced by the solution to
c the source term equation after a step of length dt.
c
c
Expand All @@ -340,10 +340,10 @@ subroutine claw1(meqn,mwaves,maux,mbc,mx,
c The form of this subroutine is
c
c -------------------------------------------------
c subroutine b4step1(mx,mbc,mx,meqn,q,xlower,dx,time,dt,maux,aux)
c subroutine b4step1(mbc,mx,meqn,q,xlower,dx,time,dt,maux,aux)
c implicit double precision (a-h,o-z)
c dimension q(1-mbc:mx+mbc, meqn)
c dimension aux(1-mbc:mx+mbc, *)
c dimension q(meqn, 1-mbc:mx+mbc)
c dimension aux(maux, 1-mbc:mx+mbc)
c -------------------------------------------------
c
c
Expand Down
3 changes: 1 addition & 2 deletions src/1d/claw1ez.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ subroutine claw1ez ! No arguments
c Documentation is available at
c http://www.amath.washington.edu/~claw/doc.html
c
c Author: Randall J. LeVeque
c Version of August, 2002 -- CLAWPACK Version 4.1
c Authors: Randall J. LeVeque, Grady I. Lemoine
c
implicit double precision (a-h,o-z)
external bc1,rp1,src1,b4step1
Expand Down
4 changes: 2 additions & 2 deletions src/1d/rp1.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ subroutine rp1(meqn,mwaves,mbc,mx,ql,qr,auxl,auxr,
c # amdq the left-going flux difference A^- \Delta q
c # apdq the right-going flux difference A^+ \Delta q
c
c # Note that the i'th Riemann problem has left state qr(i-1,:)
c # and right state ql(i,:)
c # Note that the i'th Riemann problem has left state qr(:,i-1)
c # and right state ql(:,i)
c # From the basic clawpack routine step1, rp is called with ql = qr = q.
c
c
Expand Down
10 changes: 5 additions & 5 deletions src/1d/step1.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ subroutine step1(num_eqn,num_waves,num_ghost,num_aux,mx,q,aux,dx, &

! amdq, apdq, wave, s, and f are used locally:

! amdq(1-num_ghost:mx+num_ghost, num_eqn) = left-going flux-differences
! apdq(1-num_ghost:mx+num_ghost, num_eqn) = right-going flux-differences
! amdq(num_eqn, 1-num_ghost:mx+num_ghost) = left-going flux-differences
! apdq(num_eqn, 1-num_ghost:mx+num_ghost) = right-going flux-differences
! e.g. amdq(m,i) = m'th component of A^- \Delta q from i'th Riemann
! problem (between cells i-1 and i).

! wave(1-num_ghost:mx+num_ghost, num_eqn, num_waves) = waves from solution of
! wave(num_eqn, num_waves, 1-num_ghost:mx+num_ghost) = waves from solution of
! Riemann problems,
! wave(m,mw,i) = mth component of jump in q across
! wave in family mw in Riemann problem between
! states i-1 and i.

! s(1-num_ghost:mx+num_ghost, num_waves) = wave speeds,
! s(num_waves, 1-num_ghost:mx+num_ghost) = wave speeds,
! s(m,iw) = speed of wave in family mw in Riemann problem between
! states i-1 and i.

! f(1-num_ghost:mx+num_ghost, num_eqn) = correction fluxes for second order method
! f(num_eqn, 1-num_ghost:mx+num_ghost) = correction fluxes for second order method
! f(m,i) = mth component of flux at left edge of ith cell
! --------------------------------------------------------------------

Expand Down
72 changes: 36 additions & 36 deletions src/2d/claw2.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,16 @@ subroutine claw2(meqn,mwaves,maux,mbc,mx,my,
c along each edge of the grid that are used for boundary
c conditions.
c
c q(1-mbc:mx+mbc, 1-mbc:my+mbc, meqn)
c q(meqn, 1-mbc:mx+mbc, 1-mbc:my+mbc)
c On input: initial data at time tstart.
c On output: final solution at time tend.
c q(i,j,m) = value of mth component in the (i,j) cell.
c Values within the physical domain are in q(i,j,m)
c q(m,i,j) = value of mth component in the (i,j) cell.
c Values within the physical domain are in q(m,i,j)
c for i = 1,2,...,mx and j = 1,2,...,my.
c mbc extra cells on each end are needed for boundary conditions
c as specified in the routine bc2.
c
c aux(1-mbc:mx+mbc, 1-mbc:my+mbc, maux)
c aux(maux, 1-mbc:mx+mbc, 1-mbc:my+mbc)
c Array of auxiliary variables that are used in specifying the problem.
c If method(7) = 0 then there are no auxiliary variables and aux
c can be a dummy variable.
Expand All @@ -114,7 +114,7 @@ subroutine claw2(meqn,mwaves,maux,mbc,mx,my,
c If method(6) = 0 then there is no capacity function.
c If method(6) = mcapa > 0 then there is a capacity function and
c capa(i,j), the "capacity" of the (i,j) cell, is assumed to be
c stored in aux(i,j,mcapa).
c stored in aux(mcapa,i,j).
c In this case we require method(7).ge.mcapa.
c
c dx = grid spacing in x.
Expand Down Expand Up @@ -243,7 +243,7 @@ subroutine claw2(meqn,mwaves,maux,mbc,mx,my,
c
c method(6) = 0 if there is no capacity function capa.
c = mcapa > 0 if there is a capacity function. In this case
c aux(i,j,mcapa) is the capacity of cell (i,j) and you
c aux(mcapa,i,j) is the capacity of cell (i,j) and you
c must also specify method(7) .ge. mcapa and set aux.
c
c method(7) = 0 if there is no aux array used.
Expand Down Expand Up @@ -315,17 +315,17 @@ subroutine claw2(meqn,mwaves,maux,mbc,mx,my,
c The form of this subroutine is
c -------------------------------------------------
c subroutine rpn2(ixy,maxm,meqn,mwaves,mbc,mx,ql,qr,
c & auxl,auxr,wave,s,amdq,apdq)
c & auxl,auxr,wave,s,amdq,apdq,maux)
c
c implicit double precision (a-h,o-z)
c dimension wave(1-mbc:maxm+mbc, meqn, mwaves)
c dimension s(1-mbc:maxm+mbc, mwaves)
c dimension ql(1-mbc:maxm+mbc, meqn)
c dimension qr(1-mbc:maxm+mbc, meqn)
c dimension auxl(1-mbc:maxm+mbc, *)
c dimension auxr(1-mbc:maxm+mbc, *)
c dimension amdq(1-mbc:maxm+mbc, meqn)
c dimension apdq(1-mbc:maxm+mbc, meqn)
c dimension wave(meqn, mwaves, 1-mbc:maxm+mbc)
c dimension s(mwaves, 1-mbc:maxm+mbc)
c dimension ql(meqn, 1-mbc:maxm+mbc)
c dimension qr(meqn, 1-mbc:maxm+mbc)
c dimension auxl(maux, 1-mbc:maxm+mbc)
c dimension auxr(maux, 1-mbc:maxm+mbc)
c dimension amdq(meqn, 1-mbc:maxm+mbc)
c dimension apdq(meqn, 1-mbc:maxm+mbc)
c -------------------------------------------------
c
c On input, ql contains the state vector at the left edge of each cell
Expand All @@ -336,8 +336,8 @@ subroutine claw2(meqn,mwaves,maux,mbc,mx,my,
c This data is along a slice in the x-direction if ixy=1
c or the y-direction if ixy=2.
c
c Note that the i'th Riemann problem has left state qr(i-1,:)
c and right state ql(i,:)
c Note that the i'th Riemann problem has left state qr(:,i-1)
c and right state ql(:,i)
c In the standard clawpack routines, this Riemann solver is
c called with ql=qr=q along this slice. More flexibility is allowed
c in case the user wishes to implement another solution method
Expand All @@ -348,12 +348,12 @@ subroutine claw2(meqn,mwaves,maux,mbc,mx,my,
c auxl=auxr is just the values of aux along this slice.

c On output,
c wave(i,m,mw) is the mth component of the jump across
c wave(m,mw,i) is the mth component of the jump across
c wave number mw in the ith Riemann problem.
c s(i,mw) is the wave speed of wave number mw in the
c s(mw,i) is the wave speed of wave number mw in the
c ith Riemann problem.
c amdq(i,m) is the m'th component of the left-going flux difference.
c apdq(i,m) is the m'th component of the right-going flux difference.
c amdq(m,i) is the m'th component of the left-going flux difference.
c apdq(m,i) is the m'th component of the right-going flux difference.
c It is assumed that each wave consists of a jump discontinuity
c propagating at a single speed, as results, for example, from a
c Roe approximate Riemann solver. An entropy fix can be included
Expand All @@ -365,17 +365,17 @@ subroutine claw2(meqn,mwaves,maux,mbc,mx,my,
c The form of this subroutine is
c -------------------------------------------------
c subroutine rpt2(ixy,maxm,meqn,mwaves,mbc,mx,ql,qr,aux1,aux2,aux3,
c imp,asdq,bmasdq,bpasdq)
c imp,asdq,bmasdq,bpasdq,maux)
c
c implicit double precision (a-h,o-z)
c dimension ql(1-mbc:maxm+mbc, meqn)
c dimension qr(1-mbc:maxm+mbc, meqn)
c dimension aux1(1-mbc:maxm+mbc, maux)
c dimension aux2(1-mbc:maxm+mbc, maux)
c dimension aux3(1-mbc:maxm+mbc, maux)
c dimension asdq(1-mbc:maxm+mbc, meqn)
c dimension bmasdq(1-mbc:maxm+mbc, meqn)
c dimension bpasdq(1-mbc:maxm+mbc, meqn)
c dimension ql(meqn, 1-mbc:maxm+mbc)
c dimension qr(meqn, 1-mbc:maxm+mbc)
c dimension aux1(maux, 1-mbc:maxm+mbc)
c dimension aux2(maux, 1-mbc:maxm+mbc)
c dimension aux3(maux, 1-mbc:maxm+mbc)
c dimension asdq(meqn, 1-mbc:maxm+mbc)
c dimension bmasdq(meqn, 1-mbc:maxm+mbc)
c dimension bpasdq(meqn, 1-mbc:maxm+mbc)
c -------------------------------------------------
c On input,
c ql,qr is the data along some one-dimensional slice, as in rpn2
Expand Down Expand Up @@ -418,16 +418,16 @@ subroutine claw2(meqn,mwaves,maux,mbc,mx,my,
c subroutine src2(meqn,mbc,mx,my,xlower,ylower,
c & dx,dy,q,maux,aux,told,dt2)
c implicit double precision (a-h,o-z)
c dimension q(1-mbc:mx+mbc, 1-mbc:my+mbc, meqn)
c dimension aux(1-mbc:mx+mbc, 1-mbc:my+mbc, *)
c dimension q(meqn, 1-mbc:mx+mbc, 1-mbc:my+mbc)
c dimension aux(maux, 1-mbc:mx+mbc, 1-mbc:my+mbc)
c -------------------------------------------------
c If method(7)=0 or the auxiliary variables are not needed in this solver,
c then the latter dimension statement can be omitted, but aux should
c still appear in the argument list.
c
c On input, q(i,j,m) contains the data for solving the
c On input, q(m,i,j) contains the data for solving the
c source term equation.
c On output, q(i,j,m) should have been replaced by the solution to
c On output, q(m,i,j) should have been replaced by the solution to
c the source term equation after a step of length dt.
c
c
Expand All @@ -442,8 +442,8 @@ subroutine claw2(meqn,mwaves,maux,mbc,mx,my,
c subroutine b4step2(mbc,mx,my,meqn,q,
c & xlower,ylower,dx,dy,time,dt,maux,aux)
c implicit double precision (a-h,o-z)
c dimension q(1-mbc:mx+mbc, meqn)
c dimension aux(1-mbc:mx+mbc, *)
c dimension q(meqn, 1-mbc:mx+mbc)
c dimension aux(maux, 1-mbc:mx+mbc)
c -------------------------------------------------
c
c
Expand Down
3 changes: 1 addition & 2 deletions src/2d/claw2ez.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ subroutine claw2ez ! No arguments
c Documentation is available at
c http://www.amath.washington.edu/~claw/doc.html
c
c Author: Randall J. LeVeque
c Version of August, 2002 -- CLAWPACK Version 4.1
c Authors: Randall J. LeVeque, Grady I. Lemoine
c
implicit double precision (a-h,o-z)
external bc2,rpn2,rpt2,src2,b4step2
Expand Down
2 changes: 1 addition & 1 deletion src/2d/driver.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
! Generic driver routine for 3D Clawpack 5.0, using claw2ez
! Generic driver routine for 2D Clawpack 5.0, using claw2ez
! Allocation has been moved int claw2ez; this file essentially
! does nothing, but is being retained because it gives the
! codebase more flexibility.
Expand Down
8 changes: 4 additions & 4 deletions src/2d/flux2.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ subroutine flux2(ixy,maxm,num_eqn,num_waves,num_aux,num_ghost,mx, &
! # go into the arrays fadd and gadd. The notation is written assuming
! # we are solving along a 1D slice in the x-direction.

! # fadd(i,.) modifies F to the left of cell i
! # gadd(i,.,1) modifies G below cell i
! # gadd(i,.,2) modifies G above cell i
! # fadd(:,i) modifies F to the left of cell i
! # gadd(:,i,1) modifies G below cell i
! # gadd(:,i,2) modifies G above cell i

! # The method used is specified by method(2:3):

Expand All @@ -44,7 +44,7 @@ subroutine flux2(ixy,maxm,num_eqn,num_waves,num_aux,num_ghost,mx, &
! = dt/(dy*capa(icom,j)) if method(6) = 1

! Notation:
! The jump in q (q1d(i,:)-q1d(i-1,:)) is split by rpn2 into
! The jump in q (q1d(:,i)-q1d(:,i-1)) is split by rpn2 into
! amdq = the left-going flux difference A^- Delta q
! apdq = the right-going flux difference A^+ Delta q
! Each of these is split by rpt2 into
Expand Down
4 changes: 2 additions & 2 deletions src/2d/rpn2.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ subroutine rpn2(ixy,maxm,meqn,mwaves,mbc,mx,ql,qr,auxl,auxr,
c # into leftgoing and rightgoing parts respectively.
c #
c
c # Note that the i'th Riemann problem has left state qr(i-1,:)
c # and right state ql(i,:)
c # Note that the i'th Riemann problem has left state qr(:,i-1)
c # and right state ql(:,i)
c # From the basic clawpack routines, this routine is called with ql = qr
c # maux=0 and aux arrays are unused in this example.
c
Expand Down
2 changes: 1 addition & 1 deletion src/3d/chkmth.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ subroutine chkmth(method,info)
c
implicit double precision (a-h,o-z)
c
dimension method(*)
dimension method(7)
c
info = 0
c
Expand Down
Loading