Skip to content

Commit

Permalink
revert the last commit and patch better for export of contsant statio…
Browse files Browse the repository at this point in the history
…n data

git-svn-id: https://svn.smr.arpa.emr.it/vol7d/trunk@1463 500a5620-302c-0410-bb8c-d54761bbe776
  • Loading branch information
Paolo Patruno committed Feb 18, 2015
1 parent 0a086b7 commit 224fd43
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion vol7d/dballe_class.F03
Original file line number Diff line number Diff line change
Expand Up @@ -2484,7 +2484,7 @@ end subroutine dbametaanddatav_extrude

!> put data on DSN; extrude metaanddata list
subroutine dbametaanddatal_extrude(metaanddatal,session,noattr,filter)
class(dbametaanddatalist), intent(in) :: metaanddatal !< ingestd data
class(dbametaanddatalist), intent(inout) :: metaanddatal !< ingestd data
class(dbasession), intent(in) :: session
logical, intent(in),optional :: noattr !< set to .true. to put data only (no attribute)
type(dbafilter),intent(in),optional :: filter !< use this to filter wanted data
Expand Down
2 changes: 2 additions & 0 deletions vol7d/vol7d_dballe_class.F03
Original file line number Diff line number Diff line change
Expand Up @@ -1808,6 +1808,8 @@ subroutine vol7d_dballe_export (this, filter, template)
type(dbametaanddatalist) :: metaanddatal
logical :: stat

metaanddatal=dbametaanddatalist()

call v7d2dba(this%vol7d,metaanddatal)
!call metaanddatal%display()

Expand Down
4 changes: 2 additions & 2 deletions vol7d/vol7d_serialize_dballe_class.F03
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,8 @@ SUBROUTINE vol7d_serialize_export(this, metaanddatal)
nvar = conta%nvar + conta%nanavar
!print *,"nvar: ",nvar,"nattr: ",nattr

metaanddata%metadata=dbametadata() ! initialize must be done for station constant data

allocate(metaanddata%dataattrv%dataattr(nvar))
do i =1,nvar
allocate(metaanddata%dataattrv%dataattr(i)%attrv%dcv(nattr))
Expand All @@ -495,8 +497,6 @@ SUBROUTINE vol7d_serialize_export(this, metaanddatal)
,vol7d_valuec_attr_callback_dba &
)

metaanddatal=dbametaanddatalist()

DO WHILE(linei%next())

coli = linei%vol7d_serialize_itercol_new() ! column iterator from linei (data line)
Expand Down

0 comments on commit 224fd43

Please sign in to comment.