Commit ddaeb130 authored by Sabine's avatar Sabine
Browse files

added info about step and precip. thres in logfile

parent 66ea1877
...@@ -41,18 +41,18 @@ subroutine calculate_watercycle(partnumber,itime) ...@@ -41,18 +41,18 @@ subroutine calculate_watercycle(partnumber,itime)
real :: dt1,dt2,dtt,ddx,ddy,rddx,rddy,p1,p2,p3,p4,xtn,ytn real :: dt1,dt2,dtt,ddx,ddy,rddx,rddy,p1,p2,p3,p4,xtn,ytn
real centerposx_real, centerposy_real, centerposx, centerposy, diff, xl(2), yl(2) real centerposx_real, centerposy_real, centerposx, centerposy, diff, xl(2), yl(2)
real qv1(2),qvprof(2),qvi,dz,dz1,dz2 real qv1(2),qvprof(2),qvi,dz,dz1,dz2
real e_minus_p1(2), e_minus_pi real e_minus_p1(2), e_minus_pi, threshold
real precip_reference(360,180),eminusp_saved, waterthreshold real precip_reference(360,180),eminusp_saved
integer ixr,jyr,idumx,idumy,istep, watersynctime integer ixr,jyr,idumx,idumy,istep, watersynctime
watersynctime=3600*3 ! was loutstep before, but for monthly run not possible watersynctime=3600*3 ! was loutstep before, but for monthly run not possible
waterthreshold=-.1 ! watersynctime=3600
! watersynctime=3600 ! watersynctime=loutstep
! watersynctime=loutstep threshold = -.5
if ((partnumber.eq.1).and.(itime.eq.0)) write(*,*) 'Watersynctime ',watersynctime,lsynctime,waterthreshold if ((partnumber.eq.1).and.(itime.eq.0)) write(*,*) 'Watersynctime ',watersynctime,lsynctime, ', threshold: ',threshold
! Some variables needed for temporal interpolation ! Some variables needed for temporal interpolation
!************************************************* !*************************************************
...@@ -70,7 +70,7 @@ subroutine calculate_watercycle(partnumber,itime) ...@@ -70,7 +70,7 @@ subroutine calculate_watercycle(partnumber,itime)
forparticle=numpart forparticle=numpart
totalparticle=0 totalparticle=0
istep=int(itime/watersynctime) istep=int(itime/watersynctime)
write(*,*) 'Model step:',istep ! write(*,*) 'Model step:',istep
! open(43,file='precip_ref_input.dat',status='old') ! open(43,file='precip_ref_input.dat',status='old')
! write(*,*) 'Reading eminusp from file' ! write(*,*) 'Reading eminusp from file'
! do 75 jyr=1,90 ! do 75 jyr=1,90
...@@ -231,7 +231,7 @@ subroutine calculate_watercycle(partnumber,itime) ...@@ -231,7 +231,7 @@ subroutine calculate_watercycle(partnumber,itime)
! e_minus_pi=precip_reference(ix+1,jy-90+2)*(-24.) ! e_minus_pi=precip_reference(ix+1,jy-90+2)*(-24.)
! First timestep and criteria fullfilled, keep it or throw it? ! First timestep and criteria fullfilled, keep it or throw it?
if ( ((diff.ge.0).or.((e_minus_pi/24).gt.waterthreshold)) .and. (status_q(i).eq.1) ) then if ( ((diff.ge.0).or.((e_minus_pi/24).gt.threshold)) .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.-2.0)) .and. (status_q(i).eq.1) ) then
! if ( ((diff.ge.0)) .and. (status_q(i).eq.1) ) then ! if ( ((diff.ge.0)) .and. (status_q(i).eq.1) ) then
! if (status_q(i).eq.-100) then ! never! all trajectories. ! if (status_q(i).eq.-100) then ! never! all trajectories.
...@@ -279,7 +279,7 @@ subroutine calculate_watercycle(partnumber,itime) ...@@ -279,7 +279,7 @@ subroutine calculate_watercycle(partnumber,itime)
end do end do
if ((partnumber.eq.-1).and.(totalparticle.gt.0)) then if ((partnumber.eq.-1).and.(totalparticle.gt.0)) then
write (*,*) 'calculated watercycle, ',totalparticle,numpart,partnumber,forparticle,itime ! write (*,*) 'calculated watercycle, ',totalparticle,numpart,partnumber,forparticle,itime
endif endif
......
Markdown is supported
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