[Dart-dev] DART/branches Revision: 11845

dart at ucar.edu dart at ucar.edu
Thu Jul 27 12:06:46 MDT 2017


hendric at ucar.edu
2017-07-27 12:06:26 -0600 (Thu, 27 Jul 2017)
110
merging changes from the rma_trunk.  everything seemed to go well 
except for a couple of path names files.  



Index: DART/branches/rma_fix_clm_restarts
===================================================================
--- DART/branches/rma_fix_clm_restarts	2017-07-26 23:03:48 UTC (rev 11844)
+++ DART/branches/rma_fix_clm_restarts	2017-07-27 18:06:26 UTC (rev 11845)

Property changes on: DART/branches/rma_fix_clm_restarts
___________________________________________________________________
Modified: svn:mergeinfo
## -1,33 +1,50 ##
-/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/rma_clm:8911-9132
-/DART/branches/rma_kinds_to_state_structure:8958-9437
-/DART/branches/rma_kinds_to_state_strucutre:8909-8957
-/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_par_msg:9472-9511
-/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_set_filenames:8385-8391
-/DART/branches/rma_sprint:8101-8172
-/DART/branches/rma_state_structure_test_dir:9478-9682
-/DART/branches/rma_trunk:9634-9728
-/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
-/DART/branches/rma_trunk_read_transpose:9214-9256
-/DART/branches/rma_trunk_vert_loc:8538-8543
-/DART/branches/trunk_with_cam_style:9473-9540
-/DART/trunk:6306-9556
\ No newline at end of property
+/DART/branches/CM1:8569-10316
+/DART/branches/bgrid_sprint:8188-8237
+/DART/branches/bgrid_sprint_state_reorder:8208-8250
+/DART/branches/development:4674-6249
+/DART/branches/gitm:5137-6209
+/DART/branches/gitm_lanai:6565-6646
+/DART/branches/helen:5989-6155
+/DART/branches/model_mod_changes:11403-11604
+/DART/branches/rma_array_nml:11814-11839
+/DART/branches/rma_cam_fv:9552-9728
+/DART/branches/rma_cf_conventions:9727-10086
+/DART/branches/rma_cice:10649-10852
+/DART/branches/rma_clm:8905-9126
+/DART/branches/rma_diag:9623-9737
+/DART/branches/rma_fixed_filenames:10702-10895
+/DART/branches/rma_kinds_to_state_structure:8952-9431
+/DART/branches/rma_kinds_to_state_strucutre:8903-8951
+/DART/branches/rma_mmc:11725-11731,11735-11751
+/DART/branches/rma_model_mod_check:8959-9172
+/DART/branches/rma_mpas_fold_mean_fwd:9342-9452
+/DART/branches/rma_mpas_get_state_meta_data:8865-8884
+/DART/branches/rma_obs_defs:8917-9061
+/DART/branches/rma_output_files:11441-11538
+/DART/branches/rma_par_msg:9466-9505
+/DART/branches/rma_par_single_file:11679-11731,11735-11773
+/DART/branches/rma_pop_variable_namelist:8818-9150
+/DART/branches/rma_qc_fwd_op:9644-9717
+/DART/branches/rma_refac_io:9117-9540
+/DART/branches/rma_remove_groups_from_transpose:9321-9449
+/DART/branches/rma_roms:10151-10375
+/DART/branches/rma_set_filenames:8379-8385
+/DART/branches/rma_single_file:10898-11107
+/DART/branches/rma_sprint:8095-8166
+/DART/branches/rma_state_structure_test_dir:9472-9676
+/DART/branches/rma_state_structure_unit_test:9691-10268
+/DART/branches/rma_trunk:9634-11844
+/DART/branches/rma_trunk_clamping:8786-8801
+/DART/branches/rma_trunk_filename:8011-8157
+/DART/branches/rma_trunk_get_state_fun:8568-8596
+/DART/branches/rma_trunk_mean_ens:8516-8528
+/DART/branches/rma_trunk_mmc_fix:9320-9337
+/DART/branches/rma_trunk_mpi_get_in_utils:8561-8817
+/DART/branches/rma_trunk_pathnames:8015-8028
+/DART/branches/rma_trunk_posterior:9768-9781
+/DART/branches/rma_trunk_read_transpose:9208-9250
+/DART/branches/rma_trunk_vert_loc:8532-8537
+/DART/branches/rma_types_kinds:11202-11236
+/DART/branches/rma_updates_nancy:11615-11676
+/DART/branches/trunk_with_cam_style:9467-9534
+/DART/trunk:6306-9550
\ No newline at end of property
Copied: DART/branches/rma_fix_clm_restarts/CHANGELOG (from rev 11844, DART/branches/rma_trunk/CHANGELOG)
===================================================================
--- DART/branches/rma_fix_clm_restarts/CHANGELOG	                        (rev 0)
+++ DART/branches/rma_fix_clm_restarts/CHANGELOG	2017-07-27 18:06:26 UTC (rev 11845)
@@ -0,0 +1,500 @@
+# DART software - Copyright UCAR. This open source software is provided
+# by UCAR, "as is", without charge, subject to all terms of use at


More information about the Dart-dev mailing list