[Dart-dev] DART/branches Revision: 11735

[dart at ucar.edu]

hendric at ucar.edu
2017-06-14 17:00:38 -0600 (Wed, 14 Jun 2017)
155

everything compiles and builds now.  have run with the
bgrid with single_file = .false. successfully! need to
still verify that the results are correct.




Modified: DART/branches/rma_mmc/assimilation_code/modules/io/io_filenames_mod.f90
===================================================================
--- DART/branches/rma_mmc/assimilation_code/modules/io/io_filenames_mod.f90	2017-06-14 21:52:05 UTC (rev 11734)
+++ DART/branches/rma_mmc/assimilation_code/modules/io/io_filenames_mod.f90	2017-06-14 23:00:38 UTC (rev 11735)
@@ -1050,33 +1050,33 @@
 
 !-------------------------------------------------------
 !> Set whether a copy should be read/written for a single
-!> copy c.  Optional argument to set if the
+!> copy cnum.  Optional argument to set if the
 !> copy could have units and if the variables should be
 !> clamped.  If this information is available it grabs
 !> it from the state structure and stores it in files
 !> created from scratch.
 
 
-subroutine set_io_copy_flag_single(file_info, c, io_flag, inherit_units, &
+subroutine set_io_copy_flag_single(file_info, cnum, io_flag, inherit_units, &
                                    clamp_vars, force_copy_back)
 
 type(file_info_type),      intent(inout) :: file_info     !< stage name handle
-integer,                   intent(in)    :: c             !< start copy to read
+integer,                   intent(in)    :: cnum          !< start copy to read
 integer,                   intent(in)    :: io_flag       !< read = 1, write = 2, read/write = 3
 logical, optional,         intent(in)    :: inherit_units !< inherit units from state structure
 logical, optional,         intent(in)    :: clamp_vars
 logical, optional,         intent(in)    :: force_copy_back
 
-if (c <=0) return
+if (cnum <=0) return
 
-file_info%stage_metadata%io_flag(c)   = io_flag
+file_info%stage_metadata%io_flag(cnum)   = io_flag
 
 if(present(inherit_units)  ) &
-   file_info%stage_metadata%inherit_units( c) = inherit_units
+   file_info%stage_metadata%inherit_units(   cnum ) = inherit_units
 if(present(clamp_vars) ) &
-   file_info%stage_metadata%clamp_vars(c) = clamp_vars
+   file_info%stage_metadata%clamp_vars(      cnum ) = clamp_vars
 if(present(force_copy_back) ) &
-   file_info%stage_metadata%force_copy_back(c) = force_copy_back
+   file_info%stage_metadata%force_copy_back( cnum ) = force_copy_back
 
 end subroutine set_io_copy_flag_single
 

Modified: DART/branches/rma_mmc/models/model_mod_tools/model_mod_check.f90
===================================================================
--- DART/branches/rma_mmc/models/model_mod_tools/model_mod_check.f90	2017-06-14 21:52:05 UTC (rev 11734)
+++ DART/branches/rma_mmc/models/model_mod_tools/model_mod_check.f90	2017-06-14 23:00:38 UTC (rev 11735)
@@ -31,7 +31,7 @@
 
 use       assim_model_mod, only : static_init_assim_model
 
-use      time_manager_mod, only : time_type, set_calendar_type, GREGORIAN,      &
+use      time_manager_mod, only : time_type, get_calendar_type, set_calendar_type, GREGORIAN,      &
                                   set_time, print_time, print_date, operator(-)
 
 use  ensemble_manager_mod, only : init_ensemble_manager, ensemble_type
@@ -43,10 +43,10 @@
 
 use            filter_mod, only : filter_set_initial_time
 
-use      io_filenames_mod, only : io_filenames_init, file_info_type,        &
+use      io_filenames_mod, only : io_filenames_init, file_info_type,       &
                                   stage_metadata_type, get_stage_metadata, &
-                                  get_restart_filename, &
-                                  set_member_file_metadata, &
+                                  get_restart_filename,                    &
+                                  set_file_metadata,                       &
                                   set_io_copy_flag, READ_COPY, WRITE_COPY
                                   
 
@@ -108,15 +108,15 @@
                                input_restart_list, output_restart_list
 
 ! io variables
-integer :: iunit, io
-integer, allocatable :: ios_out(:)
-type(file_info_type) :: file_info_input, file_info_output
+integer                   :: iunit, io
+integer, allocatable      :: ios_out(:)
+type(file_info_type)      :: file_info_input, file_info_output
 type(stage_metadata_type) :: input_restart_files, output_restart_files
 logical :: read_time_from_file = .true.
-logical :: single_file = .true.
+!logical :: single_file = .true.
 
 ! model state variables
-type(ensemble_type) :: ens_handle
+type(ensemble_type)   :: ens_handle
 
 type(time_type)       :: time1, model_time
 integer               :: mykindindex
@@ -180,34 +180,62 @@
 call print_test_message('RUNNING TEST 2', &
                         'Read and write trivial restart file')
 
-call set_calendar_type(GREGORIAN)
+!my_calendar =  get_calendar_type()