From 81ed1b8e5aef3b24328b6f61593990d21477e414 Mon Sep 17 00:00:00 2001 From: Douglas Guptill <douglas.guptill@dal.ca> Date: Mon, 20 Jul 2009 04:01:21 +0000 Subject: [PATCH] octree_interpolate_many -> octree_interpolate_threeoctree_interpolate_three --- interpolate_velocity_on_surface.f90 | 2 +- move_cloud.f90 | 2 +- update_cloud_fields.f90 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interpolate_velocity_on_surface.f90 b/interpolate_velocity_on_surface.f90 index bfacbb48..2c9fb8cc 100644 --- a/interpolate_velocity_on_surface.f90 +++ b/interpolate_velocity_on_surface.f90 @@ -65,7 +65,7 @@ do is=1,params%ns yi=surface(is)%y(i) zi=surface(is)%z(i) - call octree_interpolate_many (3,ov%octree,ov%noctree,ov%icon,ov%nleaves, & + call octree_interpolate_three (3,ov%octree,ov%noctree,ov%icon,ov%nleaves, & ov%nnode,xi,yi,zi,ov%unode,u,ov%vnode,v,ov%wnode,w) ! call octree_interpolate3 (ov%octree,ov%noctree,ov%icon,ov%nleaves,ov%unode,ov%x,ov%y,ov%z,ov%nnode,xi,yi,zi,u) ! call octree_interpolate3 (ov%octree,ov%noctree,ov%icon,ov%nleaves,ov%vnode,ov%x,ov%y,ov%z,ov%nnode,xi,yi,zi,v) diff --git a/move_cloud.f90 b/move_cloud.f90 index 7fb1f8a0..90e7bf04 100644 --- a/move_cloud.f90 +++ b/move_cloud.f90 @@ -87,7 +87,7 @@ do i=1+iproc,cl%np,nproc xi=(x0+x)/2.d0 yi=(y0+y)/2.d0 zi=(z0+z)/2.d0 - call octree_interpolate_many(3,ov%octree,ov%noctree,ov%icon,ov%nleaves,ov%nnode,xi,yi,zi,ov%unode,u,ov%vnode,v,ov%wnode,w) + call octree_interpolate_three(3,ov%octree,ov%noctree,ov%icon,ov%nleaves,ov%nnode,xi,yi,zi,ov%unode,u,ov%vnode,v,ov%wnode,w) ! call octree_interpolate3 (ov%octree,ov%noctree,ov%icon,ov%nleaves,ov%unode,ov%x,ov%y,ov%z,ov%nnode,xi,yi,zi,u) ! call octree_interpolate3 (ov%octree,ov%noctree,ov%icon,ov%nleaves,ov%vnode,ov%x,ov%y,ov%z,ov%nnode,xi,yi,zi,v) ! call octree_interpolate3 (ov%octree,ov%noctree,ov%icon,ov%nleaves,ov%wnode,ov%x,ov%y,ov%z,ov%nnode,xi,yi,zi,w) diff --git a/update_cloud_fields.f90 b/update_cloud_fields.f90 index 5f4ac7b8..fde91a8d 100644 --- a/update_cloud_fields.f90 +++ b/update_cloud_fields.f90 @@ -188,7 +188,7 @@ temp=0.d0 press=0.d0 do k=1+iproc,cl%np,nproc - call octree_interpolate_many (3,ov%octree,ov%noctree,ov%icon, & + call octree_interpolate_three (3,ov%octree,ov%noctree,ov%icon, & ov%nleaves,ov%nnode, & cl%x(k),cl%y(k),cl%z(k), & lsf,lsf0(k), & -- GitLab