diff --git a/interpolate_ov_on_osolve.f90 b/interpolate_ov_on_osolve.f90 index 783ed5363be21fffad9499a17f47c2e393300367..b91d186db6f837e9a08ac635626777a43d232ba8 100644 --- a/interpolate_ov_on_osolve.f90 +++ b/interpolate_ov_on_osolve.f90 @@ -127,7 +127,9 @@ enddo !enddo -if (params%debug>=1 .and. iproc.eq.0) write(*,'(a,2e11.4)') shift//'ov%pressure: ',minval(ov%temporary_nodal_pressure),maxval(ov%temporary_nodal_pressure) +if (params%debug>=1 .and. iproc.eq.0) then + write(*,'(a,2e11.4)') shift//'ov%pressure: ',minval(ov%temporary_nodal_pressure),maxval(ov%temporary_nodal_pressure) +endif osolve%u=0.d0 osolve%v=0.d0 @@ -160,7 +162,9 @@ enddo osolve%spressure=osolve%pressure -if (params%debug>=1 .and. iproc.eq.0) write(*,'(a,2e11.4)') shift//'osolve%pressure: ',minval(osolve%pressure),maxval(osolve%pressure) +if (params%debug>=1 .and. iproc.eq.0) then + write(*,'(a,2e11.4)') shift//'osolve%pressure: ',minval(osolve%pressure),maxval(osolve%pressure) +endif deallocate (pressure) deallocate (pressurep) @@ -181,24 +185,34 @@ call heap (threadinfo,'ov%vnode','interpolate_ov...',size(ov%vnode),'dp',-1) call heap (threadinfo,'ov%wnode','interpolate_ov...',size(ov%wnode),'dp',-1) ; deallocate (ov%wnode) call heap (threadinfo,'ov%temp','interpolate_ov...',size(ov%temp),'dp',-1) ; deallocate (ov%temp) call heap (threadinfo,'ov%icon','interpolate_ov...',size(ov%icon),'int',-1) ; deallocate (ov%icon) -call heap (threadinfo,'ov%temporary...','interpolate_ov...',size(ov%temporary_nodal_pressure),'dp',-1) ; deallocate (ov%temporary_nodal_pressure) -call heap (threadinfo,'ov%whole_leaf...','interpolate_ov...',size(ov%whole_leaf_in_fluid),'bool',-1) ; deallocate (ov%whole_leaf_in_fluid) +call heap (threadinfo,'ov%temporary...','interpolate_ov...',size(ov%temporary_nodal_pressure),'dp',-1) +deallocate (ov%temporary_nodal_pressure) +call heap (threadinfo,'ov%whole_leaf...','interpolate_ov...',size(ov%whole_leaf_in_fluid),'bool',-1) +deallocate (ov%whole_leaf_in_fluid) ov%noctree=osolve%noctree ov%nleaves=osolve%nleaves ov%nnode=osolve%nnode - allocate (ov%octree(ov%noctree),stat=threadinfo%err) ; call heap (threadinfo,'ov%octree','interpolate_ov...',size(ov%octree),'int',+1) - allocate (ov%icon(8,ov%nleaves),stat=threadinfo%err) ; call heap (threadinfo,'ov%icon','interpolate_ov...',size(ov%icon),'int',+1) + allocate (ov%octree(ov%noctree),stat=threadinfo%err) + call heap (threadinfo,'ov%octree','interpolate_ov...',size(ov%octree),'int',+1) + allocate (ov%icon(8,ov%nleaves),stat=threadinfo%err) + call heap (threadinfo,'ov%icon','interpolate_ov...',size(ov%icon),'int',+1) allocate (ov%x(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%x','interpolate_ov...',size(ov%x),'dp',+1) allocate (ov%y(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%y','interpolate_ov...',size(ov%y),'dp',+1) allocate (ov%z(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%z','interpolate_ov...',size(ov%z),'dp',+1) - allocate (ov%unode(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%unode','interpolate_ov...',size(ov%unode),'dp',+1) - allocate (ov%vnode(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%vnode','interpolate_ov...',size(ov%vnode),'dp',+1) - allocate (ov%wnode(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%wnode','interpolate_ov...',size(ov%wnode),'dp',+1) - allocate (ov%temp(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%temp','interpolate_ov...',size(ov%temp),'dp',+1) - allocate (ov%temporary_nodal_pressure(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%temporary_nodal_pressure','interpolate_ov...',size(ov%temporary_nodal_pressure),'dp',+1) - allocate (ov%whole_leaf_in_fluid(ov%nleaves),stat=threadinfo%err) ; call heap (threadinfo,'ov%whole_leaf_in_fluid','interpolate_ov...',size(ov%whole_leaf_in_fluid),'bool',+1) + allocate (ov%unode(ov%nnode),stat=threadinfo%err) + call heap (threadinfo,'ov%unode','interpolate_ov...',size(ov%unode),'dp',+1) + allocate (ov%vnode(ov%nnode),stat=threadinfo%err) + call heap (threadinfo,'ov%vnode','interpolate_ov...',size(ov%vnode),'dp',+1) + allocate (ov%wnode(ov%nnode),stat=threadinfo%err) + call heap (threadinfo,'ov%wnode','interpolate_ov...',size(ov%wnode),'dp',+1) + allocate (ov%temp(ov%nnode),stat=threadinfo%err) + call heap (threadinfo,'ov%temp','interpolate_ov...',size(ov%temp),'dp',+1) + allocate (ov%temporary_nodal_pressure(ov%nnode),stat=threadinfo%err) + call heap (threadinfo,'ov%temporary_nodal_pressure','interpolate_ov...',size(ov%temporary_nodal_pressure),'dp',+1) + allocate (ov%whole_leaf_in_fluid(ov%nleaves),stat=threadinfo%err) + call heap (threadinfo,'ov%whole_leaf_in_fluid','interpolate_ov...',size(ov%whole_leaf_in_fluid),'bool',+1) !allocate (ov%octree(ov%noctree),stat=err) ; if (err.ne.0) call stop_run ('Error alloc ov%octree in main$')