[Dart-dev] DART/branches Revision: 12791

[dart at ucar.edu]

thoar at ucar.edu
2018-08-28 11:59:34 -0600 (Tue, 28 Aug 2018)
176
The converters no longer need access to the dart_cice_mod.f90

Removed some unused variables and routines.
General cleanup, no logic changes.
Created matching namelist files.




Modified: DART/branches/yz-cice/observations/obs_converters/cice/cice_to_obs.f90
===================================================================
--- DART/branches/yz-cice/observations/obs_converters/cice/cice_to_obs.f90	2018-08-27 20:39:35 UTC (rev 12790)
+++ DART/branches/yz-cice/observations/obs_converters/cice/cice_to_obs.f90	2018-08-28 17:59:34 UTC (rev 12791)
@@ -35,8 +35,8 @@
                               find_namelist_in_file, check_namelist_read, &
                               nc_check, get_unit
 use  time_manager_mod, only : time_type, set_calendar_type, set_date, set_time, &
-                              operator(>=), increment_time, get_date, get_time, &
-                              operator(-), GREGORIAN, operator(+), print_date
+                              get_date, get_time, GREGORIAN, &
+                              operator(>=), operator(-), operator(+)
 use      location_mod, only : VERTISLEVEL, VERTISUNDEF
 use  obs_sequence_mod, only : obs_sequence_type, obs_type, read_obs_seq, &
                               static_init_obs_sequence, init_obs, write_obs_seq, & 
@@ -69,25 +69,26 @@
 
 implicit none
 
-character(len=11), parameter :: routine ='cice_to_obs'
+character(len=*), parameter :: routine ='cice_to_obs'
 
 ! version controlled file description for error handling, do not edit
-character(len=256), parameter :: source   = &
+character(len=*), parameter :: source   = &
    "$URL$"
-character(len=32 ), parameter :: revision = "$Revision$"
-character(len=128), parameter :: revdate  = "$Date$"
+character(len=*), parameter :: revision = "$Revision$"
+character(len=*), parameter :: revdate  = "$Date$"
 
 ! this is based on the model, not on the satellite grid.
 ! ignore this for now. LANDMASK
 !character(len=256) :: land_mask_file  = 'cice_hist.nc'
 
-character(len=256) :: input_line, input_filename, next_file, out_file
+character(len=256) :: next_file
 character(len=512) :: msgstring, msgstring1
 
-integer :: oday, osec, rcio, iunit, otype, io, rc
+integer :: oday, osec, iunit, io, rc
 integer :: year, month, day, hour, minute, second
-integer :: num_copies, num_qc, max_obs, ilon, ilat, i, j
-integer :: start_index, ncid, varid
+integer :: num_copies, num_qc, max_obs, ilon, ilat
+integer :: start_index
+! integer :: ncid, varid
            
 logical  :: file_exist, first_obs
 

Modified: DART/branches/yz-cice/observations/obs_converters/cice/modis_ist_to_obs_netcdf.f90
===================================================================
--- DART/branches/yz-cice/observations/obs_converters/cice/modis_ist_to_obs_netcdf.f90	2018-08-27 20:39:35 UTC (rev 12790)
+++ DART/branches/yz-cice/observations/obs_converters/cice/modis_ist_to_obs_netcdf.f90	2018-08-28 17:59:34 UTC (rev 12791)
@@ -14,14 +14,14 @@
 
 program modis_ist_to_obs_netcdf
 
-use         types_mod, only : r8, PI, DEG2RAD
+use         types_mod, only : r8
 use     utilities_mod, only : initialize_utilities, finalize_utilities,      &
-                              open_file, close_file, find_namelist_in_file,  &
+                              find_namelist_in_file,  &
                               check_namelist_read, nmlfileunit, do_nml_file, &
                               do_nml_term, nc_check
-use  time_manager_mod, only : time_type, set_calendar_type, set_date, set_time, &
-                              operator(>=), increment_time, get_time, &
-                              operator(-), GREGORIAN, operator(+), print_date
+use  time_manager_mod, only : time_type, set_calendar_type, &
+                              set_date, set_time, get_time, GREGORIAN, &
+                              operator(>=), operator(-), operator(+)
 use      location_mod, only : VERTISSURFACE
 use  obs_sequence_mod, only : obs_sequence_type, obs_type, read_obs_seq,     &
                               static_init_obs_sequence, init_obs,            &
@@ -34,7 +34,7 @@
 
 implicit none
 
-character(len=64), parameter :: routine = 'modis_ist_to_obs_netcdf'
+character(len=*), parameter :: routine = 'modis_ist_to_obs_netcdf'
 
 integer :: n, i, j, oday, osec, rcio, iunit, otype, io
 integer :: num_copies, num_qc, max_obs, iacc, ialo, ncid, varid
@@ -174,34 +174,32 @@
 qc_array = 0    ! making synthetic observations so assume every observation is good
 
 alongloop:  do j = 1, aydim
-
    acrossloop: do i = 1, axdim
 
-if (debug) print *, 'start of main loop, ', iacc, ialo
+      if (debug) print *, 'start of main loop, ', iacc, ialo
 
       !! check the lat/lon values to see if they are ok
-      if ( lat(i,j) >  90.0_r8 .or. lat(i,j) <  40.0_r8 ) cycle acrossloop
+      if ( lat(i,j) >  90.0_r8 .or. lat(i,j) <   40.0_r8 ) cycle acrossloop
       if ( lon(i,j) <   0.0_r8 .or. lon(i,j) >  360.0_r8 ) cycle acrossloop
 
       ! the actual data values are denser, so inner loop here