From e11db73f17032f98d998e1031b0f6e05c318bcba Mon Sep 17 00:00:00 2001
From: Dave Whipp <dwhipp@dal.ca>
Date: Mon, 21 Dec 2009 18:40:05 +0000
Subject: [PATCH] added read in of eviscosity and is_plastic
---
src/define_ov.f90 | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/define_ov.f90 b/src/define_ov.f90
index 9c4f0206..e8f70c35 100644
--- a/src/define_ov.f90
+++ b/src/define_ov.f90
@@ -49,7 +49,7 @@ type (thread) threadinfo
integer iproc, nproc, err, ierr, levelv
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
external ioctree_number_of_elements
double precision current_time,activation_time
@@ -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%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%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)
@@ -107,7 +106,6 @@ if (params%irestart.eq.0) then
ov%unode=0.d0
ov%vnode=0.d0
ov%wnode=0.d0
- ov%wpreiso=0.d0
! Line below uncommented by dwhipp - 12/09
ov%pressure=0.d0
! Line below added by dwhipp - 12/09
@@ -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%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%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$')
! 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$')
@@ -149,7 +146,7 @@ else
ov%unode(i), &
ov%vnode(i), &
ov%wnode(i), &
- ov%wpreiso(i), &
+ wpreiso, &
(xlsf,j=1,nlsf), &
ov%temp(i), &
ov%temporary_nodal_pressure(i), &
@@ -166,6 +163,8 @@ else
ov%spressure(i), &
crit, &
e2d, &
+ evisc, &
+ is_plas, &
ov%whole_leaf_in_fluid(i),&
i=1,ov%nleaves)
read (9) (ov%octree(i),i=1,ov%octree(3))
--
GitLab