Skip to content
Snippets Groups Projects
Commit e11db73f authored by Dave Whipp's avatar Dave Whipp
Browse files

added read in of eviscosity and is_plastic

parent 7a36e914
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 5 deletions
src/define_ov.f90
+ 4
− 5
View file @ e11db73f
...@@ -49,7 +49,7 @@ type (thread) threadinfo ...@@ -49,7 +49,7 @@ type (thread) threadinfo
integer iproc, nproc, err, ierr, levelv integer iproc, nproc, err, ierr, levelv
integer nface, nlsf, i, j, k, np, kfix integer nface, nlsf, i, j, k, np, kfix
double precision s,e2d,xlsf,crit double precision s,e2d,xlsf,crit,wpreiso,evisc,is_plas
integer ioctree_number_of_elements integer ioctree_number_of_elements
external ioctree_number_of_elements external ioctree_number_of_elements
double precision current_time,activation_time double precision current_time,activation_time
...@@ -94,7 +94,6 @@ if (params%irestart.eq.0) then ...@@ -94,7 +94,6 @@ 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%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%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%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%wpreiso),'dp',+1)
allocate (ov%temp(ov%nnode),stat=threadinfo%err) ; call heap (threadinfo,'ov%temp','define_ov',size(ov%temp),'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 ! 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) allocate (ov%pressure(ov%nleaves),stat=threadinfo%err) ; call heap (threadinfo,'ov%pressure','define_ov',size(ov%pressure),'dp',+1)
...@@ -107,7 +106,6 @@ if (params%irestart.eq.0) then ...@@ -107,7 +106,6 @@ if (params%irestart.eq.0) then
ov%unode=0.d0 ov%unode=0.d0
ov%vnode=0.d0 ov%vnode=0.d0
ov%wnode=0.d0 ov%wnode=0.d0
ov%wpreiso=0.d0
! Line below uncommented by dwhipp - 12/09 ! Line below uncommented by dwhipp - 12/09
ov%pressure=0.d0 ov%pressure=0.d0
! Line below added by dwhipp - 12/09 ! Line below added by dwhipp - 12/09
...@@ -133,7 +131,6 @@ else ...@@ -133,7 +131,6 @@ else
allocate (ov%unode(ov%nnode),stat=err) ; if (err.ne.0) call stop_run ('Error alloc ov%unode in define_ov$') allocate (ov%unode(ov%nnode),stat=err) ; if (err.ne.0) call stop_run ('Error alloc ov%unode in define_ov$')
allocate (ov%vnode(ov%nnode),stat=err) ; if (err.ne.0) call stop_run ('Error alloc ov%vnode in define_ov$') allocate (ov%vnode(ov%nnode),stat=err) ; if (err.ne.0) call stop_run ('Error alloc ov%vnode in define_ov$')
allocate (ov%wnode(ov%nnode),stat=err) ; if (err.ne.0) call stop_run ('Error alloc ov%wnode in define_ov$') 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%temp(ov%nnode),stat=err) ; if (err.ne.0) call stop_run ('Error alloc ov%temp in define_ov$')
! Line below uncommented by dwhipp - 12/09 ! 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$') allocate (ov%pressure(ov%nleaves),stat=err) ; if (err.ne.0) call stop_run ('Error alloc ov%pressure in define_ov$')
...@@ -149,7 +146,7 @@ else ...@@ -149,7 +146,7 @@ else
ov%unode(i), & ov%unode(i), &
ov%vnode(i), & ov%vnode(i), &
ov%wnode(i), & ov%wnode(i), &
ov%wpreiso(i), & wpreiso, &
(xlsf,j=1,nlsf), & (xlsf,j=1,nlsf), &
ov%temp(i), & ov%temp(i), &
ov%temporary_nodal_pressure(i), & ov%temporary_nodal_pressure(i), &
...@@ -166,6 +163,8 @@ else ...@@ -166,6 +163,8 @@ else
ov%spressure(i), & ov%spressure(i), &
crit, & crit, &
e2d, & e2d, &
evisc, &
is_plas, &
ov%whole_leaf_in_fluid(i),& ov%whole_leaf_in_fluid(i),&
i=1,ov%nleaves) i=1,ov%nleaves)
read (9) (ov%octree(i),i=1,ov%octree(3)) read (9) (ov%octree(i),i=1,ov%octree(3))
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment