[Dart-dev] [5702] DART/branches/development/obs_sequence: fix the error messages when the namelist items don't

[nancy at ucar.edu]

Revision: 5702
Author:   nancy
Date:     2012-04-16 16:07:58 -0600 (Mon, 16 Apr 2012)
Log Message:
-----------
fix the error messages when the namelist items don't
contain any filenames or the wrong number of names.

Modified Paths:
--------------
    DART/branches/development/obs_sequence/obs_selection.f90
    DART/branches/development/obs_sequence/obs_sequence_tool.f90

-------------- next part --------------
Modified: DART/branches/development/obs_sequence/obs_selection.f90
===================================================================
--- DART/branches/development/obs_sequence/obs_selection.f90	2012-04-16 22:03:12 UTC (rev 5701)
+++ DART/branches/development/obs_sequence/obs_selection.f90	2012-04-16 22:07:58 UTC (rev 5702)
@@ -483,7 +483,7 @@
    if (filename_seq(index) == '') then
       if (index == 1) then
          call error_handler(E_ERR,'obs_selection', &
-             'namelist item ', trim(fsource)//' contains no filenames', &
+             'namelist item '//trim(fsource)//' contains no filenames', &
              source,revision,revdate)
       endif
       ! leaving num_input_files unspecified (or set to 0) means use

Modified: DART/branches/development/obs_sequence/obs_sequence_tool.f90
===================================================================
--- DART/branches/development/obs_sequence/obs_sequence_tool.f90	2012-04-16 22:03:12 UTC (rev 5701)
+++ DART/branches/development/obs_sequence/obs_sequence_tool.f90	2012-04-16 22:07:58 UTC (rev 5702)
@@ -1533,7 +1533,7 @@
 
 integer :: index
 logical :: from_file
-character(len=32) :: source
+character(len=32) :: fsource
 
 ! ok, here's the new logic:
 ! if the user specifies neither filename_seq nor filename_seq_list, we
@@ -1571,10 +1571,10 @@
 ! if they have specified a file which contains a list, read it into
 ! the filename_seq array and set the count.
 if (filename_seq_list /= '') then
-   source = 'filename_seq_list'
+   fsource = 'filename_seq_list'
    from_file = .true.
 else
-   source = 'filename_seq'
+   fsource = 'filename_seq'
    from_file = .false.
 endif
 
@@ -1585,7 +1585,7 @@
    if (filename_seq(index) == '') then
       if (index == 1) then
          call error_handler(E_ERR,'obs_sequence_tool', &
-             trim(source)//' contains no filenames', &
+             'namelist item '//trim(fsource)//' contains no filenames', &
              source,revision,revdate)
       endif
       ! leaving num_input_files unspecified (or set to 0) means use
@@ -1602,7 +1602,7 @@
          write(msgstring, *) 'if num_input_files is not 0, it must match the number of filenames specified'
          call error_handler(E_MSG,'obs_sequence_tool', msgstring)
          write(msgstring, *) 'num_input_files is ', num_input_files, &
-                     ' but '//trim(source)//' has filecount ', index - 1
+                     ' but namelist item '//trim(fsource)//' has filecount ', index - 1
          call error_handler(E_ERR,'obs_sequence_tool', msgstring, &
             source,revision,revdate)