From 9e6e6b42f4885376dfce3209cfb9ba71cf35db0e Mon Sep 17 00:00:00 2001 From: Alfredo Buttari Date: Sun, 11 Dec 2005 19:53:17 +0000 Subject: [PATCH] *** empty log message *** --- src/modules/psb_realloc_mod.f90 | 6 ++---- src/tools/psb_dspfree.f90 | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/modules/psb_realloc_mod.f90 b/src/modules/psb_realloc_mod.f90 index 0ba6e9d5..ba502b27 100644 --- a/src/modules/psb_realloc_mod.f90 +++ b/src/modules/psb_realloc_mod.f90 @@ -56,16 +56,14 @@ Contains goto 9999 end if rrax=>tmp - End If + end if else allocate(rrax(len),stat=info) if (info /= 0) then err=4000 call psb_errpush(err,name) goto 9999 - end if - rrax=>tmp - end if + end if endif if (present(pad)) then rrax(dim+1:len) = pad diff --git a/src/tools/psb_dspfree.f90 b/src/tools/psb_dspfree.f90 index 08a83bd2..da274df3 100644 --- a/src/tools/psb_dspfree.f90 +++ b/src/tools/psb_dspfree.f90 @@ -121,32 +121,32 @@ subroutine psb_dspfrees(a, info) !...deallocate a.... - if ((info.eq.0).and.(.not.associated(a%pr))) info=2951 - if (info.eq.0) then +! if ((info.eq.0).and.(.not.associated(a%pr))) info=2951 + if ((info.eq.0).and.(associated(a%pr))) then !deallocate pr field deallocate(a%pr,stat=info) if (info.ne.0) info=2045 end if - if ((info.eq.0).and.(.not.associated(a%pl))) info=2952 +! if ((info.eq.0).and.(.not.associated(a%pl))) info=2952 !deallocate pl field - if (info.eq.0) then + if ((info.eq.0).and.(associated(a%pl))) then deallocate(a%pl,stat=info) if (info.ne.0) info=2046 end if - if ((info.eq.0).and.(.not.associated(a%ia2))) info=2953 - if (info.eq.0) then +! if ((info.eq.0).and.(.not.associated(a%ia2))) info=2953 + if ((info.eq.0).and.(associated(a%ia2))) then !deallocate ia2 field deallocate(a%ia2,stat=info) if (info.ne.0) info=2047 end if - if ((info.eq.0).and.(.not.associated(a%ia1))) info=2954 - if (info.eq.0) then +! if ((info.eq.0).and.(.not.associated(a%ia1))) info=2954 + if ((info.eq.0).and.(associated(a%ia1))) then !deallocate ia1 field deallocate(a%ia1,stat=info) if (info.ne.0) info=2048 endif - if ((info.eq.0).and.(.not.associated(a%aspk))) info=2955 - if (info.eq.0) then +! if ((info.eq.0).and.(.not.associated(a%aspk))) info=2955 + if ((info.eq.0).and.(associated(a%aspk))) then !deallocate aspk field deallocate(a%aspk,stat=info) if (info.ne.0) info=2049