[Dart-dev] DART/branches Revision: 12843

[dart at ucar.edu]

hendric at ucar.edu
2018-09-24 09:25:49 -0600 (Mon, 24 Sep 2018)
59

working version of the test_read_write_restarts program.




Modified: DART/branches/rma_fix_broken/developer_tests/io/test_cf_conventions.f90
===================================================================
--- DART/branches/rma_fix_broken/developer_tests/io/test_cf_conventions.f90	2018-09-21 22:31:03 UTC (rev 12842)
+++ DART/branches/rma_fix_broken/developer_tests/io/test_cf_conventions.f90	2018-09-24 15:25:49 UTC (rev 12843)
@@ -6,7 +6,7 @@
 
 program test_cf_conventions
 
-use             types_mod, only : r8, i8, MISSING_R8 
+use             types_mod, only : r4, r8, i8, MISSING_R8 , MISSING_R4
 use         utilities_mod, only : register_module, error_handler, E_MSG, E_ERR
 use  adaptive_inflate_mod, only : adaptive_inflate_init
 use     mpi_utilities_mod, only : initialize_mpi_utilities, finalize_mpi_utilities
@@ -53,7 +53,8 @@
 character(len=NF90_MAX_NAME) :: var_units, blank_string, var_att_name
 
 integer  :: missINT
-real(r8) :: var_offset, var_scale_factor
+real(r4) :: missR4
+real(r8) :: missR8, var_offset, var_scale_factor
 
 integer :: ENS_MEAN_COPY           
 integer :: ENS_SD_COPY             
@@ -173,15 +174,15 @@
 call get_missing_value(domid,1,missINT)
 call assert_equal(missINT, -77,                   'variable1:get_missing_value')
 
-call get_missing_value(domid,2,missR4)
-call assert_equal(missR4, -777.77_r4,             'variable2:get_missing_value')
+call get_missing_value(domid,2,missr4)
+call assert_equal(missr4, -777.77_r4,             'variable2:get_missing_value')
 
-call get_missing_value(domid,3,missR8)
-call assert_equal(missR8, -88888.88888_r8,        'variable3:get_missing_value')
+call get_missing_value(domid,3,missr8)
+call assert_equal(missr8, -88888.88888_r8,        'variable3:get_missing_value')
 
 ! ! variable 4 has no missing value this will fail
-! call get_missing_value(domid,4,missR8)
-! call assert_equal(missR8, -88888.88888_r8,        'variable4:get_missing_value')
+! call get_missing_value(domid,4,missr8)
+! call assert_equal(missr8, -88888.88888_r8,        'variable4:get_missing_value')
 
 write(*,*)'Testing get_FillValue'
 
@@ -188,14 +189,14 @@
 call get_FillValue(domid,1,missINT)
 call assert_equal(missINT, -77,                   'variable1:get_FillValue')
 
-call get_FillValue(domid,2,missR4)
-call assert_equal(missR4, -777.77_r4,             'variable2:get_FillValue')
+call get_FillValue(domid,2,missr4)
+call assert_equal(missr4, -777.77_r4,             'variable2:get_FillValue')
 
-call get_FillValue(domid,3,missR8)
-call assert_equal(missR8, -88888.88888_r8,        'variable3:get_FillValue')
+call get_FillValue(domid,3,missr8)
+call assert_equal(missr8, -88888.88888_r8,        'variable3:get_FillValue')
 
 ! ! variable 4 has no _FillValue this will fail
-! call get_FillValue(domid,4,missR8)
+! call get_FillValue(domid,4,missr8)
 ! call assert_equal(missR8, -88888.88888_r8,        'variable4:get_FillValue')
 
 write(*,*)'Testing offset and scale factor'
@@ -207,7 +208,7 @@
 ! call assert_equal(var_offset, 2.0_r8,            'variable3:get_var_offset')
 ! 
 ! var_offset = get_add_offset(domid,4)
-! call assert_equal(var_offset, MISSING_R8 ,       'variable4:get_var_offset')
+! call assert_equal(var_offset, missr8 ,       'variable4:get_var_offset')
 ! 
 ! 
 ! var_scale_factor = get_scale_factor(domid,3)
@@ -214,7 +215,7 @@
 ! call assert_equal(var_scale_factor, 0.2_r8 ,     'variable3:get_scale_factor')
 ! 
 ! var_scale_factor = get_scale_factor(domid,4)
-! call assert_equal(var_scale_factor, MISSING_R8 , 'variable3:get_scale_factor')
+! call assert_equal(var_scale_factor, missr8 , 'variable3:get_scale_factor')
 
 write(*,*)' '
 write(*,*)'======================================================================'

Modified: DART/branches/rma_fix_broken/developer_tests/io/test_read_write_restarts.f90
===================================================================
--- DART/branches/rma_fix_broken/developer_tests/io/test_read_write_restarts.f90	2018-09-21 22:31:03 UTC (rev 12842)
+++ DART/branches/rma_fix_broken/developer_tests/io/test_read_write_restarts.f90	2018-09-24 15:25:49 UTC (rev 12843)
@@ -6,21 +6,25 @@
 
 program test_read_write_restarts
 
-use        types_mod, only : r8, i8
+use        types_mod, only : r8, i8, vtablenamelength
 use    utilities_mod, only : register_module, error_handler, E_ERR, E_MSG,       &
                              open_file, close_file, nc_check, get_next_filename, &
                              find_namelist_in_file, check_namelist_read,         &
-                             do_nml_file, do_nml_term, nmlfileunit,              &
+                             do_nml_file, do_nml_term, nmlfileunit, to_upper,    &
                              initialize_utilities, finalize_utilities
-use mpi_utilities_mod, only : initialize_mpi_utilities, finalize_mpi_utilities,       &