diff --git a/DOUAR.f90 b/DOUAR.f90 index 3e330c0b520f1509c44cf9f012965827645c604a..d487b0eda1bbb295e07942bf1a46e669c52186be 100644 --- a/DOUAR.f90 +++ b/DOUAR.f90 @@ -415,15 +415,15 @@ do while (istep.le.params%nstep) if (iproc.eq.0) write (8,*) osolve%nleaves,' leaves in solve octree ' allocate (osolve%icon(8,osolve%nleaves),stat=threadinfo%err) - call heap (threadinfo,'osolve%icon','main',size(osolve%icon),'int',+1) + call heap (threadinfo,'osolve%icon','main',size(osolve%icon),'int',+1) allocate (osolve%x(osolve%nnode),stat=threadinfo%err) - call heap (threadinfo,'osolve%x', 'main',size(osolve%x),'dp',+1) + call heap (threadinfo,'osolve%x', 'main',size(osolve%x),'dp',+1) allocate (osolve%y(osolve%nnode),stat=threadinfo%err) - call heap (threadinfo,'osolve%y', 'main',size(osolve%y),'dp',+1) + call heap (threadinfo,'osolve%y', 'main',size(osolve%y),'dp',+1) allocate (osolve%z(osolve%nnode),stat=threadinfo%err) - call heap (threadinfo,'osolve%z', 'main',size(osolve%z),'dp',+1) + call heap (threadinfo,'osolve%z', 'main',size(osolve%z),'dp',+1) allocate (osolve%lsf(osolve%nnode,osolve%nlsf),stat=threadinfo%err) - call heap (threadinfo,'osolve%lsf', 'main',size(osolve%lsf),'dp',+1) + call heap (threadinfo,'osolve%lsf', 'main',size(osolve%lsf),'dp',+1) osolve%lsf=0.d0 call octree_find_node_connectivity (osolve%octree,osolve%noctree, & @@ -432,9 +432,10 @@ do while (istep.le.params%nstep) ! osolve%nnode has been changed by octree_find_node_connectivity. ! re-size x, y, z write(threadinfo%logunit,*) 'Before shrink, x,y,z sizes are', size(osolve%x), size(osolve%y), size(osolve%z) - call shrink_dp_pointer_array(threadinfo, osolve%x, osolve%nnode) - call shrink_dp_pointer_array(threadinfo, osolve%y, osolve%nnode) - call shrink_dp_pointer_array(threadinfo, osolve%z, osolve%nnode) + call octreesolve_shrink_xyz(threadinfo, osolve, osolve%nnode) + !call shrink_dp_pointer_array(threadinfo, osolve%x, osolve%nnode) + !call shrink_dp_pointer_array(threadinfo, osolve%y, osolve%nnode) + !call shrink_dp_pointer_array(threadinfo, osolve%z, osolve%nnode) write(threadinfo%logunit,*) 'After shrink, x,y,z sizes are', size(osolve%x), size(osolve%y), size(osolve%z) ! resize lsf call heap (threadinfo,'osolve%lsf', 'main',size(osolve%lsf),'dp',-1)