[Dart-dev] DART/branches Revision: 11994

[dart at ucar.edu]

thoar at ucar.edu
2017-10-17 15:40:16 -0600 (Tue, 17 Oct 2017)
470
location_io_mod.f90 : better reporting of context in error messages
state_struction_mod.f90 : more informative error message when trying to load variables
obs_seq_to_netcdf.f90 : improved readability by removing unnecessary comments 
obs_def_upper_atm_mod.f90 : added quantity used obs_converters/gps  routines.
model_mod_check.f90 : adding a new namelist that allows selective testing 
                      instead of simple sequential tests, updated documentation. 




Modified: DART/branches/rma_trunk/assimilation_code/location/utilities/location_io_mod.f90
===================================================================
--- DART/branches/rma_trunk/assimilation_code/location/utilities/location_io_mod.f90	2017-10-17 21:32:50 UTC (rev 11993)
+++ DART/branches/rma_trunk/assimilation_code/location/utilities/location_io_mod.f90	2017-10-17 21:40:16 UTC (rev 11994)
@@ -75,7 +75,7 @@
 
 integer :: LocDimID, LDimID, VarID
 integer :: rc
-character(len=32) :: context = 'nc_write_location_atts'
+character(len=*), parameter :: context = 'location_io_mod:nc_write_location_atts'
 
 ! get an id for the location dimension:  
 !  if the user passes us in a dimension id, 
@@ -130,7 +130,7 @@
 
 integer :: VarID
 integer :: rc, ndims
-character(len=32) :: context = 'nc_add_location_atts'
+character(len=*), parameter :: context = 'location_io_mod:nc_add_location_atts'
 
 integer :: dimids(NF90_MAX_VAR_DIMS)
 
@@ -179,7 +179,7 @@
 character(len=*), optional,  intent(in) :: fname       ! file name (for printing purposes)
 
 integer :: VarID, dimID, rc
-character(len=32) :: context = 'nc_write_location_vert'
+character(len=*), parameter :: context = 'location_io_mod:nc_write_location_vert'
 
 ! if they give us the dimension the 'locations' array is using,
 ! use that.  otherwise default to the unlimited dimension for this variable.

Modified: DART/branches/rma_trunk/assimilation_code/modules/io/state_structure_mod.f90
===================================================================
--- DART/branches/rma_trunk/assimilation_code/modules/io/state_structure_mod.f90	2017-10-17 21:32:50 UTC (rev 11993)
+++ DART/branches/rma_trunk/assimilation_code/modules/io/state_structure_mod.f90	2017-10-17 21:40:16 UTC (rev 11994)
@@ -528,8 +528,8 @@
    ret = nf90_inq_varid(ncfile, domain%variable(ivar)%varname,    &
                                 domain%variable(ivar)%io_info%netcdf_id)
 
-   call nc_check(ret, 'load_variable_ids, nf90_inq_var_id', &
-                 trim(domain%variable(ivar)%varname))
+   write(string1,*)'domain variable number ',ivar,' "'//trim(domain%variable(ivar)%varname)//'" from file "'//trim(domain%info_file)//'"'
+   call nc_check(ret, 'load_variable_ids, nf90_inq_var_id', string1) 
 
 enddo
 
@@ -1163,7 +1163,7 @@
 
 integer, intent(in)  :: unlimited_dimId
 
-call error_handler(E_ERR, 'add_time_unlimited', 'does not exist')
+call error_handler(E_ERR, 'add_time_unlimited', 'routine does not exist')
 
 end subroutine add_time_unlimited
 

Modified: DART/branches/rma_trunk/assimilation_code/programs/model_mod_check/model_mod_check.f90
===================================================================
--- DART/branches/rma_trunk/assimilation_code/programs/model_mod_check/model_mod_check.f90	2017-10-17 21:32:50 UTC (rev 11993)
+++ DART/branches/rma_trunk/assimilation_code/programs/model_mod_check/model_mod_check.f90	2017-10-17 21:40:16 UTC (rev 11994)
@@ -29,13 +29,14 @@
 
 use       assim_model_mod, only : static_init_assim_model
 
-use      time_manager_mod, only : time_type, set_time, print_time, print_date, operator(-)
+use      time_manager_mod, only : time_type, set_time, print_time, print_date, operator(-), &
+                                  get_calendar_type, NO_CALENDAR
 
 use  ensemble_manager_mod, only : init_ensemble_manager, ensemble_type
 
 use   state_vector_io_mod, only : state_vector_io_init, read_state, write_state
 
-use   state_structure_mod, only : get_num_domains
+use   state_structure_mod, only : get_num_domains, get_model_variable_indices
 
 use      io_filenames_mod, only : io_filenames_init, file_info_type,       &
                                   stage_metadata_type, get_stage_metadata, &
@@ -60,6 +61,8 @@
 character(len=32 ), parameter :: revision = "$Revision$"
 character(len=128), parameter :: revdate  = "$Date$"
 
+integer, parameter :: MAX_TESTS = 15
+
 !------------------------------------------------------------------
 ! The namelist variables
 !------------------------------------------------------------------
@@ -68,19 +71,20 @@
 integer                       :: num_ens = 1
 character(len=256)            :: input_state_files(MAX_NUM_DOMS)  = 'null'
 character(len=256)            :: output_state_files(MAX_NUM_DOMS) = 'null'
-
+character(len=256)            :: all_metadata_file = 'metadata.txt'
 integer(i8)                   :: x_ind   = -1
 real(r8), dimension(3)        :: loc_of_interest = -1.0_r8
 character(len=metadatalength) :: kind_of_interest = 'ANY'
 character(len=metadatalength) :: interp_test_vertcoord = 'VERTISHEIGHT'
 logical                       :: verbose = .FALSE.
-integer                       :: test1thru = 1
-real(r8)               :: interp_test_dlat  = 10.0
-real(r8)               :: interp_test_dlon  = 10.0