Commit 9d57ff76 authored by Sabine's avatar Sabine
Browse files

removed waterfield variable output, threshold decreased for monthly analysis

parent 574a08de
......@@ -44,9 +44,10 @@ subroutine calculate_watercycle(partnumber,itime)
real e_minus_p1(2), e_minus_pi
real precip_reference(360,180),eminusp_saved
integer ixr,jyr,idumx,idumy,istep
integer ixr,jyr,idumx,idumy,istep, watersynctime
watersynctime=3600*3 ! was loutstep before, but for monthly run not possible
! Some variables needed for temporal interpolation
!*************************************************
......@@ -63,7 +64,7 @@ subroutine calculate_watercycle(partnumber,itime)
if (partnumber.eq.-1) then
forparticle=numpart
totalparticle=0
istep=int(itime/loutstep)
istep=int(itime/watersynctime)
write(*,*) 'Model step:',istep
! open(43,file='precip_ref_input.dat',status='old')
! write(*,*) 'Reading eminusp from file'
......@@ -185,7 +186,7 @@ subroutine calculate_watercycle(partnumber,itime)
end do
qvi=(dz1*qvprof(2)+dz2*qvprof(1))*dz
if ( (mod(itage,loutstep).eq.0).and.(itage.gt.0) ) then !trajectory is loutstep after simulation start, not a new particle
if ( (mod(itage,watersynctime).eq.0).and.(itage.gt.0) ) then !trajectory is loutstep after simulation start, not a new particle
do m=1,2
indexh=memind(m)
......@@ -225,7 +226,8 @@ subroutine calculate_watercycle(partnumber,itime)
! e_minus_pi=precip_reference(ix+1,jy-90+2)*(-24.)
! First timestep and criteria fullfilled, keep it or throw it?
if ( ((diff.ge.0).or.((e_minus_pi/24).gt.-2.0)) .and. (status_q(i).eq.1) ) then
! if ( ((diff.ge.0).or.((e_minus_pi/24).gt.-2.0)) .and. (status_q(i).eq.1) ) then
if ( ((diff.ge.0).or.((e_minus_pi/24).gt.0.2)) .and. (status_q(i).eq.1) ) then
! if (status_q(i).eq.-100) then ! never! all trajectories.
! write(*,*) 'terminated: ',i,diff,e_minus_pi,itage,itramem(i),status_q(i),qvi,val_q(i),xmass1(i,1)
status_q(i)=-9 ! this particle is invalid
......@@ -247,10 +249,10 @@ subroutine calculate_watercycle(partnumber,itime)
if (nested_output.eq.1) &
call wetdepokernel_nest(1,abs(diff),centerposx,centerposy,nage,1)
endif
if (istep.lt.100) then
waterfieldp(istep,ix+1,jy+1)=waterfieldp(istep,ix+1,jy+1)+xmass1(i,1)
endif
waterfielde(ix+1,jy+1)=waterfielde(ix+1,jy+1)+xmass1(i,1)
! if (istep.lt.100) then
! waterfieldp(istep,ix+1,jy+1)=waterfieldp(istep,ix+1,jy+1)+xmass1(i,1)
! endif
! waterfielde(ix+1,jy+1)=waterfielde(ix+1,jy+1)+xmass1(i,1)
xtra1_q(i)=xtra1(i)
ytra1_q(i)=ytra1(i)
val_q(i)=qvi
......
......@@ -217,7 +217,7 @@ module par_mod
! Maximum number of particles, species, and similar
!**************************************************
integer,parameter :: maxpart=3000000
integer,parameter :: maxpart=6000000
integer,parameter :: maxspec=1
real,parameter :: minmass=0.0001
......
......@@ -760,11 +760,11 @@ subroutine timemanager(metdata_format)
if (WATERCYCLE) then
open(43,file='waterfield.dat')
write(*,*) 'Writing waterfield file'
do 76 iistep=1,100
do 76 jy=1,180
do 76 ix=1,360
76 write(43,'(2i4,2e15.3)') ix,jy,waterfieldp(iistep,ix,jy),waterfielde(ix,jy)
! write(*,*) 'Writing waterfield file'
! do 76 iistep=1,100
! do 76 jy=1,180
! do 76 ix=1,360
!76 write(43,'(2i4,2e15.3)') ix,jy,waterfieldp(iistep,ix,jy),waterfielde(ix,jy)
close(43)
close(89) ! Euler rain, water budget file
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment