Skip to content

Commit e96c6c2

Browse files
committed
Manually pick up some changes from Pull Request of Memcheck fixes 1171.
1 parent af92193 commit e96c6c2

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

sorc/ncep_post.fd/ALLOCATE_ALL.f

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,9 @@ SUBROUTINE ALLOCATE_ALL()
647647
snow_bucket1(i,j)=spval
648648
graup_bucket(i,j)=spval
649649
graup_bucket1(i,j)=spval
650+
frzrn_bucket(i,j)=spval
651+
snow_acm(i,j)=spval
652+
snow_bkt(i,j)=spval
650653
qrmax(i,j)=spval
651654
tmax(i,j)=spval
652655
snownc(i,j)=spval
@@ -752,6 +755,7 @@ SUBROUTINE ALLOCATE_ALL()
752755
sfclhx(i,j)=spval
753756
fis(i,j)=spval
754757
t500(i,j)=spval
758+
z500(i,j)=spval
755759
t700(i,j)=spval
756760
z700(i,j)=spval
757761
teql(i,j)=spval

sorc/ncep_post.fd/xml_perl_data.f

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,32 @@ subroutine read_postxconfig()
130130
! Take the first line as paramset_count
131131
read(22,*)paramset_count
132132

133+
if(associated(paramset)) then
134+
if(size(paramset)>0) then
135+
do i=1,size(paramset)
136+
if (associated(paramset(i)%param)) then
137+
if (size(paramset(i)%param)>0) then
138+
do j=1,size(paramset(i)%param)
139+
if (associated(paramset(i)%param(j)%scale_fact_fixed_sfc1)) &
140+
deallocate(paramset(i)%param(j)%scale_fact_fixed_sfc1)
141+
if (associated(paramset(i)%param(j)%level)) &
142+
deallocate(paramset(i)%param(j)%level)
143+
if (associated(paramset(i)%param(j)%scale_fact_fixed_sfc2)) &
144+
deallocate(paramset(i)%param(j)%scale_fact_fixed_sfc2)
145+
if (associated(paramset(i)%param(j)%level2)) &
146+
deallocate(paramset(i)%param(j)%level2)
147+
if (associated(paramset(i)%param(j)%scale)) &
148+
deallocate(paramset(i)%param(j)%scale)
149+
enddo
150+
deallocate(paramset(i)%param)
151+
nullify(paramset(i)%param)
152+
endif
153+
endif
154+
enddo
155+
endif
156+
deallocate(paramset)
157+
endif
158+
133159
! Allocate paramset array size
134160
allocate(paramset(paramset_count))
135161

0 commit comments

Comments
 (0)