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

modified to use new zi (zisodisp) structure

parent b933bf0b
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
!------------------------------------------------------------------------------| !------------------------------------------------------------------------------|
!------------------------------------------------------------------------------| !------------------------------------------------------------------------------|
subroutine define_cloud (cl,params,zisodisp) subroutine define_cloud (cl,params,zi)
!------------------------------------------------------------------------------| !------------------------------------------------------------------------------|
!(((((((((((((((( Purpose of the routine )))))))))))))))))))))))))))))))))))))) !(((((((((((((((( Purpose of the routine ))))))))))))))))))))))))))))))))))))))
...@@ -38,7 +38,8 @@ implicit none ...@@ -38,7 +38,8 @@ implicit none
type (cloud) cl type (cloud) cl
type (parameters) params type (parameters) params
double precision zisodisp(2**params%levelmax_oct+1,2**params%levelmax_oct+1) type (ziso) zi
!double precision zisodisp(2**params%levelmax_oct+1,2**params%levelmax_oct+1)
!------------------------------------------------------------------------------| !------------------------------------------------------------------------------|
!(((((((((((((((( declaration of the subroutine internal variables ))))))))))))) !(((((((((((((((( declaration of the subroutine internal variables )))))))))))))
...@@ -70,7 +71,10 @@ if (params%irestart.eq.0) then ...@@ -70,7 +71,10 @@ if (params%irestart.eq.0) then
allocate (cl%temp(1), stat=err) ; if (err.ne.0) call stop_run ('Error alloc cl%temp in define_cloud$') allocate (cl%temp(1), stat=err) ; if (err.ne.0) call stop_run ('Error alloc cl%temp in define_cloud$')
allocate (cl%press(1), stat=err) ; if (err.ne.0) call stop_run ('Error alloc cl%press in define_cloud$') allocate (cl%press(1), stat=err) ; if (err.ne.0) call stop_run ('Error alloc cl%press in define_cloud$')
allocate (cl%tag(1), stat=err) ; if (err.ne.0) call stop_run ('Error alloc cl%tag in define_cloud$') allocate (cl%tag(1), stat=err) ; if (err.ne.0) call stop_run ('Error alloc cl%tag in define_cloud$')
if (params%isobc) zisodisp=0.d0 if (params%isobc) then
allocate (zi%zisodisp(2**params%levelmax_oct+1,2**params%levelmax_oct+1), stat=err); if (err.ne.0) call stop_run ('Error alloc zi%zisodisp in define_cloud$')
zi%zisodisp=0.d0
endif
else else
open (19,file=trim(params%restartfile),status='old',form='unformatted') open (19,file=trim(params%restartfile),status='old',form='unformatted')
...@@ -93,6 +97,7 @@ else ...@@ -93,6 +97,7 @@ else
allocate (cl%temp(cl%np),stat=err) ; if (err.ne.0) call stop_run ('Error alloc cl%temp in define_cloud$') allocate (cl%temp(cl%np),stat=err) ; if (err.ne.0) call stop_run ('Error alloc cl%temp in define_cloud$')
allocate (cl%press(cl%np),stat=err) ; if (err.ne.0) call stop_run ('Error alloc cl%press in define_cloud$') allocate (cl%press(cl%np),stat=err) ; if (err.ne.0) call stop_run ('Error alloc cl%press in define_cloud$')
allocate (cl%tag(cl%np),stat=err) ; if (err.ne.0) call stop_run ('Error alloc cl%tag in define_cloud$') allocate (cl%tag(cl%np),stat=err) ; if (err.ne.0) call stop_run ('Error alloc cl%tag in define_cloud$')
if (params%isobc) allocate (zi%zisodisp(2**params%levelmax_oct+1,2**params%levelmax_oct+1), stat=err); if (err.ne.0) call stop_run ('Error alloc zi%zisodisp in define_cloud$')
read (19) (x, & read (19) (x, &
y, & y, &
...@@ -146,7 +151,7 @@ else ...@@ -146,7 +151,7 @@ else
i=1,cl%np) i=1,cl%np)
! read isostasy basal displacement array - dwhipp 11/09 ! read isostasy basal displacement array - dwhipp 11/09
if (params%isobc) read (19) ((zisodisp(i,j),j=1,2**params%levelmax_oct+1),& if (params%isobc) read (19) ((zi%zisodisp(i,j),j=1,2**params%levelmax_oct+1),&
i=1,2**params%levelmax_oct+1) i=1,2**params%levelmax_oct+1)
close (19) close (19)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment