[Dart-dev] DART/branches Revision: 10868

[dart at ucar.edu]

hendric at ucar.edu
2017-01-04 13:41:06 -0700 (Wed, 04 Jan 2017)
43
merging latest changes from the rma_trunk




Index: DART/branches/rma_fixed_filenames
===================================================================
--- DART/branches/rma_fixed_filenames	2017-01-04 20:35:24 UTC (rev 10867)
+++ DART/branches/rma_fixed_filenames	2017-01-04 20:41:06 UTC (rev 10868)

Property changes on: DART/branches/rma_fixed_filenames
___________________________________________________________________
Modified: svn:mergeinfo
## -7,6 +7,7 ##
 /DART/branches/helen:5995-6161
 /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_kinds_to_state_structure:8958-9437
## -25,7 +26,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:10708-10855
+/DART/branches/rma_trunk:10708-10867
 /DART/branches/rma_trunk_clamping:8792-8807
 /DART/branches/rma_trunk_filename:8017-8163
 /DART/branches/rma_trunk_get_state_fun:8574-8602
Index: DART/branches/rma_fixed_filenames/adaptive_inflate
===================================================================
--- DART/branches/rma_fixed_filenames/adaptive_inflate	2017-01-04 20:35:24 UTC (rev 10867)
+++ DART/branches/rma_fixed_filenames/adaptive_inflate	2017-01-04 20:41:06 UTC (rev 10868)

Property changes on: DART/branches/rma_fixed_filenames/adaptive_inflate
___________________________________________________________________
Modified: svn:mergeinfo
## -9,6 +9,7 ##
 /DART/branches/inf_restart:4784-4812
 /DART/branches/rma_cam_fv/adaptive_inflate:9558-9734
 /DART/branches/rma_cf_conventions/adaptive_inflate:9733-10092
+/DART/branches/rma_cice/adaptive_inflate:10655-10858
 /DART/branches/rma_diag/adaptive_inflate:9629-9743
 /DART/branches/rma_kinds_to_state_structure/adaptive_inflate:8958-9437
 /DART/branches/rma_kinds_to_state_strucutre/adaptive_inflate:8909-8957
## -22,7 +23,7 ##
 /DART/branches/rma_sprint/adaptive_inflate:8101-8172
 /DART/branches/rma_state_structure_test_dir/adaptive_inflate:9478-9682
 /DART/branches/rma_state_structure_unit_test/adaptive_inflate:9697-10274
-/DART/branches/rma_trunk/adaptive_inflate:10708-10855
+/DART/branches/rma_trunk/adaptive_inflate:10708-10867
 /DART/branches/rma_trunk_filename/adaptive_inflate:8017-8163
 /DART/branches/rma_trunk_get_state_fun/adaptive_inflate:8574-8602
 /DART/branches/rma_trunk_mpi_get_in_utils/adaptive_inflate:8567-8823
Index: DART/branches/rma_fixed_filenames/assim_tools
===================================================================
--- DART/branches/rma_fixed_filenames/assim_tools	2017-01-04 20:35:24 UTC (rev 10867)
+++ DART/branches/rma_fixed_filenames/assim_tools	2017-01-04 20:41:06 UTC (rev 10868)

Property changes on: DART/branches/rma_fixed_filenames/assim_tools
___________________________________________________________________
Modified: svn:mergeinfo
## -7,6 +7,7 ##
 /DART/branches/gitm_lanai/assim_tools:6571-6652
 /DART/branches/rma_cam_fv/assim_tools:9558-9734
 /DART/branches/rma_cf_conventions/assim_tools:9733-10092
+/DART/branches/rma_cice/assim_tools:10655-10858
 /DART/branches/rma_clm/assim_tools:8911-9132
 /DART/branches/rma_diag/assim_tools:9629-9743
 /DART/branches/rma_kinds_to_state_structure/assim_tools:8958-9437
## -22,7 +23,7 ##
 /DART/branches/rma_sprint/assim_tools:8101-8172
 /DART/branches/rma_state_structure_test_dir/assim_tools:9478-9682
 /DART/branches/rma_state_structure_unit_test/assim_tools:9697-10274
-/DART/branches/rma_trunk/assim_tools:10708-10855
+/DART/branches/rma_trunk/assim_tools:10708-10867
 /DART/branches/rma_trunk_filename/assim_tools:8017-8163
 /DART/branches/rma_trunk_mean_ens/assim_tools:8522-8534
 /DART/branches/rma_trunk_mpi_get_in_utils/assim_tools:8567-8823
Index: DART/branches/rma_fixed_filenames/assim_tools/assim_tools_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/assim_tools/assim_tools_mod.f90	2017-01-04 20:35:24 UTC (rev 10867)
+++ DART/branches/rma_fixed_filenames/assim_tools/assim_tools_mod.f90	2017-01-04 20:41:06 UTC (rev 10868)

Property changes on: DART/branches/rma_fixed_filenames/assim_tools/assim_tools_mod.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -8,6 +8,7 ##
 /DART/branches/helen/assim_tools/assim_tools_mod.f90:5995-6161
 /DART/branches/rma_cam_fv/assim_tools/assim_tools_mod.f90:9558-9734
 /DART/branches/rma_cf_conventions/assim_tools/assim_tools_mod.f90:9733-10092
+/DART/branches/rma_cice/assim_tools/assim_tools_mod.f90:10655-10858
 /DART/branches/rma_clm/assim_tools/assim_tools_mod.f90:8911-9132
 /DART/branches/rma_diag/assim_tools/assim_tools_mod.f90:9629-9743
 /DART/branches/rma_kinds_to_state_structure/assim_tools/assim_tools_mod.f90:8958-9437
## -22,7 +23,7 ##
 /DART/branches/rma_sprint/assim_tools/assim_tools_mod.f90:8101-8172
 /DART/branches/rma_state_structure_test_dir/assim_tools/assim_tools_mod.f90:9478-9682
 /DART/branches/rma_state_structure_unit_test/assim_tools/assim_tools_mod.f90:9697-10274
-/DART/branches/rma_trunk/assim_tools/assim_tools_mod.f90:10708-10855
+/DART/branches/rma_trunk/assim_tools/assim_tools_mod.f90:10708-10867
 /DART/branches/rma_trunk_filename/assim_tools/assim_tools_mod.f90:8017-8163
 /DART/branches/rma_trunk_mean_ens/assim_tools/assim_tools_mod.f90:8522-8534
 /DART/branches/rma_trunk_mpi_get_in_utils/assim_tools/assim_tools_mod.f90:8567-8823
Index: DART/branches/rma_fixed_filenames/models/POP