[Dart-dev] DART/branches Revision: 12841

[dart at ucar.edu]

hendric at ucar.edu
2018-09-21 11:39:36 -0600 (Fri, 21 Sep 2018)
41

working version of test_cf_conventions




Modified: DART/branches/rma_fix_broken/assimilation_code/modules/io/io_filenames_mod.f90
===================================================================
--- DART/branches/rma_fix_broken/assimilation_code/modules/io/io_filenames_mod.f90	2018-09-20 22:35:32 UTC (rev 12840)
+++ DART/branches/rma_fix_broken/assimilation_code/modules/io/io_filenames_mod.f90	2018-09-21 17:39:36 UTC (rev 12841)
@@ -303,6 +303,7 @@
    esize = SIZE(restart_files,1)
    file_info%stage_metadata%filenames(1:esize,:) = restart_files(:,:)
 endif
+
 if(present(root_name))                  file_info%root_name                     = root_name
 if(present(check_output_compatibility)) file_info%check_output_compatibility    = check_output_compatibility
 file_info%initialized = .true.

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-20 22:35:32 UTC (rev 12840)
+++ DART/branches/rma_fix_broken/developer_tests/io/test_cf_conventions.f90	2018-09-21 17:39:36 UTC (rev 12841)
@@ -6,33 +6,23 @@
 
 program test_cf_conventions
 
-use             types_mod, only : r4, r8, i8, metadatalength, MISSING_R8 
+use             types_mod, only : r8, i8, MISSING_R8 
 use         utilities_mod, only : register_module, error_handler, E_MSG, E_ERR
-use  adaptive_inflate_mod, only : adaptive_inflate_init, &
-                                  adaptive_inflate_type
-use     mpi_utilities_mod, only : initialize_mpi_utilities, &
-                                  finalize_mpi_utilities
-use       assim_model_mod, only : static_init_assim_model, &
-                                  get_model_size
-use   state_vector_io_mod, only : read_state, write_state
-use  ensemble_manager_mod, only : init_ensemble_manager, &
-                                  ensemble_type, &
+use  adaptive_inflate_mod, only : adaptive_inflate_init
+use     mpi_utilities_mod, only : initialize_mpi_utilities, finalize_mpi_utilities
+use       assim_model_mod, only : static_init_assim_model, get_model_size
+use   state_vector_io_mod, only : read_state, write_state, state_vector_io_init 
+use  ensemble_manager_mod, only : init_ensemble_manager, ensemble_type,        &
                                   set_num_extra_copies
-use      io_filenames_mod, only : io_filenames_init, &
-                                  io_filenames_finalize, &
-                                  file_info_type, &
-                                  get_output_file
-use   state_structure_mod, only : get_xtype,             &
-                                  get_units,             &
-                                  get_long_name,         &
-                                  get_short_name,        &
-                                  get_has_missing_value, &
-                                  get_FillValue,         &
-                                  get_missing_value,     &
-                                  get_add_offset,        &
-                                  get_scale_factor
-use      time_manager_mod, only : time_type, &
-                                  set_time
+use      io_filenames_mod, only : io_filenames_init, io_filenames_finalize,    &
+                                  file_info_type, netcdf_file_type, READ_COPY, &
+                                  set_file_metadata, set_io_copy_flag
+use   state_structure_mod, only : get_xtype,  get_units, get_long_name,        &
+                                  get_short_name, get_has_missing_value,       &
+                                  get_FillValue, get_missing_value,            &
+                                  get_add_offset, get_scale_factor,            &
+                                  add_domain, state_structure_info
+use      time_manager_mod, only : time_type, set_time
 use            filter_mod, only : filter_set_initial_time
 use            assert_mod, only : assert_equal
 
@@ -46,44 +36,47 @@
 character(len=32 ), parameter :: revision = "$Revision$"
 character(len=128), parameter :: revdate  = "$Date$"
 
-logical, save :: module_initialized = .false.
-
 type(ensemble_type)         :: ens_handle
 type(file_info_type)        :: file_info_input
-type(file_info_type)        :: file_info_output
 type(time_type)             :: time1
-type(adaptive_inflate_type) :: prior_inflate_handle, post_inflate_handle
-type(netcdf_file_type)      :: PriorStateUnit_handle, PosteriorStateUnit_handle
 type(time_type)             :: curr_ens_time
+character(len=256)          :: test_file(1) = "cf_test.nc"
 
+
 integer(i8) :: model_size
 integer     :: ens_size, num_extras, num_copies
 
 logical :: read_time_from_file
 
-integer :: num_output_state_members = 3
-integer :: output_state_mean_index, output_state_spread_index
-
-logical :: output_inflation  = .true. ! This is for the diagnostic files, no separate option for prior and posterior
-
 integer :: domid = 1 ! only one domain
 integer :: var_xtype
 character(len=NF90_MAX_NAME) :: var_units, blank_string, var_att_name
 
 integer  :: missINT
-real(r4) :: missR4
-real(r8) :: missR8, var_offset, var_scale_factor
+real(r8) :: var_offset, var_scale_factor