[Dart-dev] DART/branches Revision: 11908

[dart at ucar.edu]

thoar at ucar.edu
2017-08-24 15:06:31 -0600 (Thu, 24 Aug 2017)
371
cleaning up the codes a bit to improve readability and remove cruft.
Updated the .html to include convert_cosmic_iono_cdf, but not
convert_cosmic_ionosphere - as these will likely be consolidated.
Changed the namelist variables to convert_cosmic_iono_cdf to
be consistent with their use. These codes need to be reviewed before
being put on the trunk (or the rma_trunk).




Modified: DART/branches/tiegcm/observations/gps/convert_cosmic_gps_cdf.f90
===================================================================
--- DART/branches/tiegcm/observations/gps/convert_cosmic_gps_cdf.f90	2017-08-24 18:58:02 UTC (rev 11907)
+++ DART/branches/tiegcm/observations/gps/convert_cosmic_gps_cdf.f90	2017-08-24 21:06:31 UTC (rev 11908)
@@ -1014,7 +1014,6 @@
  real(r8)              :: gsi_refractivity_error
 
  real(r8) :: zkm, rerr
- integer  :: kk
  
  zkm = H * 0.001       ! height in km
  rerr = 1.0_r8

Modified: DART/branches/tiegcm/observations/gps/convert_cosmic_gps_cdf.nml
===================================================================
--- DART/branches/tiegcm/observations/gps/convert_cosmic_gps_cdf.nml	2017-08-24 18:58:02 UTC (rev 11907)
+++ DART/branches/tiegcm/observations/gps/convert_cosmic_gps_cdf.nml	2017-08-24 21:06:31 UTC (rev 11908)
@@ -1,10 +1,11 @@
 &convert_cosmic_gps_nml
-  obs_levels(nmaxlevels) = -1.0
-  local_operator         = .true.
-  ray_ds                 = 5000.0
-  ray_htop               = 15000.0
-  gpsro_netcdf_file      = 'cosmic_gps_input.nc'
-  gpsro_netcdf_filelist  = 'cosmic_gps_input_list'
-  gpsro_out_file         = 'obs_seq.gpsro'
-/
+   obs_levels             = -1.0
+   local_operator         = .true.
+   use_original_kuo_error = .false.
+   gpsro_netcdf_file      = 'cosmic_gps_input.nc'
+   gpsro_netcdf_filelist  = 'cosmic_gps_input_list'
+   gpsro_out_file         = 'obs_seq.gpsro'
+   ray_ds                 = 5000.0
+   ray_htop               = 15000.0
+  /
 

Modified: DART/branches/tiegcm/observations/gps/convert_cosmic_iono_cdf.f90
===================================================================
--- DART/branches/tiegcm/observations/gps/convert_cosmic_iono_cdf.f90	2017-08-24 18:58:02 UTC (rev 11907)
+++ DART/branches/tiegcm/observations/gps/convert_cosmic_iono_cdf.f90	2017-08-24 21:06:31 UTC (rev 11908)
@@ -6,8 +6,6 @@
 
 !> a version of the netcdf -> dart obs_seq converter for ionosphere profiles
 !> the file type from the CDAAC data site is 'ionPrf'.
-!>
-!> i don't know where the obs errors are going to come from. 
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
@@ -68,19 +66,19 @@
 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=512) :: msgstring
+character (len=256) :: next_infile
 character (len=80)  :: name
 character (len=19)  :: datestr
 character (len=6)   :: subset
-integer :: rcode, ncid, varid, nlevels, k, nfiles, num_new_obs,  &
+integer :: ncid, varid, nlevels, k, nfiles, num_new_obs,  &
            aday, asec, dday, dsec, oday, osec,                   &
            iyear, imonth, iday, ihour, imin, isec,               &
-           glat, glon, zloc, obs_num, io, iunit, nobs, filenum, dummy
+           zloc, obs_num, io, iunit, nobs, filenum, dummy
 logical :: file_exist, first_obs, did_obs, from_list = .false.
 real(r8) :: hght_miss,  elec_miss, err, oerr,               & 
-            qc, lato, lono, hghto, eleco, wght, nx, ny,   & 
-            nz, ds, htop, rfict, obsval, phs, obs_val(1), qc_val(1)
+            qc, lato, lono, hghto, eleco, wght, & 
+            obsval, obs_val(1), qc_val(1)
             
 
 real(r8), allocatable :: lat(:), lon(:), hght(:), elec(:), & 
@@ -97,22 +95,21 @@
 !  Declare namelist parameters
 !------------------------------------------------------------------------
 
-integer, parameter :: nmaxlevels = 20000   !  max number of observation levels
+integer, parameter :: NMAXLEVELS = 20000   !  max number of observation levels
 
-logical  :: local_operator = .true.   ! see html file for more on non/local
+!>@todo change overwrite_time default to .false.
 logical  :: overwrite_time = .true.   !false.  ! careful - see note below
-real(r8) :: obs_levels(nmaxlevels) = -1.0_r8
+real(r8) :: obs_levels(NMAXLEVELS) = -1.0_r8
 !real(r8) :: obs_window = 0.250      ! accept obs within +/- hours from anal time
 real(r8) :: obs_window = 0.5
-character(len=128) :: gpsro_netcdf_file     = 'cosmic_gps_input.nc'
-character(len=128) :: gpsro_netcdf_filelist = 'cosmic_gps_input_list'
-character(len=128) :: gpsro_out_file        = 'obs_seq.gpsro'
+character(len=256) :: input_file      = ''
+character(len=256) :: input_file_list = 'file_list.txt'
+character(len=256) :: output_file     = 'obs_seq.out'
 
-namelist /convert_cosmic_iono_nml/ obs_levels, local_operator, obs_window, &
-                                  gpsro_netcdf_file,    &
-                                  gpsro_netcdf_filelist, gpsro_out_file