[Dart-dev] DART/branches Revision: 11791

[dart at ucar.edu]

hendric at ucar.edu
2017-07-06 10:14:07 -0600 (Thu, 06 Jul 2017)
30

syncing with the rma_trunk.




Index: DART/branches/rma_file_list_nml
===================================================================
--- DART/branches/rma_file_list_nml	2017-07-05 17:30:40 UTC (rev 11790)
+++ DART/branches/rma_file_list_nml	2017-07-06 16:14:07 UTC (rev 11791)

Property changes on: DART/branches/rma_file_list_nml
___________________________________________________________________
Modified: svn:mergeinfo
## -32,7 +32,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:11729-11783
+/DART/branches/rma_trunk:11729-11790
 /DART/branches/rma_trunk_clamping:8792-8807
 /DART/branches/rma_trunk_filename:8017-8163
 /DART/branches/rma_trunk_get_state_fun:8574-8602
Modified: DART/branches/rma_file_list_nml/assimilation_code/modules/assimilation/filter_mod.html
===================================================================
--- DART/branches/rma_file_list_nml/assimilation_code/modules/assimilation/filter_mod.html	2017-07-05 17:30:40 UTC (rev 11790)
+++ DART/branches/rma_file_list_nml/assimilation_code/modules/assimilation/filter_mod.html	2017-07-06 16:14:07 UTC (rev 11791)
@@ -538,7 +538,6 @@
 io_filenames_mod
 forward_operator_mod
 quality_control_mod
-single_file_io_mod
 </PRE>
 
 <P><!-- make sure the 'top' is aligned correctly --></P>

Modified: DART/branches/rma_file_list_nml/assimilation_code/modules/io/io_filenames_mod.f90
===================================================================
--- DART/branches/rma_file_list_nml/assimilation_code/modules/io/io_filenames_mod.f90	2017-07-05 17:30:40 UTC (rev 11790)
+++ DART/branches/rma_file_list_nml/assimilation_code/modules/io/io_filenames_mod.f90	2017-07-06 16:14:07 UTC (rev 11791)
@@ -324,7 +324,7 @@
 type(ensemble_type),   intent(in)    :: ens_handle
 
 integer :: num_domains
-integer :: idom, i ! loop variables
+integer :: idom, icopy ! loop variables
 
 integer :: copy
 
@@ -332,8 +332,8 @@
 
 ! check that the netcdf files match the variables for this domain
 ! to prevent overwriting unwanted files.
-do i = 1, ens_handle%my_num_copies ! just have owners check
-   copy = ens_handle%my_copies(i)
+do icopy = 1, ens_handle%my_num_copies ! just have owners check
+   copy = ens_handle%my_copies(icopy)
    do idom = 1, num_domains
       print*, my_task_id(), copy, idom
       if(file_exist(file_info%stage_metadata%filenames(copy,idom))) &

Modified: DART/branches/rma_file_list_nml/assimilation_code/modules/utilities/mpi_utilities_mod.f90
===================================================================
--- DART/branches/rma_file_list_nml/assimilation_code/modules/utilities/mpi_utilities_mod.f90	2017-07-05 17:30:40 UTC (rev 11790)
+++ DART/branches/rma_file_list_nml/assimilation_code/modules/utilities/mpi_utilities_mod.f90	2017-07-06 16:14:07 UTC (rev 11791)
@@ -34,7 +34,7 @@
 ! Use one but not both.   The 'use' line must be before the 'implicit none' 
 ! and 'private' lines, 'include' must come after.  Go figure.
 ! For more help on compiling a module which uses MPI see the 
-! $DART/doc/mpi directory. 
+! $DART/developer_tests/mpi_utilities/tests/README
 
 use mpi
 

Modified: DART/branches/rma_file_list_nml/documentation/html/mpi_intro.html
===================================================================
--- DART/branches/rma_file_list_nml/documentation/html/mpi_intro.html	2017-07-05 17:30:40 UTC (rev 11790)
+++ DART/branches/rma_file_list_nml/documentation/html/mpi_intro.html	2017-07-06 16:14:07 UTC (rev 11791)
@@ -180,8 +180,9 @@
 more complicated than running a single executable.  There are a suite
 of small test programs to help diagnose any problems encountered in 
 trying to run the new version of DART.   Look in 
-<em class=file>$DART/mpi_utilities/tests</em> for
-the README and a set of tests to narrow down any difficulties.
+<a href="../../developer_tests/mpi_utilities/tests/README">
+developer_tests/mpi_utilities/tests/README</a> for
+instructions and a set of tests to narrow down any difficulties.
 </P>
 
 <H3>Performance issues and timing results</H3>

Modified: DART/branches/rma_file_list_nml/models/9var/work/input.nml
===================================================================
--- DART/branches/rma_file_list_nml/models/9var/work/input.nml	2017-07-05 17:30:40 UTC (rev 11790)
+++ DART/branches/rma_file_list_nml/models/9var/work/input.nml	2017-07-06 16:14:07 UTC (rev 11791)
@@ -191,9 +191,9 @@
    init_skip_seconds     = 0,
    Nregions              = 3,
    trusted_obs           = 'null',
-   lonlim1               = 0.00, 0.00, 0.50, -1.0,
-   lonlim2               = 1.01, 0.50, 1.01, -1.0,
-   reg_names             = 'whole', 'yin', 'yang', 'bogus',
+   lonlim1               = 0.00, 0.00, 0.50
+   lonlim2               = 1.01, 0.50, 1.01
+   reg_names             = 'whole', 'yin', 'yang'
    create_rank_histogram = .true.,