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

Fixed typos

parent 054bdafb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 3 deletions
src/DOUAR.f90
+ 16
− 3
View file @ 72c1a9fe
...@@ -814,7 +814,7 @@ do while (istep.le.params%nstep) ...@@ -814,7 +814,7 @@ do while (istep.le.params%nstep)
call heap (threadinfo,'iproc_col','main',size(iproc_col),'bool',-1) ; deallocate(iproc_col) call heap (threadinfo,'iproc_col','main',size(iproc_col),'bool',-1) ; deallocate(iproc_col)
call heap (threadinfo,'avals','main',size(avals),'dp',-1) ; deallocate(avals) call heap (threadinfo,'avals','main',size(avals),'dp',-1) ; deallocate(avals)
call heap (threadinfo,'b','main',size(b),'dp',-1) ; deallocate(b) call heap (threadinfo,'b','main',size(b),'dp',-1) ; deallocate(b)
call heap (threadinfo,'weightel','main',size(weightel),'dp',-1) ; deallocate(weightel) !call heap (threadinfo,'weightel','main',size(weightel),'dp',-1) ; deallocate(weightel)
!-------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------
!-------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------
...@@ -967,6 +967,7 @@ do while (istep.le.params%nstep) ...@@ -967,6 +967,7 @@ do while (istep.le.params%nstep)
!allocate(ov%wpreiso(ov%nnode),stat=err) ; if (err.ne.0) call stop_run ('Error alloc ov%wpreiso in main$') !allocate(ov%wpreiso(ov%nnode),stat=err) ; if (err.ne.0) call stop_run ('Error alloc ov%wpreiso in main$')
call isostasy (params,weightel,ov,surface,mat,1,zi) call isostasy (params,weightel,ov,surface,mat,1,zi)
call show_time (total,step,inc,1,'Apply isostasy to surfaces$')
do is=1,params%ns do is=1,params%ns
if (current_time+tiny(current_time).ge. surface(is)%activation_time) then if (current_time+tiny(current_time).ge. surface(is)%activation_time) then
call move_surface (surface(is),surface0(is),1,1,ov,params%dt/2.d0,params,istep,is) call move_surface (surface(is),surface0(is),1,1,ov,params%dt/2.d0,params,istep,is)
...@@ -989,7 +990,16 @@ do while (istep.le.params%nstep) ...@@ -989,7 +990,16 @@ do while (istep.le.params%nstep)
call heap (threadinfo,'olsf%lsf','main',size(olsf%lsf),'dp',-1) ; deallocate (olsf%lsf) call heap (threadinfo,'olsf%lsf','main',size(olsf%lsf),'dp',-1) ; deallocate (olsf%lsf)
call heap (threadinfo,'olsf%icon','main',size(olsf%icon),'int',-1) ; deallocate (olsf%icon) call heap (threadinfo,'olsf%icon','main',size(olsf%icon),'int',-1) ; deallocate (olsf%icon)
call heap (threadinfo,'olsf%octree','main',size(olsf%octree),'int',-1) ; deallocate (olsf%octree) call heap (threadinfo,'olsf%octree','main',size(olsf%octree),'int',-1) ; deallocate (olsf%octree)
endif
! Deallocate weightel here if temperature is not calculated below
if (converge) then
if (params%calculate_temp) then
call heap (threadinfo,'weightel','main',size(weightel),'dp',-1)
deallocate(weightel)
endif
else
call heap (threadinfo,'weightel','main',size(weightel),'dp',-1) ; deallocate(weightel)
endif endif
!-------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------
...@@ -1143,7 +1153,7 @@ do while (istep.le.params%nstep) ...@@ -1143,7 +1153,7 @@ do while (istep.le.params%nstep)
call heap (threadinfo,'iproc_col','main',size(iproc_col),'bool',-1) ; deallocate(iproc_col) call heap (threadinfo,'iproc_col','main',size(iproc_col),'bool',-1) ; deallocate(iproc_col)
call heap (threadinfo,'avals','main',size(avals),'dp',-1) ; deallocate(avals) call heap (threadinfo,'avals','main',size(avals),'dp',-1) ; deallocate(avals)
call heap (threadinfo,'b','main',size(b),'dp',-1) ; deallocate(b) call heap (threadinfo,'b','main',size(b),'dp',-1) ; deallocate(b)
call heap (threadinfo,'weightel','main',size(weightel),'dp',-1) ; deallocate(weightel) !call heap (threadinfo,'weightel','main',size(weightel),'dp',-1) ; deallocate(weightel)
else else
...@@ -1254,6 +1264,9 @@ do while (istep.le.params%nstep) ...@@ -1254,6 +1264,9 @@ do while (istep.le.params%nstep)
enddo enddo
endif endif
! Done with isostasy, deallocate weightel
call heap (threadinfo,'weightel','main',size(weightel),'dp',-1) ; deallocate(weightel)
call interpolate_velocity_on_surface(params,surface,ov) call interpolate_velocity_on_surface(params,surface,ov)
!-------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------
...@@ -1310,7 +1323,7 @@ do while (istep.le.params%nstep) ...@@ -1310,7 +1323,7 @@ do while (istep.le.params%nstep)
call heap (threadinfo,'osolve%octree','main',size(osolve%octree),'int',-1) ; deallocate (osolve%octree) call heap (threadinfo,'osolve%octree','main',size(osolve%octree),'int',-1) ; deallocate (osolve%octree)
call heap (threadinfo,'osolve%icon','main',size(osolve%icon),'int',-1) ; deallocate (osolve%icon) call heap (threadinfo,'osolve%icon','main',size(osolve%icon),'int',-1) ; deallocate (osolve%icon)
call heap (threadinfo,'osolve%x','main',size(osolve%x),'dp',-1) ; deallocate (osolve%x) call heap (threadinfo,'osolve%x','main',size(osolve%x),'dp',-1) ; deallocate (osolve%x)
call heap (threadinfo,'osolve%y','main',size(osolve%y),'dp',-1) ; deallocate (osolve%y); call heap (threadinfo,'osolve%y','main',size(osolve%y),'dp',-1) ; deallocate (osolve%y)
call heap (threadinfo,'osolve%z','main',size(osolve%z),'dp',-1) ; deallocate (osolve%z) call heap (threadinfo,'osolve%z','main',size(osolve%z),'dp',-1) ; deallocate (osolve%z)
call heap (threadinfo,'osolve%lsf','main',size(osolve%lsf),'dp',-1) ; deallocate (osolve%lsf) call heap (threadinfo,'osolve%lsf','main',size(osolve%lsf),'dp',-1) ; deallocate (osolve%lsf)
call heap (threadinfo,'osolve%kfix','main',size(osolve%kfix),'int',-1) ; deallocate (osolve%kfix) call heap (threadinfo,'osolve%kfix','main',size(osolve%kfix),'int',-1) ; deallocate (osolve%kfix)
......
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