[Dart-dev] DART/branches Revision: 11760

[dart at ucar.edu]

hendric at ucar.edu
2017-06-22 17:11:04 -0600 (Thu, 22 Jun 2017)
49

merging most recent changes from the rma_trunk




Index: DART/branches/rma_par_single_file
===================================================================
--- DART/branches/rma_par_single_file	2017-06-22 23:09:39 UTC (rev 11759)
+++ DART/branches/rma_par_single_file	2017-06-22 23:11:04 UTC (rev 11760)

Property changes on: DART/branches/rma_par_single_file
___________________________________________________________________
Modified: svn:mergeinfo
## -14,6 +14,7 ##
 /DART/branches/rma_fixed_filenames:10708-10901
 /DART/branches/rma_kinds_to_state_structure:8958-9437
 /DART/branches/rma_kinds_to_state_strucutre:8909-8957
+/DART/branches/rma_mmc:11731-11755
 /DART/branches/rma_model_mod_check:8965-9178
 /DART/branches/rma_mpas_fold_mean_fwd:9348-9458
 /DART/branches/rma_mpas_get_state_meta_data:8871-8890
## -30,7 +31,7 ##
 /DART/branches/rma_sprint:8101-8172
 /DART/branches/rma_state_structure_test_dir:9478-9682
 /DART/branches/rma_state_structure_unit_test:9697-10274
-/DART/branches/rma_trunk:11685-11706
+/DART/branches/rma_trunk:11685-11759
 /DART/branches/rma_trunk_clamping:8792-8807
 /DART/branches/rma_trunk_filename:8017-8163
 /DART/branches/rma_trunk_get_state_fun:8574-8602
\ No newline at end of property
Modified: DART/branches/rma_par_single_file/assimilation_code/location/column/location_mod.f90
===================================================================
--- DART/branches/rma_par_single_file/assimilation_code/location/column/location_mod.f90	2017-06-22 23:09:39 UTC (rev 11759)
+++ DART/branches/rma_par_single_file/assimilation_code/location/column/location_mod.f90	2017-06-22 23:11:04 UTC (rev 11760)
@@ -8,9 +8,10 @@
 
 ! Implements location interfaces for a one dimensional column domain
 
-use      types_mod, only : r8, MISSING_R8, MISSING_I
-use  utilities_mod, only : register_module, error_handler, E_ERR, ascii_file_format, &
-                           nc_check
+use            types_mod, only : i8, r8, MISSING_R8, MISSING_I
+use ensemble_manager_mod, only : ensemble_type
+use        utilities_mod, only : register_module, error_handler, E_ERR, ascii_file_format, &
+                                 nc_check
 
 implicit none
 private

Modified: DART/branches/rma_par_single_file/assimilation_code/modules/io/dart_time_io_mod.f90
===================================================================
--- DART/branches/rma_par_single_file/assimilation_code/modules/io/dart_time_io_mod.f90	2017-06-22 23:09:39 UTC (rev 11759)
+++ DART/branches/rma_par_single_file/assimilation_code/modules/io/dart_time_io_mod.f90	2017-06-22 23:11:04 UTC (rev 11760)
@@ -228,7 +228,7 @@
    ! check to see if there is a time dimension
    ios = nf90_inq_dimid(ncid, "time", dimIds(1))
 
-   ! if Time dimension does not exist create it
+   ! if time dimension does not exist create it
    if (ios /= NF90_NOERR) then
       call nc_check(nf90_def_dim(ncid, "time", nf90_unlimited, dimIds(1)), &
         "write_model_time def_var dimension time")

Modified: DART/branches/rma_par_single_file/assimilation_code/modules/io/io_filenames_mod.f90
===================================================================
--- DART/branches/rma_par_single_file/assimilation_code/modules/io/io_filenames_mod.f90	2017-06-22 23:09:39 UTC (rev 11759)
+++ DART/branches/rma_par_single_file/assimilation_code/modules/io/io_filenames_mod.f90	2017-06-22 23:11:04 UTC (rev 11760)
@@ -488,8 +488,8 @@
 
 ! check that the number of domains matches the size of file names provided
 if (get_num_domains() /= size(fnames(:),1)) then
-   write(msgstring,'(A,I2,A,I2)') 'num domains ', get_num_domains(), &
-                                  ' /= size(fnames) : ', size(fnames(:),1)
+   write(msgstring,'(A,I2,A,I2)') 'The number of domains, ', get_num_domains(), &
+                                  ', does not match the number of filenames, ', size(fnames(:),1)
    call error_handler(E_ERR, 'set_explicit_file_metadata', msgstring, &
                       source, revision, revdate)
 endif
@@ -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