[Dart-dev] DART/branches Revision: 12743
dart at ucar.edu
dart at ucar.edu
Thu Jul 12 14:29:10 MDT 2018
hendric at ucar.edu
2018-07-12 14:29:10 -0600 (Thu, 12 Jul 2018)
45
merging recent changes from the rma_trunk.
Index: DART/branches/pertirb_tool
===================================================================
--- DART/branches/pertirb_tool 2018-07-12 18:00:00 UTC (rev 12742)
+++ DART/branches/pertirb_tool 2018-07-12 20:29:10 UTC (rev 12743)
Property changes on: DART/branches/pertirb_tool
___________________________________________________________________
Modified: svn:mergeinfo
## -2,6 +2,7 ##
/DART/branches/bgrid_sprint:8188-8237
/DART/branches/bgrid_sprint_state_reorder:8208-8250
/DART/branches/development:4674-6249
+/DART/branches/gigg:12710-12714
/DART/branches/gitm:5137-6209
/DART/branches/gitm_lanai:6565-6646
/DART/branches/helen:5989-6155
## -39,6 +40,7 ##
/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:12695-12742
/DART/branches/rma_trunk_clamping:8786-8801
/DART/branches/rma_trunk_filename:8011-8157
/DART/branches/rma_trunk_get_state_fun:8568-8596
Index: DART/branches/pertirb_tool/assimilation_code/modules/assimilation/assim_tools_mod.f90
===================================================================
--- DART/branches/pertirb_tool/assimilation_code/modules/assimilation/assim_tools_mod.f90 2018-07-12 18:00:00 UTC (rev 12742)
+++ DART/branches/pertirb_tool/assimilation_code/modules/assimilation/assim_tools_mod.f90 2018-07-12 20:29:10 UTC (rev 12743)
Property changes on: DART/branches/pertirb_tool/assimilation_code/modules/assimilation/assim_tools_mod.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -7,6 +7,7 ##
/DART/branches/cam/assim_tools/assim_tools_mod.f90:6633-7723
/DART/branches/development/assim_tools/assim_tools_mod.f90:4674-6249
/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:5137-6209
/DART/branches/gitm/assimilation_code/modules/assimilation/assim_tools_mod.f90:5137-6209
/DART/branches/gitm_lanai/assim_tools/assim_tools_mod.f90:6565-6646
## -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:9691-10268
/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
+/DART/branches/rma_trunk/assimilation_code/modules/assimilation/assim_tools_mod.f90:9634-9728,12695-12742
/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:8011-8157
/DART/branches/rma_trunk_filename/assimilation_code/modules/assimilation/assim_tools_mod.f90:8011-8157
Modified: DART/branches/pertirb_tool/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90
===================================================================
--- DART/branches/pertirb_tool/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90 2018-07-12 18:00:00 UTC (rev 12742)
+++ DART/branches/pertirb_tool/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90 2018-07-12 20:29:10 UTC (rev 12743)
@@ -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/pertirb_tool/assimilation_code/modules/assimilation/filter_mod.f90
===================================================================
--- DART/branches/pertirb_tool/assimilation_code/modules/assimilation/filter_mod.f90 2018-07-12 18:00:00 UTC (rev 12742)
+++ DART/branches/pertirb_tool/assimilation_code/modules/assimilation/filter_mod.f90 2018-07-12 20:29:10 UTC (rev 12743)
@@ -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/pertirb_tool/assimilation_code/programs/perturb_single_instance/perturb_single_instance.f90
===================================================================
--- DART/branches/pertirb_tool/assimilation_code/programs/perturb_single_instance/perturb_single_instance.f90 2018-07-12 18:00:00 UTC (rev 12742)
+++ DART/branches/pertirb_tool/assimilation_code/programs/perturb_single_instance/perturb_single_instance.f90 2018-07-12 20:29:10 UTC (rev 12743)
@@ -64,6 +64,7 @@
character(len=256) :: input_files(MAX_FILES) = ''
character(len=256) :: output_file_list(MAX_NUM_DOMS) = ''
character(len=256) :: output_files(MAX_FILES) = ''
+real(r8) :: pert_amp = 0.0
logical :: single_restart_file_in = .false.
namelist /perturb_single_instance_nml/ &
@@ -71,6 +72,7 @@
input_files, &
output_files, &
output_file_list, &
More information about the Dart-dev
mailing list