[Dart-dev] DART/branches Revision: 12226

[dart at ucar.edu]

nancy at ucar.edu
2017-12-19 16:11:58 -0700 (Tue, 19 Dec 2017)
177
fix the comments in the ANDERSON 2007 section, and use
the accessor function instead of magic numbers in the test
to see if we're using the enhanced inflation or the original.




Modified: DART/branches/enhanced_inflation/assimilation_code/modules/assimilation/adaptive_inflate_mod.f90
===================================================================
--- DART/branches/enhanced_inflation/assimilation_code/modules/assimilation/adaptive_inflate_mod.f90	2017-12-19 22:41:52 UTC (rev 12225)
+++ DART/branches/enhanced_inflation/assimilation_code/modules/assimilation/adaptive_inflate_mod.f90	2017-12-19 23:11:58 UTC (rev 12226)
@@ -538,11 +538,13 @@
 ! on the inflation itself are provided in the inflate_handle. 
 
 ! select which method to update with
-if (inflate_handle%inflation_flavor == 5) then
+if (do_enhanced_ss_inflate(inflate_handle)) then
    inf_type = GHA2017
 else
+   ! the only other option is the original AND2007 and no one should
+   ! be trying to use that without talking to the dart team first.
+   ! (talk to jeff anderson about the details if you're interested.)
    inf_type = AND2009
-   ! change here if you want to compare to anderson 2007
 endif
 
 ! Use bayes theorem to update
@@ -598,13 +600,9 @@
 
    ! Use ONLY the linear approximation, cubic solution below can be numerically
    ! unstable for extreme cases. Should look at this later.
+   !if(gamma_corr > 1.01_r8) then  ! use this test to disable the entire first section
    if(gamma_corr > 0.99_r8) then
-   !if(gamma_corr > 1.01_r8) then
    
-   ! FIXME: rectify the comment in the following line (about gamma
-   ! and 1.0) and the test above, which clearly used to be true for
-   ! 1.0 but is not anymore.
-   
    ! The solution of the cubic below only works if gamma is 1.0
    ! Can analytically find the maximum of the product: d/dlambda is a
    ! cubic polynomial in lambda**2; solve using cubic formula for real root