From 78dcb60d65cf4697a672f33082735bb1c232a2f3 Mon Sep 17 00:00:00 2001 From: holger <holger-grosshans@gmx.de> Date: Tue, 21 Apr 2020 16:23:07 +0200 Subject: [PATCH] modified: run.sh modified: src/momentum.f90 modified: src/post.f90 modified: src/pre.f90 modified: src/pressure.f90 modified: src/var.f90 --- run.sh | 2 +- src/momentum.f90 | 2 +- src/post.f90 | 4 ++-- src/pre.f90 | 20 ++------------------ src/pressure.f90 | 2 +- src/var.f90 | 2 +- 6 files changed, 8 insertions(+), 24 deletions(-) diff --git a/run.sh b/run.sh index d24482a..0753794 100644 --- a/run.sh +++ b/run.sh @@ -1,2 +1,2 @@ mkdir -p results restart output -mpiexec -np 2 src/pafiX +mpiexec -np 3 src/pafiX diff --git a/src/momentum.f90 b/src/momentum.f90 index bd7ab96..17e394a 100644 --- a/src/momentum.f90 +++ b/src/momentum.f90 @@ -104,7 +104,7 @@ do 1 j=jmin,jmax do 1 l=lmin,lmax - if (celltype(i,j,l).ne.active) cycle +! if (celltype(i,j,l).ne.active) cycle if ((celltype(i+1,j,l).ne.wall).and.(celltype(i-1,j,l).ne.wall).and. & (celltype(i,j+1,l).ne.wall).and.(celltype(i,j-1,l).ne.wall).and. & diff --git a/src/post.f90 b/src/post.f90 index 98b450b..98b11eb 100644 --- a/src/post.f90 +++ b/src/post.f90 @@ -131,8 +131,8 @@ write(10,'(a,i10,i14,15(i10))') '#',(m,m=1,16) write(10,'(a,a10,a14,14(a10))') & '#','nt','t','dt','ucl','av(u)','av(v)','av(w)','rms(v)','rms(w)', & - 'Rec','Reb','tau_w','u_tau','Re_tau', & - 'C01','av(qp)' + 'Rec','Reb','tau_w','u_{tau}','Re_{tau}', & + 'C_{01}','av(qp)' endif write(10,'(x,i10,es14.6e2,20(es10.2e2))') & diff --git a/src/pre.f90 b/src/pre.f90 index 4fe0c22..0e8b58c 100644 --- a/src/pre.f90 +++ b/src/pre.f90 @@ -261,15 +261,7 @@ case ('p') if ((j.lt.jmin).or.(j.gt.jmax)) celltype(:,j,:)= passive case ('w','i') - if ((j.lt.jmin).and.(myid.eq.0)) then - celltype(:,j,:)= wall - elseif ((j.lt.jmin).and.(myid.ne.0)) then - celltype(:,j,:)= passive - elseif ((j.gt.jmax).and.(myid.eq.nrprocs-1)) then - celltype(:,j,:)= wall - elseif ((j.gt.jmax).and.(myid.ne.nrprocs-1)) then - celltype(:,j,:)= passive - endif + if ((j.lt.jmin).or.(j.gt.jmax)) celltype(:,j,:)= wall end select 2 enddo do 3 l=1,ll @@ -277,15 +269,7 @@ case ('p') if ((l.lt.lmin).or.(l.gt.lmax)) celltype(:,:,l)= passive case ('w','i') - if ((l.lt.lmin).and.(myid.eq.0)) then - celltype(:,:,l)= wall - elseif ((l.lt.lmin).and.(myid.ne.0)) then - celltype(:,:,l)= passive - elseif ((l.gt.lmax).and.(myid.eq.nrprocs-1)) then - celltype(:,:,l)= wall - elseif ((l.gt.lmax).and.(myid.ne.nrprocs-1)) then - celltype(:,:,l)= passive - endif + if ((l.lt.lmin).or.(l.gt.lmax)) celltype(:,:,l)= wall end select 3 enddo diff --git a/src/pressure.f90 b/src/pressure.f90 index aa11678..601e140 100644 --- a/src/pressure.f90 +++ b/src/pressure.f90 @@ -25,7 +25,7 @@ do 1 j=jmin,jmax+1 do 1 l=lmin,lmax+1 - if (celltype(i,j,l).ne.active) cycle + if (celltype(i,j,l).eq.wall) cycle h2sum=0._pr if (celltype(i+1,j,l).ne.wall) h2sum=h2sum+1._pr/(xf(i)-xf(i-1))**2 diff --git a/src/var.f90 b/src/var.f90 index 576046c..d660a18 100644 --- a/src/var.f90 +++ b/src/var.f90 @@ -15,7 +15,7 @@ real(kind=pr), parameter :: & eps_el= 8.85e-12_pr, & !< permittivity vacuum/air pi= 4._pr*atan(1._pr), & - tol= 1.e-2_pr, & !< factor by which L2 shall decrease + tol= 1.e-2_pr, & !< factor by which L2 shall decrease urfu= .25_pr, & !< under relaxation factor variable u urfv= urfu, & urfw= urfv, & -- GitLab