Commit 7999df47 authored by Espen Sollum's avatar Espen Sollum
Browse files

For parallel domain-filling version, changed info written to screen more...

For parallel domain-filling version, changed info written to screen more consistent with serial version
parent 9b53903c
......@@ -588,11 +588,13 @@ subroutine boundcond_domainfill(itime,loutend)
! :TODO: eso parallelize
if ((ipout.gt.0).and.(itime.eq.loutend)) then
open(unitboundcond,file=path(2)(1:length(2))//'boundcond.bin', &
form='unformatted')
write(unitboundcond) numcolumn_we,numcolumn_sn, &
zcolumn_we,zcolumn_sn,acc_mass_we,acc_mass_sn
close(unitboundcond)
if (lroot) then
open(unitboundcond,file=path(2)(1:length(2))//'boundcond.bin', &
form='unformatted')
write(unitboundcond) numcolumn_we,numcolumn_sn, &
zcolumn_we,zcolumn_sn,acc_mass_we,acc_mass_sn
close(unitboundcond)
end if
endif
end subroutine boundcond_domainfill
......@@ -292,11 +292,6 @@ subroutine init_domainfill
end do
end do
write(*,*) 'init_domainfill> ncolumn: ', ncolumn
write(*,*) 'init_domainfill> numcolumn: ', numcolumn
write(*,*) 'init_domainfill> ny_sn(1),ny_sn(2): ', ny_sn(1),ny_sn(2)
write(*,*) 'init_domainfill> nx_we(1),nx_we(2): ', nx_we(1),nx_we(2)
! Check whether numpart is really smaller than maxpart
!*****************************************************
......
......@@ -180,7 +180,7 @@ subroutine init_domainfill
do jy=ny_sn(1),ny_sn(2) ! loop about latitudes
ylat=ylat0+real(jy)*dy
do ix=nx_we(1),nx_we(2) ! loop about longitudes
ncolumn=nint(0.999*real(npart(1))*colmass(ix,jy)/ &
ncolumn=nint(0.999*real(npart(1)/mp_partgroup_np)*colmass(ix,jy)/ &
colmasstotal)
if (ncolumn.eq.0) goto 30
if (ncolumn.gt.numcolumn) numcolumn=ncolumn
......@@ -340,14 +340,14 @@ subroutine init_domainfill
!****************************************************************************
fractus=real(numcolumn)/real(nz)
write(*,*) 'Total number of particles at model start: ',numpart
write(*,*) 'Maximum number of particles per column: ',numcolumn
write(*,*) 'If ',fractus,' <1, better use more particles'
write(*,*) 'Total number of particles at model start: ',numpart*mp_partgroup_np
write(*,*) 'Maximum number of particles per column: ',numcolumn*mp_partgroup_np
write(*,*) 'If ',fractus*mp_partgroup_np,' <1, better use more particles'
fractus=sqrt(max(fractus,1.))/2.
do jy=ny_sn(1),ny_sn(2) ! loop about latitudes
do ix=nx_we(1),nx_we(2) ! loop about longitudes
ncolumn=nint(0.999/fractus*real(npart(1))*colmass(ix,jy) &
ncolumn=nint(0.999/fractus*real(npart(1)/mp_partgroup_np)*colmass(ix,jy) &
/colmasstotal)
if (ncolumn.gt.maxcolumn) stop 'maxcolumn too small'
if (ncolumn.eq.0) goto 80
......
......@@ -117,11 +117,6 @@ subroutine timemanager
real(dep_prec) :: drygridtotalunc,wetgridtotalunc,drydeposit(maxspec)
real :: xold,yold,zold,xmassfract
real, parameter :: e_inv = 1.0/exp(1.0)
!double precision xm(maxspec,maxpointspec_act),
! + xm_depw(maxspec,maxpointspec_act),
! + xm_depd(maxspec,maxpointspec_act)
!open(88,file='TEST.dat')
! Measure time spent in timemanager
if (mp_measure_time) call mpif_mtime('timemanager',0)
......
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