Merge branch 'main' into oned_obs_diag_fix

Author: hkershaw-brown

assimilation_code/modules/assimilation/filter_mod.f90

@@ -438,6 +438,12 @@ subroutine filter_main()
                                       inf_damping(POSTERIOR_INF), ' will be used'
       call error_handler(E_MSG,'filter_main:', msgstring)
    endif
+   if (do_rtps_inflate(post_inflate)) then
+      write(msgstring, *) 'Posterior inflation is RTPS, QCEFF ', &
+                              'inflation options will be ignored for posterior inflation'
+      call error_handler(E_MSG,'filter_main:', msgstring)
+   endif
+
 endif
 
 call trace_message('After  initializing inflation')

guide/qceff_probit.rst

@@ -48,6 +48,11 @@ options as columns of the qceff_table:
      * lower_bound    (default -888888)
      * upper_bound    (default -888888)
 
+   .. note::
+
+      If using RTPS inflation, the probit distribution information is ignored for posterior
+      inflation.
+
 
 * Observation increment information