[Dart-dev] DART/branches Revision: 12235

[dart at ucar.edu]

thoar at ucar.edu
2017-12-21 18:52:25 -0700 (Thu, 21 Dec 2017)
225
Made a new module 'model_check_mod.f90' that has routines common
to the oned, twod, and threed_cartesian 'test_interpolate_*.f90' codes.
Added to the path_names files.

Improved formatting to avoid really long output lines.




Modified: DART/branches/mmc/assimilation_code/modules/io/state_structure_mod.f90
===================================================================
--- DART/branches/mmc/assimilation_code/modules/io/state_structure_mod.f90	2017-12-22 00:04:43 UTC (rev 12234)
+++ DART/branches/mmc/assimilation_code/modules/io/state_structure_mod.f90	2017-12-22 01:52:25 UTC (rev 12235)
@@ -1604,7 +1604,7 @@
 write(*,'('' Number of dimensions  : '',I2)') num_dims
 write(*,'('' unlimdimid            : '',I2)') get_unlimited_dimid(dom_id)
 do jdim = 1, num_dims
-   write(*,*)'dimension counter, ID, length, name = ',jdim, &
+   write(*,200) jdim, &
              get_io_unique_dim_ID(    dom_id,jdim), &
              get_io_unique_dim_length(dom_id,jdim), &
         trim(get_io_unique_dim_name(  dom_id,jdim))
@@ -1611,6 +1611,8 @@
 enddo
 write(*,*)
 
+200 format(4x,i2,': dim_id =',I2,', length = ',I8,', name = "',A,'"')
+
 ! report on each variable in this domain
 
 num_vars = get_num_variables(dom_id)
@@ -1634,9 +1636,7 @@
    array_lengths(1:num_dims) = get_dim_lengths(dom_id,ivar)
    do jdim = 1, num_dims
        dim_name = get_dim_name(dom_id, ivar, jdim)
-       write(*,'("       state   dim_id[",I2,"] ",A15,", length = ",I8)') jdim, &
-                                                                          trim(dim_name), &
-                                                                          array_lengths(jdim)
+       write(*,200) jdim, jdim, array_lengths(jdim), trim(dim_name)
    enddo
 
    ! Report on the native dimensions in the original netCDF file
@@ -1648,9 +1648,7 @@
    array_lengths(1:num_dims) = get_io_dim_lengths(dom_id,ivar)
    do jdim = 1, num_dims
        dim_name = get_dim_name(dom_id, ivar, jdim)
-       write(*,'("       netCDF  dim_id[",I2,"] ",A15,", length = ",I8)') array_ids(jdim), &
-                                                                          trim(dim_name), &
-                                                                          array_lengths(jdim)
+       write(*,200) jdim, array_ids(jdim), array_lengths(jdim), trim(dim_name)
    enddo
 
 

Modified: DART/branches/mmc/assimilation_code/programs/model_mod_check/model_mod_check.f90
===================================================================
--- DART/branches/mmc/assimilation_code/programs/model_mod_check/model_mod_check.f90	2017-12-22 00:04:43 UTC (rev 12234)
+++ DART/branches/mmc/assimilation_code/programs/model_mod_check/model_mod_check.f90	2017-12-22 01:52:25 UTC (rev 12235)
@@ -21,7 +21,7 @@
 
 use     mpi_utilities_mod, only : initialize_mpi_utilities, finalize_mpi_utilities
 
-use          location_mod, only : location_type, write_location
+use          location_mod, only : location_type, set_location, write_location
 
 use          obs_kind_mod, only : get_index_for_quantity, get_name_for_quantity
 
@@ -77,7 +77,7 @@
 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) :: quantity_of_interest = 'ANY'
+character(len=metadatalength) :: quantity_of_interest = 'NONE'
 character(len=metadatalength) :: interp_test_vertcoord = 'VERTISHEIGHT'
 logical                       :: verbose = .FALSE.
 integer                       :: test1thru = MAX_TESTS
@@ -124,7 +124,9 @@
 
 ! misc. variables
 integer :: idom, imem, num_passed, num_failed, num_domains, idomain
+integer :: quantity_index
 logical :: cartesian = .false.
+type(location_type) :: location
 
 ! message strings
 character(len=512) :: my_base, my_desc
@@ -289,7 +291,6 @@
    write(*,'(A)') '-- printing model time --------------------------------------'
    call print_time( model_time,' model_mod_check:model time')
    write(*,'(A)') '-------------------------------------------------------------'
-   write(*,'(A)') ''
 
    call print_test_message('TEST 2', ending=.true.)
 
@@ -303,11 +304,8 @@
 
 if (tests_to_run(3)) then
 
-   write(string1,*)'for state index ',x_ind
-
    call print_test_message('TEST 3', &
                            'Testing get_state_meta_data()', &
-                           adjustl(string1), &
                            starting=.true.)
 
    if ( x_ind >= 1 .and. x_ind <= model_size ) then
@@ -418,8 +416,12 @@
    write(string1,*)'Finding the state vector index closest to a given location.'
    call print_test_message('TEST 7', string1, starting=.true.)