diff --git a/define_ov.f90 b/define_ov.f90 index d8bf8696305887f00e9ac7447a38f4afbfa9c867..7458f352e0488d3e83c0bc0d86dbffe4e8a55cf6 100644 --- a/define_ov.f90 +++ b/define_ov.f90 @@ -75,7 +75,8 @@ if (params%irestart.eq.0) then ov%nleaves=ioctree_number_of_elements (ov%octree,ov%noctree) ov%nnode=ov%nleaves*3 - allocate (ov%x(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%x','define_ov',size(ov%x),'dp',+1) + allocate (ov%x(ov%nnode),stat=threadinfo%err) + call heap (threadinfo,'ov%x','define_ov',size(ov%x),'dp',+1) allocate (ov%y(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%y','define_ov',size(ov%y),'dp',+1) allocate (ov%z(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%z','define_ov',size(ov%z),'dp',+1) allocate (ov%icon(8,ov%nleaves),stat=threadinfo%err) ; call heap (threadinfo,'ov%icon','define_ov',size(ov%icon),'int',+1) @@ -83,8 +84,10 @@ if (params%irestart.eq.0) then allocate (ov%vnode(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%vnode','define_ov',size(ov%vnode),'dp',+1) allocate (ov%wnode(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%wnode','define_ov',size(ov%wnode),'dp',+1) allocate (ov%temp(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%temp','define_ov',size(ov%temp),'dp',+1) - allocate (ov%temporary_nodal_pressure(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%temporary_nodal_pressure','define_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','define_ov',size(ov%whole_leaf_in_fluid),'bool',+1) + allocate (ov%temporary_nodal_pressure(ov%nnode),stat=threadinfo%err) + call heap (threadinfo,'ov%temporary_nodal_pressure','define_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','define_ov',size(ov%whole_leaf_in_fluid),'bool',+1) ov%whole_leaf_in_fluid=.false. @@ -119,8 +122,10 @@ else allocate (ov%wnode(ov%nnode),stat=err) ; if (err.ne.0) call stop_run ('Error alloc ov%wnode in define_ov$') allocate (ov%temp(ov%nnode),stat=err) ; if (err.ne.0) call stop_run ('Error alloc ov%temp in define_ov$') ! allocate (ov%pressure(ov%nleaves),stat=err) ; if (err.ne.0) call stop_run ('Error alloc ov%pressure in define_ov$') - allocate (ov%temporary_nodal_pressure(ov%nnode),stat=err) ; if (err.ne.0) call stop_run ('Error alloc ov%temp_nodal_pressure in define_ov$') - allocate (ov%whole_leaf_in_fluid(ov%nleaves),stat=err) ; if (err.ne.0) call stop_run ('Error alloc ov%whole_leaf_in_fluid in define_ov$') !=====[21082007]===== + allocate (ov%temporary_nodal_pressure(ov%nnode),stat=err) + if (err.ne.0) call stop_run ('Error alloc ov%temp_nodal_pressure in define_ov$') + allocate (ov%whole_leaf_in_fluid(ov%nleaves),stat=err) + if (err.ne.0) call stop_run ('Error alloc ov%whole_leaf_in_fluid in define_ov$') !=====[21082007]===== read (9) (ov%x(i), & ov%y(i), & ov%z(i), &