[Dart-dev] svn:mergeinfo/ Revision: 11812

[dart at ucar.edu]

hendric at ucar.edu
2017-07-13 11:10:29 -0600 (Thu, 13 Jul 2017)
45

merging recent changes from the rma_trunk.




Index: DART/branches/rma_file_list_nml
===================================================================
--- DART/branches/rma_file_list_nml	2017-07-13 17:05:11 UTC (rev 11811)
+++ DART/branches/rma_file_list_nml	2017-07-13 17:10:29 UTC (rev 11812)

Property changes on: DART/branches/rma_file_list_nml
___________________________________________________________________
Modified: svn:mergeinfo
## -1,49 +1,49 ##
-/DART/branches/CM1:8567-10314
-/DART/branches/bgrid_sprint:8186-8235
-/DART/branches/bgrid_sprint_state_reorder:8206-8248
-/DART/branches/development:4672-6247
-/DART/branches/gitm:5135-6207
-/DART/branches/gitm_lanai:6563-6644
-/DART/branches/helen:5987-6153
-/DART/branches/model_mod_changes:11401-11602
-/DART/branches/rma_cam_fv:9550-9726
-/DART/branches/rma_cf_conventions:9725-10084
-/DART/branches/rma_cice:10647-10850
-/DART/branches/rma_clm:8903-9124
-/DART/branches/rma_diag:9621-9735
-/DART/branches/rma_fixed_filenames:10700-10893
-/DART/branches/rma_kinds_to_state_structure:8950-9429
-/DART/branches/rma_kinds_to_state_strucutre:8901-8949
-/DART/branches/rma_mmc:11723-11747
-/DART/branches/rma_model_mod_check:8957-9170
-/DART/branches/rma_mpas_fold_mean_fwd:9340-9450
-/DART/branches/rma_mpas_get_state_meta_data:8863-8882
-/DART/branches/rma_obs_defs:8915-9059
-/DART/branches/rma_output_files:11439-11536
-/DART/branches/rma_par_msg:9464-9503
-/DART/branches/rma_par_single_file:11677-11771
-/DART/branches/rma_pop_variable_namelist:8816-9148
-/DART/branches/rma_qc_fwd_op:9642-9715
-/DART/branches/rma_refac_io:9115-9538
-/DART/branches/rma_remove_groups_from_transpose:9319-9447
-/DART/branches/rma_roms:10149-10373
-/DART/branches/rma_set_filenames:8377-8383
-/DART/branches/rma_single_file:10896-11105
-/DART/branches/rma_sprint:8093-8164
-/DART/branches/rma_state_structure_test_dir:9470-9674
-/DART/branches/rma_state_structure_unit_test:9689-10266
-/DART/branches/rma_trunk:11721-11787
-/DART/branches/rma_trunk_clamping:8784-8799
-/DART/branches/rma_trunk_filename:8009-8155
-/DART/branches/rma_trunk_get_state_fun:8566-8594
-/DART/branches/rma_trunk_mean_ens:8514-8526
-/DART/branches/rma_trunk_mmc_fix:9318-9335
-/DART/branches/rma_trunk_mpi_get_in_utils:8559-8815
-/DART/branches/rma_trunk_pathnames:8013-8026
-/DART/branches/rma_trunk_posterior:9766-9779
-/DART/branches/rma_trunk_read_transpose:9206-9248
-/DART/branches/rma_trunk_vert_loc:8530-8535
-/DART/branches/rma_types_kinds:11200-11234
-/DART/branches/rma_updates_nancy:11613-11674
-/DART/branches/trunk_with_cam_style:9465-9532
-/DART/trunk:6298-9548
\ No newline at end of property
+/DART/branches/CM1:8575-10322
+/DART/branches/bgrid_sprint:8194-8243
+/DART/branches/bgrid_sprint_state_reorder:8214-8256
+/DART/branches/development:4680-6255
+/DART/branches/gitm:5143-6215
+/DART/branches/gitm_lanai:6571-6652
+/DART/branches/helen:5995-6161
+/DART/branches/model_mod_changes:11409-11610
+/DART/branches/rma_cam_fv:9558-9734
+/DART/branches/rma_cf_conventions:9733-10092
+/DART/branches/rma_cice:10655-10858
+/DART/branches/rma_clm:8911-9132
+/DART/branches/rma_diag:9629-9743
+/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
+/DART/branches/rma_obs_defs:8923-9067
+/DART/branches/rma_output_files:11447-11544
+/DART/branches/rma_par_msg:9472-9511
+/DART/branches/rma_par_single_file:11685-11779
+/DART/branches/rma_pop_variable_namelist:8824-9156
+/DART/branches/rma_qc_fwd_op:9650-9723
+/DART/branches/rma_refac_io:9123-9546
+/DART/branches/rma_remove_groups_from_transpose:9327-9455
+/DART/branches/rma_roms:10157-10381
+/DART/branches/rma_set_filenames:8385-8391
+/DART/branches/rma_single_file:10904-11113
+/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-11811
+/DART/branches/rma_trunk_clamping:8792-8807
+/DART/branches/rma_trunk_filename:8017-8163
+/DART/branches/rma_trunk_get_state_fun:8574-8602
+/DART/branches/rma_trunk_mean_ens:8522-8534
+/DART/branches/rma_trunk_mmc_fix:9326-9343
+/DART/branches/rma_trunk_mpi_get_in_utils:8567-8823
+/DART/branches/rma_trunk_pathnames:8021-8034