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

[dart at ucar.edu]

thoar at ucar.edu
2017-01-03 09:59:58 -0700 (Tue, 03 Jan 2017)
127
Making rma_cice consistent with the rma_trunk in preparation for
reintegration with the rma_trunk and subsequent deprecation.




Index: DART/branches/rma_cice
===================================================================
--- DART/branches/rma_cice	2017-01-03 16:33:17 UTC (rev 10857)
+++ DART/branches/rma_cice	2017-01-03 16:59:58 UTC (rev 10858)

Property changes on: DART/branches/rma_cice
___________________________________________________________________
Modified: svn:mergeinfo
## -25,7 +25,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:10655-10851
+/DART/branches/rma_trunk:10655-10857
 /DART/branches/rma_trunk_clamping:8792-8807
 /DART/branches/rma_trunk_filename:8017-8163
 /DART/branches/rma_trunk_get_state_fun:8574-8602
\ No newline at end of property
Index: DART/branches/rma_cice/adaptive_inflate
===================================================================
--- DART/branches/rma_cice/adaptive_inflate	2017-01-03 16:33:17 UTC (rev 10857)
+++ DART/branches/rma_cice/adaptive_inflate	2017-01-03 16:59:58 UTC (rev 10858)

Property changes on: DART/branches/rma_cice/adaptive_inflate
___________________________________________________________________
Modified: svn:mergeinfo
## -22,6 +22,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:10655-10857
 /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
\ No newline at end of property
Index: DART/branches/rma_cice/assim_tools
===================================================================
--- DART/branches/rma_cice/assim_tools	2017-01-03 16:33:17 UTC (rev 10857)
+++ DART/branches/rma_cice/assim_tools	2017-01-03 16:59:58 UTC (rev 10858)

Property changes on: DART/branches/rma_cice/assim_tools
___________________________________________________________________
Modified: svn:mergeinfo
## -22,6 +22,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:10655-10857
 /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
\ No newline at end of property
Index: DART/branches/rma_cice/assim_tools/assim_tools_mod.f90
===================================================================
--- DART/branches/rma_cice/assim_tools/assim_tools_mod.f90	2017-01-03 16:33:17 UTC (rev 10857)
+++ DART/branches/rma_cice/assim_tools/assim_tools_mod.f90	2017-01-03 16:59:58 UTC (rev 10858)

Property changes on: DART/branches/rma_cice/assim_tools/assim_tools_mod.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -22,6 +22,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:10655-10857
 /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
\ No newline at end of property
Index: DART/branches/rma_cice/models/cam
===================================================================
--- DART/branches/rma_cice/models/cam	2017-01-03 16:33:17 UTC (rev 10857)
+++ DART/branches/rma_cice/models/cam	2017-01-03 16:59:58 UTC (rev 10858)

Property changes on: DART/branches/rma_cice/models/cam
___________________________________________________________________
Modified: svn:mergeinfo
## -21,6 +21,7 ##
 /DART/branches/rma_sprint/models/cam:8101-8172
 /DART/branches/rma_state_structure_test_dir/models/cam:9478-9682
 /DART/branches/rma_state_structure_unit_test/models/cam:9697-10274
+/DART/branches/rma_trunk/models/cam:10655-10857
 /DART/branches/rma_trunk_filename/models/cam:8017-8163
 /DART/branches/rma_trunk_get_state_fun/models/cam:8574-8602
 /DART/branches/rma_trunk_mmc_fix/models/cam:9326-9343
\ No newline at end of property
Index: DART/branches/rma_cice/models/wrf/model_mod.f90
===================================================================
--- DART/branches/rma_cice/models/wrf/model_mod.f90	2017-01-03 16:33:17 UTC (rev 10857)
+++ DART/branches/rma_cice/models/wrf/model_mod.f90	2017-01-03 16:59:58 UTC (rev 10858)

Property changes on: DART/branches/rma_cice/models/wrf/model_mod.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -24,6 +24,7 ##
 /DART/branches/rma_state_struct/models/wrf/model_mod.f90:7992-8009
 /DART/branches/rma_state_structure_test_dir/models/wrf/model_mod.f90:9478-9682
 /DART/branches/rma_state_structure_unit_test/models/wrf/model_mod.f90:9697-10274
+/DART/branches/rma_trunk/models/wrf/model_mod.f90:10655-10857
 /DART/branches/rma_trunk_clamping/models/wrf/model_mod.f90:8792-8807
 /DART/branches/rma_trunk_filename/models/wrf/model_mod.f90:8017-8163