[Dart-dev] DART/branches Revision: 11778

[dart at ucar.edu]

hendric at ucar.edu
2017-06-28 14:19:57 -0600 (Wed, 28 Jun 2017)
147

changes from the final code review. minor changes to variable names and
comments.

updated change log for when we merge back into the rma_trunk.




Modified: DART/branches/rma_par_single_file/CHANGELOG
===================================================================
--- DART/branches/rma_par_single_file/CHANGELOG	2017-06-27 19:15:41 UTC (rev 11777)
+++ DART/branches/rma_par_single_file/CHANGELOG	2017-06-28 20:19:57 UTC (rev 11778)
@@ -457,10 +457,21 @@
 your existing namelists or obs_diag will error out right away.
 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+ XXX YY 2017 :: $Revision$
++ June 28th 2017 :: $Revision$
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
+Now we are able to run 'single_file_in' and 'single_file_out' with MPI.
 
+single_file_io_mod.f90 has been removed and its functionality has been moved 
+to direct_netcdf_mod.f90.  
+
+single_file_io_mod.f90 has been removed from all of the path_names_* files.
+
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ Jun YY 2017 :: $Revision$
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+
 # <next few lines under version control, do not edit>
 # $URL$
 # $Revision$

Modified: DART/branches/rma_par_single_file/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90
===================================================================
--- DART/branches/rma_par_single_file/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90	2017-06-27 19:15:41 UTC (rev 11777)
+++ DART/branches/rma_par_single_file/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90	2017-06-28 20:19:57 UTC (rev 11778)
@@ -32,8 +32,6 @@
                                   do_output, find_namelist_in_file, check_namelist_read,      &
                                   open_file, close_file, do_nml_file, do_nml_term, to_upper
 
-use netcdf_utilities_mod,  only : nc_get_num_times
-
 use assim_model_mod,       only : static_init_assim_model, get_model_size,                    &
                                   end_assim_model,  pert_model_copies
 
@@ -83,7 +81,8 @@
                                   query_copy_present, COPY_NOT_PRESENT, &
                                   READ_COPY, WRITE_COPY, READ_WRITE_COPY
 
-use direct_netcdf_mod,     only : finalize_single_file_io, write_augmented_state
+use direct_netcdf_mod,     only : finalize_single_file_io, write_augmented_state, &
+                                  nc_get_num_times
 
 use forward_operator_mod,  only : get_obs_ens_distrib_state
 

Modified: DART/branches/rma_par_single_file/assimilation_code/modules/io/direct_netcdf_mod.f90
===================================================================
--- DART/branches/rma_par_single_file/assimilation_code/modules/io/direct_netcdf_mod.f90	2017-06-27 19:15:41 UTC (rev 11777)
+++ DART/branches/rma_par_single_file/assimilation_code/modules/io/direct_netcdf_mod.f90	2017-06-28 20:19:57 UTC (rev 11778)
@@ -98,9 +98,10 @@
                                  netcdf_file_type, READ_COPY, WRITE_COPY, &
                                  noutput_state_variables
 
-use assim_model_mod,      only : get_model_size
+use assim_model_mod,      only : get_model_size, read_model_time, write_model_time
 
-use model_mod,            only : read_model_time, write_model_time, nc_write_model_atts
+!>@todo FIXME : should move to assim_model_mod.f90
+use model_mod,            only : nc_write_model_atts
 
 use typesizes
 
@@ -549,7 +550,7 @@
    is_member_copy = (icopy <= ens_size)
 
    ! check that copy infomation is valid
-   if ( is_member_copy ) call check_member_info(my_ncid, fname, ens_size, do_perturb)
+   if ( is_member_copy ) call check_singlefile_member_info(my_ncid, fname, ens_size, do_perturb)
 
    ! starting position in the copies array
    start_pos  = 1
@@ -620,7 +621,7 @@
                                     start_pos, end_pos)
             endif ! is_sender
 
-            ! update starting point
+            ! update starting point in the state vector
             start_pos = start_pos + elm_count
 
          elseif ( is_sender ) then ! send variables to receivers
@@ -679,6 +680,7 @@
 else
    allocate(temp_ens(1))
 endif
+
  ! SINGLE_IO_TASK_ID writes out all files
 if (my_task_id() == SINGLE_IO_TASK_ID) then
   
@@ -703,28 +705,28 @@
    my_ncid = ncFileID%ncid
 endif 
 
-   num_output_ens = noutput_state_variables(file_handle)
+num_output_ens = noutput_state_variables(file_handle)