From f25ad274d69b6e52a8f6ef004d674cc7b275d4bc Mon Sep 17 00:00:00 2001 From: HartmutBorth <hartmut.borth@uni-hamburg.de> Date: Tue, 15 Nov 2016 16:55:42 +0100 Subject: [PATCH] modified simulations --- cat/dat/sim_0051.nl | 2 +- cat/dat/sim_0052.nl | 2 +- cat/dat/sim_0053.nl | 12 ++++++++++++ cat/dat/sim_0061.nl | 2 +- cat/dat/sim_0062.nl | 2 +- cat/src/simmod.f90 | 37 +++++++++++++++++++++---------------- 6 files changed, 37 insertions(+), 20 deletions(-) create mode 100644 cat/dat/sim_0053.nl diff --git a/cat/dat/sim_0051.nl b/cat/dat/sim_0051.nl index 570a430..77274c7 100644 --- a/cat/dat/sim_0051.nl +++ b/cat/dat/sim_0051.nl @@ -2,7 +2,7 @@ ysim = "fjet01" w1 = 8 w2 = 2 - scl = 1 + hscl = 1 qmax = 0.00001 snsteps = 2000000 sdt = 1.0d-3 diff --git a/cat/dat/sim_0052.nl b/cat/dat/sim_0052.nl index cbdc904..79abeea 100644 --- a/cat/dat/sim_0052.nl +++ b/cat/dat/sim_0052.nl @@ -2,7 +2,7 @@ ysim = "fjet01" w1 = 8 w2 = 2 - scl = 1 + hscl = 1 qmax = 0.00001 snsteps = 2000000 sdt = 1.0d-3 diff --git a/cat/dat/sim_0053.nl b/cat/dat/sim_0053.nl new file mode 100644 index 0000000..200d943 --- /dev/null +++ b/cat/dat/sim_0053.nl @@ -0,0 +1,12 @@ + $sim_nl + ysim = "fjet01" + w1 = 8 + w2 = 2 + hscl = 1 + qmax = 0.00001 + snsteps = 2000000 + sdt = 1.0d-3 + sngui = 250 + snforc = 1 + snpert = 5 + / diff --git a/cat/dat/sim_0061.nl b/cat/dat/sim_0061.nl index 8307319..096f1e5 100644 --- a/cat/dat/sim_0061.nl +++ b/cat/dat/sim_0061.nl @@ -2,7 +2,7 @@ ysim = "fjet02" w1 = 8 w2 = 2 - scl = 1 + hscl = 1 qmax = 0.00001 snsteps = 2000000 sdt = 1.0d-3 diff --git a/cat/dat/sim_0062.nl b/cat/dat/sim_0062.nl index 0ac6730..5ff17f4 100644 --- a/cat/dat/sim_0062.nl +++ b/cat/dat/sim_0062.nl @@ -2,7 +2,7 @@ ysim = "fjet02" w1 = 8 w2 = 2 - scl = 1 + hscl = 1 qmax = 0.00001 snsteps = 2000000 sdt = 1.0d-3 diff --git a/cat/src/simmod.f90 b/cat/src/simmod.f90 index 9d2bf13..62b2b35 100644 --- a/cat/src/simmod.f90 +++ b/cat/src/simmod.f90 @@ -36,7 +36,7 @@ character (256) :: ysim = "djet01" ! type of predefined simulation !--- parameters of djet01 (initial top hat jet) integer :: w1 = 8 ! half width of jet center (in grid points) integer :: w2 = 4 ! width of vortex sheet (in grid points) -integer :: scl = 1 ! horizontal scale of jet +integer :: hscl = 1 ! horizontal scale of jet real(8) :: qmax = 1.0 ! amplitude of vortex sheets @@ -83,7 +83,7 @@ implicit none !--- define sim_namelist namelist /sim_nl/ ysim , & - qmax ,w1 ,w2 ,scl ,& + qmax ,w1 ,w2 ,hscl ,& sdt ,snsteps ,sngui , & snpert ,snforc ,snpost @@ -131,12 +131,12 @@ select case(ysim) case("djet01") gpvar(:,:) = 0.0 do jy = 1, ngy - if ( jy .ge. ngy/2+1-scl*(w1+w2) .and. & - jy .le. ngy/2-scl*w1 ) then + if ( jy .ge. ngy/2+1-hscl*(w1+w2) .and. & + jy .le. ngy/2-hscl*w1 ) then gpvar(:,jy) = -qmax endif - if ( jy .ge. ngy/2+1+scl*w1 .and. & - jy .le. ngy/2+scl*(w1+w2) ) then + if ( jy .ge. ngy/2+1+hscl*w1 .and. & + jy .le. ngy/2+hscl*(w1+w2) ) then gpvar(:,jy) = qmax endif enddo @@ -150,12 +150,12 @@ select case(ysim) case("fjet01") gpvar(:,:) = 0.0 do jy = 1, ngy - if ( jy .ge. ngy/2+1-scl*(w1+w2) .and. & - jy .le. ngy/2-scl*w1 ) then + if ( jy .ge. ngy/2+1-hscl*(w1+w2) .and. & + jy .le. ngy/2-hscl*w1 ) then gpvar(:,jy) = -qmax endif - if ( jy .ge. ngy/2+1+scl*w1 .and. & - jy .le. ngy/2+scl*(w1+w2) ) then + if ( jy .ge. ngy/2+1+hscl*w1 .and. & + jy .le. ngy/2+hscl*(w1+w2) ) then gpvar(:,jy) = qmax endif enddo @@ -164,14 +164,14 @@ select case(ysim) case("fjet02") gpvar(:,:) = 0.0 do jx = 1, ngx - if ( jx .ge. ngx/2+1-scl*(w1+w2) .and. & - jx .le. ngx/2-scl*w1 ) then - gpvar(jx,:) = qmax - endif - if ( jx .ge. ngx/2+1+scl*w1 .and. & - jx .le. ngx/2+scl*(w1+w2) ) then + if ( jx .ge. ngx/2+1-hscl*(w1+w2) .and. & + jx .le. ngx/2-hscl*w1 ) then gpvar(jx,:) = -qmax endif + if ( jx .ge. ngx/2+1+hscl*w1 .and. & + jx .le. ngx/2+hscl*(w1+w2) ) then + gpvar(jx,:) = qmax + endif enddo call sim_wrtgp(gpvar,qfrccde,1) case default @@ -262,6 +262,11 @@ subroutine simstep use simmod implicit none + + + + + return end subroutine simstep -- GitLab