[Dart-dev] DART/branches Revision: 12708
dart at ucar.edu
dart at ucar.edu
Tue Jul 3 11:50:21 MDT 2018
nancy at ucar.edu
2018-07-03 11:50:21 -0600 (Tue, 03 Jul 2018)
54
merging in changes from rma_trunk before merge back.
Index: DART/branches/gigg
===================================================================
--- DART/branches/gigg 2018-07-03 16:09:07 UTC (rev 12707)
+++ DART/branches/gigg 2018-07-03 17:50:21 UTC (rev 12708)
Property changes on: DART/branches/gigg
___________________________________________________________________
Modified: svn:mergeinfo
## -39,7 +39,7 ##
/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:11851-12701
+/DART/branches/rma_trunk:11851-12707
/DART/branches/rma_trunk_clamping:8784-8799
/DART/branches/rma_trunk_filename:8009-8155
/DART/branches/rma_trunk_get_state_fun:8566-8594
Index: DART/branches/gigg/assimilation_code/modules/assimilation/assim_tools_mod.f90
===================================================================
--- DART/branches/gigg/assimilation_code/modules/assimilation/assim_tools_mod.f90 2018-07-03 16:09:07 UTC (rev 12707)
+++ DART/branches/gigg/assimilation_code/modules/assimilation/assim_tools_mod.f90 2018-07-03 17:50:21 UTC (rev 12708)
Property changes on: DART/branches/gigg/assimilation_code/modules/assimilation/assim_tools_mod.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -7,6 +7,7 ##
/DART/branches/cam/assim_tools/assim_tools_mod.f90:6631-7721
/DART/branches/development/assim_tools/assim_tools_mod.f90:4672-6247
/DART/branches/development/assimilation_code/modules/assimilation/assim_tools_mod.f90:4674-6249
+/DART/branches/enhanced_inflation/assimilation_code/modules/assimilation/assim_tools_mod.f90:12214-12229
/DART/branches/gitm/assim_tools/assim_tools_mod.f90:5135-6207
/DART/branches/gitm/assimilation_code/modules/assimilation/assim_tools_mod.f90:5137-6209
/DART/branches/gitm_lanai/assim_tools/assim_tools_mod.f90:6563-6644
## -64,7 +65,7 ##
/DART/branches/rma_state_structure_test_dir/assimilation_code/modules/assimilation/assim_tools_mod.f90:9472-9676
/DART/branches/rma_state_structure_unit_test/assim_tools/assim_tools_mod.f90:9689-10266
/DART/branches/rma_state_structure_unit_test/assimilation_code/modules/assimilation/assim_tools_mod.f90:9691-10268
-/DART/branches/rma_trunk/assimilation_code/modules/assimilation/assim_tools_mod.f90:9634-9728,11851-12701
+/DART/branches/rma_trunk/assimilation_code/modules/assimilation/assim_tools_mod.f90:9634-9728,11851-12707
/DART/branches/rma_trunk_clamping/assimilation_code/modules/assimilation/assim_tools_mod.f90:8786-8801
/DART/branches/rma_trunk_filename/assim_tools/assim_tools_mod.f90:8009-8155
/DART/branches/rma_trunk_filename/assimilation_code/modules/assimilation/assim_tools_mod.f90:8011-8157
Modified: DART/branches/gigg/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90
===================================================================
--- DART/branches/gigg/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90 2018-07-03 16:09:07 UTC (rev 12707)
+++ DART/branches/gigg/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90 2018-07-03 17:50:21 UTC (rev 12708)
@@ -54,9 +54,9 @@
get_single_copy, put_single_copy, deallocate_single_copy, &
print_ens_handle
-use adaptive_inflate_mod, only : do_ss_inflate, mean_from_restart, sd_from_restart, &
- inflate_ens, adaptive_inflate_init, &
- adaptive_inflate_type, set_inflation_mean_copy , &
+use adaptive_inflate_mod, only : do_ss_inflate, mean_from_restart, sd_from_restart, &
+ inflate_ens, adaptive_inflate_init, &
+ adaptive_inflate_type, set_inflation_mean_copy, &
log_inflation_info, set_inflation_sd_copy, &
get_minmax_task_zero, do_rtps_inflate, &
validate_inflate_options
Modified: DART/branches/gigg/assimilation_code/modules/assimilation/filter_mod.f90
===================================================================
--- DART/branches/gigg/assimilation_code/modules/assimilation/filter_mod.f90 2018-07-03 16:09:07 UTC (rev 12707)
+++ DART/branches/gigg/assimilation_code/modules/assimilation/filter_mod.f90 2018-07-03 17:50:21 UTC (rev 12708)
@@ -54,9 +54,9 @@
get_single_copy, put_single_copy, deallocate_single_copy, &
print_ens_handle
-use adaptive_inflate_mod, only : do_ss_inflate, mean_from_restart, sd_from_restart, &
- inflate_ens, adaptive_inflate_init, &
- adaptive_inflate_type, set_inflation_mean_copy , &
+use adaptive_inflate_mod, only : do_ss_inflate, mean_from_restart, sd_from_restart, &
+ inflate_ens, adaptive_inflate_init, &
+ adaptive_inflate_type, set_inflation_mean_copy, &
log_inflation_info, set_inflation_sd_copy, &
get_minmax_task_zero, do_rtps_inflate, &
validate_inflate_options
Index: DART/branches/gigg/models/POP
===================================================================
--- DART/branches/gigg/models/POP 2018-07-03 16:09:07 UTC (rev 12707)
+++ DART/branches/gigg/models/POP 2018-07-03 17:50:21 UTC (rev 12708)
Property changes on: DART/branches/gigg/models/POP
___________________________________________________________________
Modified: svn:mergeinfo
## -38,7 +38,7 ##
/DART/branches/rma_sprint/models/POP:8093-8164
/DART/branches/rma_state_structure_test_dir/models/POP:9470-9674
/DART/branches/rma_state_structure_unit_test/models/POP:9689-10266
-/DART/branches/rma_trunk/models/POP:11851-12701
+/DART/branches/rma_trunk/models/POP:11851-12707
/DART/branches/rma_trunk_clamping/models/POP:8784-8799
/DART/branches/rma_trunk_filename/models/POP:8009-8155
/DART/branches/rma_trunk_get_state_fun/models/POP:8566-8594
Modified: DART/branches/gigg/models/POP/work/input.nml
===================================================================
--- DART/branches/gigg/models/POP/work/input.nml 2018-07-03 16:09:07 UTC (rev 12707)
+++ DART/branches/gigg/models/POP/work/input.nml 2018-07-03 17:50:21 UTC (rev 12708)
@@ -25,12 +25,13 @@
print_every_nth_obs = -1
More information about the Dart-dev
mailing list