[Dart-dev] [6230] DART/branches/development/assim_tools/assim_tools_mod.f90: Changed the sort_obs_inc check to be a warning instead of an error.

[nancy at ucar.edu]

Revision: 6230
Author:   thoar
Date:     2013-06-05 15:43:08 -0600 (Wed, 05 Jun 2013)
Log Message:
-----------
Changed the sort_obs_inc check to be a warning instead of an error.
The message is a bit more verbose and is bracketed by whitespace to be more obvious.

Modified Paths:
--------------
    DART/branches/development/assim_tools/assim_tools_mod.f90

-------------- next part --------------
Modified: DART/branches/development/assim_tools/assim_tools_mod.f90
===================================================================
--- DART/branches/development/assim_tools/assim_tools_mod.f90	2013-06-05 21:20:50 UTC (rev 6229)
+++ DART/branches/development/assim_tools/assim_tools_mod.f90	2013-06-05 21:43:08 UTC (rev 6230)
@@ -358,10 +358,14 @@
 ! performance by rejecting namelist combinations that do unneeded work.
 if (sort_obs_inc) then
    if(deterministic_inflate(inflate) .and. ((filter_kind == 1) .or. (filter_kind == 8))) then
-      write(msgstring,  *) 'sort_obs_inc is unneeded with deterministic filter_kind ', filter_kind
-      write(msgstring2, *) 'the increments are already sorted when inflation is deterministic'
-      call error_handler(E_ERR,'filter_assim:', msgstring, source, revision, revdate, &
-                         text2=msgstring2)
+      write(msgstring,  *) 'With a deterministic filter [assim_tools_nml:filter_kind = ',filter_kind,']'
+      write(msgstring2, *) 'and deterministic inflation [filter_nml:inf_deterministic = .TRUE.]'
+      write(msgstring3, *) 'assim_tools_nml:sort_obs_inc = .TRUE. is not needed and is expensive.'
+      call error_handler(E_MSG,'', '')  ! whitespace
+      call error_handler(E_MSG,'WARNING filter_assim:', msgstring, source, revision, revdate, &
+                         text2=msgstring2,text3=msgstring3)
+      call error_handler(E_MSG,'', '')  ! whitespace
+      sort_obs_inc = .FALSE.
    endif
 endif