[Dart-dev] DART/branches Revision: 11636

[dart at ucar.edu]

thoar at ucar.edu
2017-05-15 15:29:34 -0600 (Mon, 15 May 2017)
125
Merging to rma_trunk r11288
Had a problem with the obs_def mergeinfo so could not go 
all the way to HEAD in a single step.




Index: DART/branches/rma_openggcm
===================================================================
--- DART/branches/rma_openggcm	2017-05-15 21:18:50 UTC (rev 11635)
+++ DART/branches/rma_openggcm	2017-05-15 21:29:34 UTC (rev 11636)

Property changes on: DART/branches/rma_openggcm
___________________________________________________________________
Modified: svn:mergeinfo
## -28,7 +28,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:9832-11262
+/DART/branches/rma_trunk:9832-11288
 /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_openggcm/adaptive_inflate
===================================================================
--- DART/branches/rma_openggcm/adaptive_inflate	2017-05-15 21:18:50 UTC (rev 11635)
+++ DART/branches/rma_openggcm/adaptive_inflate	2017-05-15 21:29:34 UTC (rev 11636)

Property changes on: DART/branches/rma_openggcm/adaptive_inflate
___________________________________________________________________
Modified: svn:mergeinfo
## -25,7 +25,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:9832-11262
+/DART/branches/rma_trunk/adaptive_inflate:9832-11288
 /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
Modified: DART/branches/rma_openggcm/adaptive_inflate/adaptive_inflate_mod.f90
===================================================================
--- DART/branches/rma_openggcm/adaptive_inflate/adaptive_inflate_mod.f90	2017-05-15 21:18:50 UTC (rev 11635)
+++ DART/branches/rma_openggcm/adaptive_inflate/adaptive_inflate_mod.f90	2017-05-15 21:29:34 UTC (rev 11636)
@@ -21,7 +21,7 @@
                                  prepare_to_read_from_vars, prepare_to_update_vars, &
                                  map_pe_to_task
 
-use mpi_utilities_mod,    only : my_task_id, send_to, receive_from, reduce_min_max
+use mpi_utilities_mod,    only : my_task_id, send_to, receive_from, send_minmax_to
 
 implicit none
 private
@@ -35,7 +35,7 @@
           output_inf_restart,         get_inflate_mean,              get_inflate_sd,     &
           get_is_prior,               get_is_posterior,              do_ss_inflate,      &
           set_inflation_mean_copy,    set_inflation_sd_copy,         get_inflation_mean_copy, &
-          get_inflation_sd_copy
+          get_inflation_sd_copy,      do_rtps_inflate
 
 
 ! version controlled file description for error handling, do not edit
@@ -163,7 +163,8 @@
 type(adaptive_inflate_type), intent(in) :: inflation
 logical :: do_ss_inflate
 
-if (do_single_ss_inflate(inflation) .or. do_varying_ss_inflate(inflation)) then
+if (do_single_ss_inflate(inflation) .or. do_varying_ss_inflate(inflation) .or. &
+    do_rtps_inflate(inflation)) then
    do_ss_inflate = .true.
 else
    do_ss_inflate = .false.
@@ -294,7 +295,20 @@
 
 end function do_single_ss_inflate
 
+!------------------------------------------------------------------
 
+function do_rtps_inflate(inflate_handle)
+
+! Returns true if this inflation type indicates posterior relaxion-to-prior-spread
+! (whitaker & Hamill, 2012)
+
+logical                                 :: do_rtps_inflate
+type(adaptive_inflate_type), intent(in) :: inflate_handle
+
+do_rtps_inflate = (inflate_handle%inflation_flavor == 4)
+
+end function do_rtps_inflate
+
 !------------------------------------------------------------------
 
 function deterministic_inflate(inflate_handle)
@@ -310,7 +324,7 @@
 
 !------------------------------------------------------------------
 
-subroutine inflate_ens(inflate_handle, ens, mean, inflate, var_in)
+subroutine inflate_ens(inflate_handle, ens, mean, inflate, var_in, fsprd, asprd)
 
 ! Inflates subset of ensemble members given mean and inflate
 ! Selects between deterministic and stochastic inflation
@@ -319,6 +333,7 @@
 real(r8),                    intent(inout) :: ens(:)
 real(r8),                    intent(in)    :: mean, inflate
 real(r8), optional,          intent(in)    :: var_in
+real(r8), optional,          intent(in)    :: fsprd, asprd