Skip to content

Commit

Permalink
Remove experimental kappa scheme iadv=77
Browse files Browse the repository at this point in the history
which is now redundant. The non-uniform grid support has been
merged into the main kappa scheme.
  • Loading branch information
fjansson committed Oct 6, 2020
1 parent 20b27f8 commit d088437
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 238 deletions.
228 changes: 0 additions & 228 deletions src/advec_kappa_f.f90

This file was deleted.

10 changes: 1 addition & 9 deletions src/advection.f90
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
subroutine advection

use modglobal, only : lmoist, nsv, iadv_mom,iadv_tke,iadv_thl,iadv_qt,iadv_sv, &
iadv_cd2,iadv_5th,iadv_52,iadv_cd6,iadv_62,iadv_kappa,iadv_upw,iadv_hybrid,iadv_hybrid_f,iadv_kappa_f,iadv_null,leq
iadv_cd2,iadv_5th,iadv_52,iadv_cd6,iadv_62,iadv_kappa,iadv_upw,iadv_hybrid,iadv_hybrid_f,iadv_null,leq
use modfields, only : u0,up,v0,vp,w0,wp,e120,e12p,thl0,thlp,qt0,qtp,sv0,svp
use modsubgrid, only : lsmagorinsky
use advec_hybrid, only : advecc_hybrid
Expand Down Expand Up @@ -95,8 +95,6 @@ subroutine advection
call advecc_62(e120,e12p)
case(iadv_kappa)
call advecc_kappa(e120,e12p)
case(iadv_kappa_f)
call advecc_kappa_f(e120,e12p)
case(iadv_hybrid)
!if (.not. leq) stop "advec_hybrid does not support a non-uniform vertical grid."
call advecc_hybrid(e120,e12p)
Expand Down Expand Up @@ -126,8 +124,6 @@ subroutine advection
call advecc_62(thl0,thlp)
case(iadv_kappa)
call advecc_kappa(thl0,thlp)
case(iadv_kappa_f)
call advecc_kappa_f(thl0,thlp)
case(iadv_upw)
if (.not. leq) stop "advec_upw does not support a non-uniform vertical grid."
call advecc_upw(thl0,thlp)
Expand Down Expand Up @@ -159,8 +155,6 @@ subroutine advection
call advecc_62(qt0,qtp)
case(iadv_kappa)
call advecc_kappa(qt0,qtp)
case(iadv_kappa_f)
call advecc_kappa_f(qt0,qtp)
case(iadv_upw)
if (.not. leq) stop "advec_upw does not support a non-uniform vertical grid."
call advecc_upw(qt0,qtp)
Expand Down Expand Up @@ -193,8 +187,6 @@ subroutine advection
call advecc_62(sv0(:,:,:,n),svp(:,:,:,n))
case(iadv_kappa)
call advecc_kappa(sv0(:,:,:,n),svp(:,:,:,n))
case(iadv_kappa_f)
call advecc_kappa_f(sv0(:,:,:,n),svp(:,:,:,n))
case(iadv_upw)
if (.not. leq) stop "advec_upw does not support a non-uniform vertical grid."
call advecc_upw(sv0(:,:,:,n),svp(:,:,:,n))
Expand Down
1 change: 0 additions & 1 deletion src/modglobal.f90
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ module modglobal
integer, parameter :: iadv_62 = 62
integer, parameter :: iadv_52 = 52
integer, parameter :: iadv_kappa = 7
integer, parameter :: iadv_kappa_f = 77
integer, parameter :: iadv_hybrid = 55
integer, parameter :: iadv_hybrid_f = 555

Expand Down

0 comments on commit d088437

Please sign in to comment.