[Dart-dev] DART/releases Revision: 11388

[dart at ucar.edu]

nancy at ucar.edu
2017-03-22 09:36:22 -0600 (Wed, 22 Mar 2017)
49
moving assim_tools change into classic release.




Index: DART/releases/classic
===================================================================
--- DART/releases/classic	2017-03-22 15:33:44 UTC (rev 11387)
+++ DART/releases/classic	2017-03-22 15:36:22 UTC (rev 11388)

Property changes on: DART/releases/classic
___________________________________________________________________
Modified: svn:mergeinfo
## -3,4 +3,5 ##
 /DART/branches/gitm:5143-6215
 /DART/branches/gitm_lanai:6571-6652
 /DART/branches/helen:5995-6161
-/DART/branches/trunk_with_cam_style:9473-9540
\ No newline at end of property
+/DART/branches/trunk_with_cam_style:9473-9540
+/DART/trunk:11352-11387
\ No newline at end of property
Index: DART/releases/classic/assim_tools
===================================================================
--- DART/releases/classic/assim_tools	2017-03-22 15:33:44 UTC (rev 11387)
+++ DART/releases/classic/assim_tools	2017-03-22 15:36:22 UTC (rev 11388)

Property changes on: DART/releases/classic/assim_tools
___________________________________________________________________
Modified: svn:mergeinfo
## -4,4 +4,5 ##
 /DART/branches/gitm/assim_tools:5143-6215
 /DART/branches/gitm_lanai/assim_tools:6571-6652
 /DART/branches/trunk_with_cam_style/assim_tools:9473-9540
-/DART/releases/Kodiak/assim_tools:5292-5577
\ No newline at end of property
+/DART/releases/Kodiak/assim_tools:5292-5577
+/DART/trunk/assim_tools:11352-11387
\ No newline at end of property
Modified: DART/releases/classic/assim_tools/assim_tools_mod.f90
===================================================================
--- DART/releases/classic/assim_tools/assim_tools_mod.f90	2017-03-22 15:33:44 UTC (rev 11387)
+++ DART/releases/classic/assim_tools/assim_tools_mod.f90	2017-03-22 15:36:22 UTC (rev 11388)
@@ -1092,7 +1092,7 @@
    else if(filter_kind == 7) then
       call obs_increment_boxcar(ens, ens_size, obs, obs_var, obs_inc, rel_weights)
    else if(filter_kind == 8) then
-      call obs_increment_boxcar2(ens, ens_size, prior_var, obs, obs_var, obs_inc)
+      call obs_increment_rank_histogram(ens, ens_size, prior_var, obs, obs_var, obs_inc)
    else 
       call error_handler(E_ERR,'obs_increment', &
                  'Illegal value of filter_kind in assim_tools namelist [1-8 OK]', &
@@ -1923,7 +1923,7 @@
 
 
 
-subroutine obs_increment_boxcar2(ens, ens_size, prior_var, &
+subroutine obs_increment_rank_histogram(ens, ens_size, prior_var, &
    obs, obs_var, obs_inc)
 !------------------------------------------------------------------------
 ! 
@@ -2159,7 +2159,7 @@
                      new_ens(i) = adj_r2
                   else
                      msgstring = 'Did not get a satisfactory quadratic root' 
-                     call error_handler(E_ERR, 'obs_increment_boxcar2', msgstring, &
+                     call error_handler(E_ERR, 'obs_increment_rank_histogram', msgstring, &
                         source, revision, revdate)
                   endif
                endif
@@ -2180,7 +2180,7 @@
    obs_inc(e_ind(i)) = new_ens(i) - x(i)
 end do
 
-end subroutine obs_increment_boxcar2
+end subroutine obs_increment_rank_histogram
 
 
 


Property changes on: DART/releases/classic/assim_tools/assim_tools_mod.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -6,4 +6,5 ##
 /DART/branches/gitm_lanai/assim_tools/assim_tools_mod.f90:6571-6652
 /DART/branches/helen/assim_tools/assim_tools_mod.f90:5995-6161
 /DART/branches/trunk_with_cam_style/assim_tools/assim_tools_mod.f90:9473-9540
-/DART/releases/Kodiak/assim_tools/assim_tools_mod.f90:5020-5583
\ No newline at end of property
+/DART/releases/Kodiak/assim_tools/assim_tools_mod.f90:5020-5583
+/DART/trunk/assim_tools/assim_tools_mod.f90:11352-11387
\ No newline at end of property
Copied: DART/releases/classic/assim_tools/assim_tools_mod.pf.f90 (from rev 11387, DART/trunk/assim_tools/assim_tools_mod.pf.f90)
===================================================================
--- DART/releases/classic/assim_tools/assim_tools_mod.pf.f90	                        (rev 0)
+++ DART/releases/classic/assim_tools/assim_tools_mod.pf.f90	2017-03-22 15:36:22 UTC (rev 11388)
@@ -0,0 +1,3511 @@
+! DART software - Copyright 2004 - 2013 UCAR. This open source software is
+! provided by UCAR, "as is", without charge, subject to all terms of use at
+! http://www.image.ucar.edu/DAReS/DART/DART_download
+!
+! $Id$
+
+module assim_tools_mod
+