diff --git a/src/define_ov.f90 b/src/define_ov.f90 index 9e16db12def1d74d2c11683dae033d2811e4f649..6c0d7f6a022b6c406ac220725f9f483d5e8470b2 100644 --- a/src/define_ov.f90 +++ b/src/define_ov.f90 @@ -94,8 +94,12 @@ if (params%irestart.eq.0) then allocate (ov%unode(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%unode','define_ov',size(ov%unode),'dp',+1) 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%wpreiso(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%wpreiso','define_ov',size(ov%wnode),'dp',+1) + allocate (ov%wpreiso(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%wpreiso','define_ov',size(ov%wpreiso),'dp',+1) allocate (ov%temp(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%temp','define_ov',size(ov%temp),'dp',+1) + ! Line below added by dwhipp - 12/09 + allocate (ov%pressure(ov%nleaves),stat=threadinfo%err) ; call heap (threadinfo,'ov%pressure',define_ov',size(ov%pressure),'dp',+1) + ! Line below added by dwhipp - 12/09 + allocate (ov%spressure(ov%nleaves),stat=threadinfo%err) ; call heap (threadinfo,'ov%spressure',define_ov',size(ov%spressure),'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) @@ -104,7 +108,10 @@ if (params%irestart.eq.0) then ov%vnode=0.d0 ov%wnode=0.d0 ov%wpreiso=0.d0 -! ov%pressure=0.d0 + ! Line below uncommented by dwhipp - 12/09 + ov%pressure=0.d0 + ! Line below added by dwhipp - 12/09 + ov%spressure=0.d0 ov%temporary_nodal_pressure=0.d0 call initialize_temperature (ov,params%ztemp) if (iproc.eq.0) write(8,*) ov%nnode,' nodes in initial velocity octree' @@ -128,7 +135,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%wpreiso(ov%nnode),stat=err) ; if (err.ne.0) call stop_run ('Error alloc ov%wpreiso 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$') + ! Line below uncommented by dwhipp - 12/09 + allocate (ov%pressure(ov%nleaves),stat=err) ; if (err.ne.0) call stop_run ('Error alloc ov%pressure in define_ov$') + ! Line below added by dwhipp - 12/09 + allocate (ov%spressure(ov%nleaves),stat=err) ; if (err.ne.0) call stop_run ('Error alloc ov%spressure 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) @@ -150,7 +160,10 @@ else kfix, & i=1,ov%nnode) read (9) ((ov%icon(k,i),k=1,8), & -! ov%pressure(i), & + ! Line below uncommented by dwhipp - 12/09 + ov%pressure(i), & + ! Line below added by dwhipp - 12/09 + ov%spressure(i), & crit, & e2d, & ov%whole_leaf_in_fluid(i),&