[Dart-dev] [4638] DART/trunk/observations:
nancy at ucar.edu
nancy at ucar.edu
Wed Jan 5 12:02:58 MST 2011
Revision: 4638
Author: thoar
Date: 2011-01-05 12:02:57 -0700 (Wed, 05 Jan 2011)
Log Message:
-----------
instead of: meta_data = 'Data QC'
call set_qc_meta_data(obs_seq, k, meta_data)
simply doing: call set_qc_meta_data(obs_seq, k, 'Data QC')
and removing the character variable if possible.
The obs_sequence_mod:set_*_meta_data routines
check to make sure the strings are left justified, trimmed,
and are consistent with the declared length.
Modified Paths:
--------------
DART/trunk/observations/AIRS/airs_obs_mod.f90
DART/trunk/observations/GTSPP/gtspp_to_obs.f90
DART/trunk/observations/MADIS/convert_madis_acars.f90
DART/trunk/observations/MADIS/convert_madis_marine.f90
DART/trunk/observations/MADIS/convert_madis_mesonet.f90
DART/trunk/observations/MADIS/convert_madis_metar.f90
DART/trunk/observations/MADIS/convert_madis_rawin.f90
DART/trunk/observations/NCEP/ascii_to_obs/real_obs_mod.f90
DART/trunk/observations/SSEC/convert_ssec_satwnd.f90
DART/trunk/observations/WOD/wod_to_obs.f90
DART/trunk/observations/gps/convert_cosmic_gps_cdf.f90
DART/trunk/observations/quikscat/convert_L2b.f90
DART/trunk/observations/quikscat/quikscat_JPL_mod.f90
DART/trunk/observations/var/gts_dart_mod.f90
DART/trunk/observations/var/gts_to_dart.f90
DART/trunk/observations/var/littler_tf_dart.f90
-------------- next part --------------
Modified: DART/trunk/observations/AIRS/airs_obs_mod.f90
===================================================================
--- DART/trunk/observations/AIRS/airs_obs_mod.f90 2011-01-05 18:52:28 UTC (rev 4637)
+++ DART/trunk/observations/AIRS/airs_obs_mod.f90 2011-01-05 19:02:57 UTC (rev 4638)
@@ -10,7 +10,7 @@
! $Revision$
! $Date$
-use types_mod, only : r4, r8, digits12, deg2rad, rad2deg, metadatalength
+use types_mod, only : r4, r8, digits12, deg2rad, rad2deg
use obs_def_mod, only : obs_def_type, get_obs_def_time, read_obs_def, &
write_obs_def, destroy_obs_def, &
@@ -125,8 +125,6 @@
type(time_type) :: obs_time, base_time, pre_time, time
-character(len = metadatalength) :: meta_data
-
if ( .not. module_initialized ) call initialize_module
num_copies = 1
@@ -137,13 +135,11 @@
! set meta data of obs_seq
do i = 1, num_copies
- meta_data = 'observation'
- call set_copy_meta_data(real_obs_sequence, i, meta_data)
+ call set_copy_meta_data(real_obs_sequence, i, 'observation')
end do
do i = 1, num_qc
- meta_data = 'AIRS QC'
- call set_qc_meta_data(real_obs_sequence, i, meta_data)
+ call set_qc_meta_data(real_obs_sequence, i, 'AIRS QC')
end do
! Initialize the obs variables
Modified: DART/trunk/observations/GTSPP/gtspp_to_obs.f90
===================================================================
--- DART/trunk/observations/GTSPP/gtspp_to_obs.f90 2011-01-05 18:52:28 UTC (rev 4637)
+++ DART/trunk/observations/GTSPP/gtspp_to_obs.f90 2011-01-05 19:02:57 UTC (rev 4638)
@@ -58,7 +58,7 @@
integer, parameter :: num_copies = 1, & ! number of copies in sequence
num_qc = 1 ! number of QC entries
-character (len=129) :: meta_data, msgstring, next_infile
+character (len=129) :: msgstring, next_infile
character (len=80) :: name
character (len=19) :: datestr
character (len=6) :: subset
@@ -156,12 +156,10 @@
print *, "max entries = ", num_new_obs
call init_obs_sequence(obs_seq, num_copies, num_qc, num_new_obs)
do k = 1, num_copies
- meta_data = 'GTSPP observation'
- call set_copy_meta_data(obs_seq, k, meta_data)
+ call set_copy_meta_data(obs_seq, k, 'GTSPP observation')
end do
do k = 1, num_qc
- meta_data = 'GTSPP QC'
- call set_qc_meta_data(obs_seq, k, meta_data)
+ call set_qc_meta_data(obs_seq, k, 'GTSPP QC')
end do
end if
Modified: DART/trunk/observations/MADIS/convert_madis_acars.f90
===================================================================
--- DART/trunk/observations/MADIS/convert_madis_acars.f90 2011-01-05 18:52:28 UTC (rev 4637)
+++ DART/trunk/observations/MADIS/convert_madis_acars.f90 2011-01-05 19:02:57 UTC (rev 4638)
@@ -30,7 +30,7 @@
!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-use types_mod, only : r8, missing_r8, metadatalength
+use types_mod, only : r8, missing_r8
use location_mod, only : VERTISPRESSURE
use utilities_mod, only : nc_check, initialize_utilities, finalize_utilities
use time_manager_mod, only : time_type, set_calendar_type, set_date, operator(>=), &
@@ -70,7 +70,6 @@
integer, parameter :: num_copies = 1, & ! number of copies in sequence
num_qc = 1 ! number of QC entries
-character (len=metadatalength) :: meta_data
integer :: ncid, nobs, nvars, n, i, oday, osec, nused
logical :: file_exist, first_obs
@@ -166,12 +165,10 @@
! create a new one
call init_obs_sequence(obs_seq, num_copies, num_qc, nvars*nobs)
do i = 1, num_copies
- meta_data = 'MADIS observation'
- call set_copy_meta_data(obs_seq, i, meta_data)
+ call set_copy_meta_data(obs_seq, i, 'MADIS observation')
end do
do i = 1, num_qc
- meta_data = 'Data QC'
- call set_qc_meta_data(obs_seq, i, meta_data)
+ call set_qc_meta_data(obs_seq, i, 'Data QC')
end do
endif
Modified: DART/trunk/observations/MADIS/convert_madis_marine.f90
===================================================================
--- DART/trunk/observations/MADIS/convert_madis_marine.f90 2011-01-05 18:52:28 UTC (rev 4637)
+++ DART/trunk/observations/MADIS/convert_madis_marine.f90 2011-01-05 19:02:57 UTC (rev 4638)
@@ -33,7 +33,7 @@
!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-use types_mod, only : r8, missing_r8, metadatalength
+use types_mod, only : r8, missing_r8
use utilities_mod, only : nc_check, initialize_utilities, finalize_utilities
use time_manager_mod, only : time_type, set_calendar_type, set_date, &
increment_time, get_time, operator(-), GREGORIAN
@@ -80,7 +80,6 @@
real(r8), parameter :: def_elev = 0.0_r8
-character (len=metadatalength) :: meta_data
integer :: ncid, nobs, nvars, n, i, oday, osec, nused
logical :: file_exist, first_obs
real(r8) :: sfcp_miss, tair_miss, tdew_miss, wdir_miss, wspd_miss, uwnd, &
@@ -176,12 +175,10 @@
! create a new one
call init_obs_sequence(obs_seq, num_copies, num_qc, nvars*nobs)
do i = 1, num_copies
- meta_data = 'MADIS observation'
- call set_copy_meta_data(obs_seq, i, meta_data)
+ call set_copy_meta_data(obs_seq, i, 'MADIS observation')
end do
do i = 1, num_qc
- meta_data = 'Data QC'
- call set_qc_meta_data(obs_seq, i, meta_data)
+ call set_qc_meta_data(obs_seq, i, 'Data QC')
end do
endif
Modified: DART/trunk/observations/MADIS/convert_madis_mesonet.f90
===================================================================
--- DART/trunk/observations/MADIS/convert_madis_mesonet.f90 2011-01-05 18:52:28 UTC (rev 4637)
+++ DART/trunk/observations/MADIS/convert_madis_mesonet.f90 2011-01-05 19:02:57 UTC (rev 4638)
@@ -77,7 +77,6 @@
integer, parameter :: num_copies = 1, & ! number of copies in sequence
num_qc = 1 ! number of QC entries
-character (len=129) :: meta_data
integer :: ncid, nobs, nvars, n, i, oday, osec, nused
logical :: file_exist, first_obs
real(r8) :: alti_miss, tair_miss, tdew_miss, wdir_miss, wspd_miss, uwnd, &
@@ -170,12 +169,10 @@
! create a new one
call init_obs_sequence(obs_seq, num_copies, num_qc, nvars*nobs)
do i = 1, num_copies
- meta_data = 'MADIS observation'
- call set_copy_meta_data(obs_seq, i, meta_data)
+ call set_copy_meta_data(obs_seq, i, 'MADIS observation')
end do
do i = 1, num_qc
- meta_data = 'Data QC'
- call set_qc_meta_data(obs_seq, i, meta_data)
+ call set_qc_meta_data(obs_seq, i, 'Data QC')
end do
endif
Modified: DART/trunk/observations/MADIS/convert_madis_metar.f90
===================================================================
--- DART/trunk/observations/MADIS/convert_madis_metar.f90 2011-01-05 18:52:28 UTC (rev 4637)
+++ DART/trunk/observations/MADIS/convert_madis_metar.f90 2011-01-05 19:02:57 UTC (rev 4638)
@@ -80,7 +80,6 @@
integer, parameter :: num_copies = 1, & ! number of copies in sequence
num_qc = 1 ! number of QC entries
-character (len=129) :: meta_data
character (len=5) :: rtype
integer :: ncid, nobs, nvars, n, i, oday, osec, nused
logical :: file_exist, first_obs
@@ -169,12 +168,10 @@
! create a new one
call init_obs_sequence(obs_seq, num_copies, num_qc, nvars*nobs)
do i = 1, num_copies
- meta_data = 'MADIS observation'
- call set_copy_meta_data(obs_seq, i, meta_data)
+ call set_copy_meta_data(obs_seq, i, 'MADIS observation')
end do
do i = 1, num_qc
- meta_data = 'Data QC'
- call set_qc_meta_data(obs_seq, i, meta_data)
+ call set_qc_meta_data(obs_seq, i, 'Data QC')
end do
endif
Modified: DART/trunk/observations/MADIS/convert_madis_rawin.f90
===================================================================
--- DART/trunk/observations/MADIS/convert_madis_rawin.f90 2011-01-05 18:52:28 UTC (rev 4637)
+++ DART/trunk/observations/MADIS/convert_madis_rawin.f90 2011-01-05 19:02:57 UTC (rev 4638)
@@ -77,8 +77,6 @@
integer, parameter :: num_copies = 1, & ! number of copies in sequence
num_qc = 1 ! number of QC entries
-character(len=129) :: meta_data
-
integer :: oday, osec, nman, nsig, nsound, nused, &
nmaxml, nmaxsw, nmaxst, maxobs, nvars_man, nvars_sigt, k, n, i, ncid
@@ -182,12 +180,10 @@
! create a new one
call init_obs_sequence(obs_seq, num_copies, num_qc, maxobs)
do n = 1, num_copies
- meta_data = 'MADIS observation'
- call set_copy_meta_data(obs_seq, n, meta_data)
+ call set_copy_meta_data(obs_seq, n, 'MADIS observation')
end do
do n = 1, num_qc
- meta_data = 'Data QC'
- call set_qc_meta_data(obs_seq, n, meta_data)
+ call set_qc_meta_data(obs_seq, n, 'Data QC')
end do
endif
Modified: DART/trunk/observations/NCEP/ascii_to_obs/real_obs_mod.f90
===================================================================
--- DART/trunk/observations/NCEP/ascii_to_obs/real_obs_mod.f90 2011-01-05 18:52:28 UTC (rev 4637)
+++ DART/trunk/observations/NCEP/ascii_to_obs/real_obs_mod.f90 2011-01-05 19:02:57 UTC (rev 4638)
@@ -135,7 +135,6 @@
character(len = 8 ) :: obsdate
character(len = 80) :: obsfile, label
-character(len = 129) :: copy_meta_data, qc_meta_data
character(len = 6 ) :: subset
logical :: pass
@@ -151,13 +150,11 @@
! set meta data of obs_seq
do i = 1, num_copies
- copy_meta_data = 'NCEP BUFR observation'
- call set_copy_meta_data(real_obs_sequence, i, copy_meta_data)
+ call set_copy_meta_data(real_obs_sequence, i, 'NCEP BUFR observation')
end do
do i = 1, num_qc
- qc_meta_data = 'NCEP QC index'
- call set_qc_meta_data(real_obs_sequence, i, qc_meta_data)
+ call set_qc_meta_data(real_obs_sequence, i, 'NCEP QC index')
end do
! Initialize the obs variable
Modified: DART/trunk/observations/SSEC/convert_ssec_satwnd.f90
===================================================================
--- DART/trunk/observations/SSEC/convert_ssec_satwnd.f90 2011-01-05 18:52:28 UTC (rev 4637)
+++ DART/trunk/observations/SSEC/convert_ssec_satwnd.f90 2011-01-05 19:02:57 UTC (rev 4638)
@@ -20,7 +20,7 @@
!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-use types_mod, only : r8, missing_r8, metadatalength
+use types_mod, only : r8, missing_r8
use utilities_mod, only : get_unit
use time_manager_mod, only : time_type, set_calendar_type, GREGORIAN, &
increment_time, get_time, set_date, operator(-)
@@ -45,7 +45,6 @@
num_copies = 1, & ! number of copies in sequence
num_qc = 1 ! number of QC entries
-character(len=metadatalength) :: meta_data
character(len=129) :: header
character(len=8) :: datein
character(len=6) :: sat
@@ -118,12 +117,10 @@
call init_obs_sequence(obs_seq, num_copies, num_qc, 2*nmaxwnd)
do i = 1, num_copies
- meta_data = 'SSEC observation'
- call set_copy_meta_data(obs_seq, i, meta_data)
+ call set_copy_meta_data(obs_seq, i, 'SSEC observation')
end do
do i = 1, num_qc
- meta_data = 'Data QC'
- call set_qc_meta_data(obs_seq, i, meta_data)
+ call set_qc_meta_data(obs_seq, i, 'Data QC')
end do
end if
Modified: DART/trunk/observations/WOD/wod_to_obs.f90
===================================================================
--- DART/trunk/observations/WOD/wod_to_obs.f90 2011-01-05 18:52:28 UTC (rev 4637)
+++ DART/trunk/observations/WOD/wod_to_obs.f90 2011-01-05 19:02:57 UTC (rev 4638)
@@ -102,7 +102,7 @@
integer, parameter :: num_copies = 1, & ! number of copies in sequence
num_qc = 1 ! number of QC entries
-character (len=129) :: meta_data, msgstring, next_infile, cdummy
+character (len=129) :: msgstring, next_infile, cdummy
character (len=80) :: name
character (len=19) :: datestr
character (len=6) :: subset
@@ -229,12 +229,10 @@
print *, "max entries = ", num_new_obs
call init_obs_sequence(obs_seq, num_copies, num_qc, num_new_obs)
do k = 1, num_copies
- meta_data = 'WOD observation'
- call set_copy_meta_data(obs_seq, k, meta_data)
+ call set_copy_meta_data(obs_seq, k, 'WOD observation')
end do
do k = 1, num_qc
- meta_data = 'WOD QC'
- call set_qc_meta_data(obs_seq, k, meta_data)
+ call set_qc_meta_data(obs_seq, k, 'WOD QC')
end do
did_obs = .false.
Modified: DART/trunk/observations/gps/convert_cosmic_gps_cdf.f90
===================================================================
--- DART/trunk/observations/gps/convert_cosmic_gps_cdf.f90 2011-01-05 18:52:28 UTC (rev 4637)
+++ DART/trunk/observations/gps/convert_cosmic_gps_cdf.f90 2011-01-05 19:02:57 UTC (rev 4638)
@@ -20,7 +20,7 @@
!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-use types_mod, only : r8, metadatalength
+use types_mod, only : r8
use time_manager_mod, only : time_type, set_calendar_type, GREGORIAN, set_time,&
increment_time, get_time, set_date, operator(-), &
print_date
@@ -56,7 +56,6 @@
integer, parameter :: num_copies = 1, & ! number of copies in sequence
num_qc = 1 ! number of QC entries
-character (len=metadatalength) :: meta_data
character (len=129) :: msgstring, next_infile
character (len=80) :: name
character (len=19) :: datestr
@@ -162,12 +161,10 @@
call init_obs_sequence(obs_seq, num_copies, num_qc, num_new_obs)
do k = 1, num_copies
- meta_data = 'COSMIC GPS observation'
- call set_copy_meta_data(obs_seq, k, meta_data)
+ call set_copy_meta_data(obs_seq, k, 'COSMIC GPS observation')
end do
do k = 1, num_qc
- meta_data = 'COSMIC QC'
- call set_qc_meta_data(obs_seq, k, meta_data)
+ call set_qc_meta_data(obs_seq, k, 'COSMIC QC')
end do
end if
Modified: DART/trunk/observations/quikscat/convert_L2b.f90
===================================================================
--- DART/trunk/observations/quikscat/convert_L2b.f90 2011-01-05 18:52:28 UTC (rev 4637)
+++ DART/trunk/observations/quikscat/convert_L2b.f90 2011-01-05 19:02:57 UTC (rev 4638)
@@ -31,7 +31,7 @@
! Declare local parameters
! ----------------------------------------------------------------------
-character(len=256) :: datafile, output_name, dartfile, string1
+character(len=256) :: datafile, output_name, dartfile
type(orbit_type) :: orbit
type(obs_sequence_type) :: seq
Modified: DART/trunk/observations/quikscat/quikscat_JPL_mod.f90
===================================================================
--- DART/trunk/observations/quikscat/quikscat_JPL_mod.f90 2011-01-05 18:52:28 UTC (rev 4637)
+++ DART/trunk/observations/quikscat/quikscat_JPL_mod.f90 2011-01-05 19:02:57 UTC (rev 4638)
@@ -10,7 +10,7 @@
! $Revision$
! $Date$
-use types_mod, only : r4, r8, digits12, deg2rad, rad2deg, metadatalength
+use types_mod, only : r4, r8, digits12, deg2rad, rad2deg
use obs_def_mod, only : obs_def_type, get_obs_def_time, read_obs_def, &
write_obs_def, destroy_obs_def, interactive_obs_def, &
@@ -175,8 +175,6 @@
type(time_type) :: time, pre_time
-character(len = metadatalength) :: meta_data
-
if ( .not. module_initialized ) call initialize_module
! Initialize an obs_sequence
@@ -184,8 +182,7 @@
! set meta data of obs_seq
do i = 1, num_copies
- meta_data = 'observation'
- call set_copy_meta_data(real_obs_sequence, i, meta_data)
+ call set_copy_meta_data(real_obs_sequence, i, 'observation')
end do
call set_qc_meta_data(real_obs_sequence, 1, 'QC flag - wvc_quality_flag')
@@ -476,14 +473,14 @@
! Define Variables
-character(len=1) :: product(8)
+! character(len=1) :: product(8)
character(len=21) :: TimeTags(MAX_ROWS)
real(r4), dimension(MAX_WVC,MAX_ROWS) :: datmat
integer :: sd_id, retn, sfstart, sfend
integer :: irow, iwvc, iamb
-integer :: ntype, nval
+! integer :: ntype, nval
integer :: year, doy, hh, mm
real(r4) :: ss
@@ -703,7 +700,7 @@
character vdata_name*30
integer :: file_id,vdata_ref,vdata_id
integer :: n_records,interlace,vdata_size
- integer :: hopen,vsfgid,vsfatch,vsfinq,vsfread,vfsdtch,hclose
+ integer :: hopen,vsfgid,vsfatch,vsfinq,vsfread,hclose
integer :: retn
integer :: DFACC_RDONLY,FULL_INTERLACE
Modified: DART/trunk/observations/var/gts_dart_mod.f90
===================================================================
--- DART/trunk/observations/var/gts_dart_mod.f90 2011-01-05 18:52:28 UTC (rev 4637)
+++ DART/trunk/observations/var/gts_dart_mod.f90 2011-01-05 19:02:57 UTC (rev 4638)
@@ -15,8 +15,8 @@
register_module, logfileunit, E_MSG, timestamp, &
error_handler, find_namelist_in_file, check_namelist_read
use obs_sequence_mod, only : obs_type, obs_sequence_type, init_obs_sequence, insert_obs_in_seq, &
- set_copy_meta_data, set_qc_meta_data, write_obs_seq, assignment(=), &
- init_obs, static_init_obs_sequence, set_obs_def, set_obs_values, set_qc
+ write_obs_seq, init_obs, assignment(=), &
+ static_init_obs_sequence, set_obs_def, set_obs_values, set_qc
use obs_def_mod, only : set_obs_def_location, set_obs_def_error_variance, &
set_obs_def_kind, set_obs_def_time, set_obs_def_key, &
obs_def_type
Modified: DART/trunk/observations/var/gts_to_dart.f90
===================================================================
--- DART/trunk/observations/var/gts_to_dart.f90 2011-01-05 18:52:28 UTC (rev 4637)
+++ DART/trunk/observations/var/gts_to_dart.f90 2011-01-05 19:02:57 UTC (rev 4638)
@@ -76,7 +76,6 @@
!real(r8) :: lat,lon,pressure, height
!real(r8) :: windspd, winddir, uu, vv, tk, td, rh, qv
-character(len = 129) :: copy_meta_data, qc_meta_data
character(len=80) :: dummy
logical :: valid
@@ -210,10 +209,8 @@
! Initialize an obs_sequence structure
call init_obs_sequence(seq, num_copies, num_qc, max_num_obs)
-copy_meta_data = 'WRFVAR 2.1 GTS observations'
-qc_meta_data = 'WRFVAR OBSPROC Quality Control'
-call set_copy_meta_data(seq, 1, copy_meta_data)
-call set_qc_meta_data(seq, 1, qc_meta_data)
+call set_copy_meta_data(seq, 1, 'WRFVAR 2.1 GTS observations')
+call set_qc_meta_data( seq, 1, 'WRFVAR OBSPROC Quality Control')
call init_obs(obs, num_copies, num_qc)
Modified: DART/trunk/observations/var/littler_tf_dart.f90
===================================================================
--- DART/trunk/observations/var/littler_tf_dart.f90 2011-01-05 18:52:28 UTC (rev 4637)
+++ DART/trunk/observations/var/littler_tf_dart.f90 2011-01-05 19:02:57 UTC (rev 4638)
@@ -68,8 +68,7 @@
integer :: n_no_support
character(len = 129) :: dart_file_name = 'obs_seq.out', &
- littler_file_name = 'little-r.dat', &
- copy_meta_data, qc_meta_data
+ littler_file_name = 'little-r.dat'
integer :: calendar_type = GREGORIAN
@@ -534,10 +533,8 @@
! Initialize an obs_sequence structure
call init_obs_sequence(dart_seq, num_copies, num_qc, max_num_obs)
- copy_meta_data = 'littler observations'
- call set_copy_meta_data(dart_seq, 1, copy_meta_data)
- copy_meta_data = 'littler QC'
- call set_qc_meta_data(dart_seq, 1, qc_meta_data)
+ call set_copy_meta_data(dart_seq, 1, 'littler observations')
+ call set_qc_meta_data( dart_seq, 1, 'littler QC')
iunit = open_file(littler_file_name, action = 'read')
More information about the Dart-dev
mailing list