timhoar · timhoar · Jun 27, 2013 · Jul 1, 2013 · Jul 1, 2013 · Jul 2, 2013
diff --git a/adaptive_inflate/adaptive_inflate_mod.f90 b/adaptive_inflate/adaptive_inflate_mod.f90
@@ -1,8 +1,6 @@
 ! 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 adaptive_inflate_mod
 
@@ -29,10 +27,9 @@ module adaptive_inflate_mod
 
 
 ! version controlled file description for error handling, do not edit
-character(len=256), parameter :: source   = &
-   "$URL$"
-character(len=32 ), parameter :: revision = "$Revision$"
-character(len=128), parameter :: revdate  = "$Date$"
+character(len=*), parameter :: source   = 'adapative_inflate_mod.f90'
+character(len=*), parameter :: revision = ''
+character(len=*), parameter :: revdate  = ''
 
 ! Manages both observation space and state space inflation
 ! Handles initial values and restarts, diagnostic output, and computations
@@ -1015,8 +1012,3 @@ end subroutine solve_quadratic
 
 end module adaptive_inflate_mod
 
-! <next few lines under version control, do not edit>
-! $URL$ 
-! $Id$ 
-! $Revision$ 
-! $Date$ 
diff --git a/adaptive_inflate/fill_inflation_restart.f90 b/adaptive_inflate/fill_inflation_restart.f90
@@ -1,8 +1,6 @@
 ! 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$ 
 
 program fill_inflation_restart
 
@@ -26,10 +24,9 @@ program fill_inflation_restart
 implicit none
 
 ! version controlled file description for error handling, do not edit
-character(len=256), parameter :: source   = &
-   "$URL$"
-character(len=32 ), parameter :: revision = "$Revision$"
-character(len=128), parameter :: revdate  = "$Date$"
+character(len=*), parameter :: source   = 'fill_inflation_restart.f90'
+character(len=*), parameter :: revision = ''
+character(len=*), parameter :: revdate  = ''
 
 ! Read 2 floating point values from the console - the initial inflation value
 ! and the inflation standard deviation.  Will write an output file named
@@ -90,8 +87,3 @@ program fill_inflation_restart
 
 end program fill_inflation_restart
 
-! <next few lines under version control, do not edit>
-! $URL$ 
-! $Id$ 
-! $Revision$ 
-! $Date$ 
diff --git a/assim_model/assim_model_mod.f90 b/assim_model/assim_model_mod.f90
@@ -1,8 +1,6 @@
 ! 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_model_mod
 
@@ -46,10 +44,9 @@ module assim_model_mod
           get_close_obs_init, get_close_obs, ens_mean_for_model
 
 ! version controlled file description for error handling, do not edit
-character(len=256), parameter :: source   = &
-   "$URL$"
-character(len=32 ), parameter :: revision = "$Revision$"
-character(len=128), parameter :: revdate  = "$Date$"
+character(len=*), parameter :: source   = 'assim_model_mod.f90'
+character(len=*), parameter :: revision = ''
+character(len=*), parameter :: revdate  = ''
 
 
 ! Type to keep model state and time together
@@ -1576,8 +1573,3 @@ end function nc_write_calendar_atts
 !
 end module assim_model_mod
 
-! <next few lines under version control, do not edit>
-! $URL$
-! $Id$
-! $Revision$
-! $Date$
diff --git a/assim_tools/assim_tools_mod.f90 b/assim_tools/assim_tools_mod.f90
@@ -1,8 +1,6 @@
 ! 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
 
@@ -82,10 +80,9 @@ module assim_tools_mod
 real(r8)               :: exp_true_correl(200), alpha(200)
 
 ! version controlled file description for error handling, do not edit
-character(len=256), parameter :: source   = &
-   "$URL$"
-character(len=32 ), parameter :: revision = "$Revision$"
-character(len=128), parameter :: revdate  = "$Date$"
+character(len=*), parameter :: source   = 'assim_tools_mod.f90'
+character(len=*), parameter :: revision = ''
+character(len=*), parameter :: revdate  = ''
 
 !============================================================================
 
@@ -428,6 +425,10 @@ subroutine filter_assim(ens_handle, obs_ens_handle, obs_seq, keys,           &
    if (my_obs_type(i) > 0) then
       my_obs_kind(i) = get_obs_kind_var_type(my_obs_type(i))
    else
+!!$      if(my_obs_type(i) .eq. 0) print *, 'Get_Obs_Locations: i = ', i, &
+!!$           ',  my_obs_type(i) = ', my_obs_type(i), ', my_obs_kind(i) = ', my_obs_kind(i)
+!!$      if(my_obs_kind(i) .eq. 0) print *, 'Get_Obs_Locations: i = ', i, &
+!!$           ',  my_obs_type(i) = ', my_obs_type(i), ', my_obs_kind(i) = ', my_obs_kind(i)
       call get_state_meta_data(-1 * my_obs_type(i), dummyloc, my_obs_kind(i))    ! identity obs
    endif
    ! Need the time for regression diagnostics potentially; get from first observation
@@ -440,6 +441,10 @@ subroutine filter_assim(ens_handle, obs_ens_handle, obs_seq, keys,           &
 
 ! Get the location and kind of all my state variables
 do i = 1, ens_handle%my_num_vars
+!!$   if(my_state_indx(i) .eq. 0) print *, 'Get location and kind: i = ', i, &
+!!$           ', my_state_indx(i) = ', my_state_indx(i), ', my_state_kind(i) = ', my_state_kind(i)
+!!$   if(my_state_kind(i) .eq. 0) print *, 'Get location and kind: i = ', i, &
+!!$           ', my_state_indx(i) = ', my_state_indx(i), ', my_state_kind(i) = ', my_state_kind(i)
    call get_state_meta_data(my_state_indx(i), my_state_loc(i), my_state_kind(i))
 end do
 
@@ -530,6 +535,10 @@ subroutine filter_assim(ens_handle, obs_ens_handle, obs_seq, keys,           &
    if (base_obs_type > 0) then
       base_obs_kind = get_obs_kind_var_type(base_obs_type)
    else
+!!$      if(base_obs_type .eq. 0) print *, 'SEQUENTIAL_OBS: i = ', i, &
+!!$           ', base_obs_type = ', base_obs_type, ', base_obs_kind = ', base_obs_kind
+!!$      if(base_obs_kind .eq. 0) print *, 'SEQUENTIAL_OBS: i = ', i, &
+!!$           ', base_obs_type = ', base_obs_type, ', base_obs_kind = ', base_obs_kind
       call get_state_meta_data(-1 * base_obs_type, dummyloc, base_obs_kind)  ! identity obs
    endif
    ! Get the value of the observation
@@ -2589,8 +2598,3 @@ end function count_close
 
 end module assim_tools_mod
 
-! <next few lines under version control, do not edit>
-! $URL$
-! $Id$
-! $Revision$
-! $Date$
diff --git a/common/types_mod.f90 b/common/types_mod.f90
@@ -1,8 +1,6 @@
 ! 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 types_mod
 
@@ -20,10 +18,9 @@ MODULE types_mod
 public :: obstypelength
 
 ! version controlled file description for error handling, do not edit
-character(len=256), parameter :: source   = &
-   "$URL$"
-character(len=32 ), parameter :: revision = "$Revision$"
-character(len=128), parameter :: revdate  = "$Date$"
+character(len=*), parameter :: source   = 'types_mod.f90'
+character(len=*), parameter :: revision = ''
+character(len=*), parameter :: revdate  = ''
 
 SAVE
 
@@ -95,8 +92,3 @@ MODULE types_mod
 
 END MODULE types_mod
 
-! <next few lines under version control, do not edit>
-! $URL$
-! $Id$
-! $Revision$
-! $Date$
diff --git a/cov_cutoff/cov_cutoff_mod.f90 b/cov_cutoff/cov_cutoff_mod.f90
@@ -1,8 +1,6 @@
 ! 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 cov_cutoff_mod
 
@@ -19,10 +17,9 @@ module cov_cutoff_mod
 public :: comp_cov_factor
 
 ! version controlled file description for error handling, do not edit
-character(len=256), parameter :: source   = &
-   "$URL$"
-character(len=32 ), parameter :: revision = "$Revision$"
-character(len=128), parameter :: revdate  = "$Date$"
+character(len=*), parameter :: source   = 'cov_cutoff_mod.f90'
+character(len=*), parameter :: revision = ''
+character(len=*), parameter :: revdate  = ''
 
 
 !============================================================================
@@ -183,8 +180,3 @@ end function comp_cov_factor
 
 end module cov_cutoff_mod
 
-! <next few lines under version control, do not edit>
-! $URL$
-! $Id$
-! $Revision$
-! $Date$
diff --git a/diagnostics/threed_sphere/obs_diag.f90 b/diagnostics/threed_sphere/obs_diag.f90
@@ -1,8 +1,6 @@
 ! 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$
 
 program obs_diag
 
@@ -61,10 +59,9 @@ program obs_diag
 implicit none
 
 ! version controlled file description for error handling, do not edit
-character(len=256), parameter :: source   = &
-   "$URL$"
-character(len=32 ), parameter :: revision = "$Revision$"
-character(len=128), parameter :: revdate  = "$Date$"
+character(len=*), parameter :: source   = 'threed_sphere/obs_diag.f90'
+character(len=*), parameter :: revision = ''
+character(len=*), parameter :: revdate  = ''
 
 !---------------------------------------------------------------------
 ! Some basic parameters
@@ -4809,8 +4806,3 @@ end function IRemoveDuplicates
 
 end program obs_diag
 
-! <next few lines under version control, do not edit>
-! $URL$
-! $Id$
-! $Revision$
-! $Date$
diff --git a/ensemble_manager/ensemble_manager_mod.f90 b/ensemble_manager/ensemble_manager_mod.f90
@@ -1,8 +1,6 @@
 ! 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 ensemble_manager_mod
 
@@ -32,10 +30,9 @@ module ensemble_manager_mod
 private
 
 ! version controlled file description for error handling, do not edit
-character(len=256), parameter :: source   = &
-   "$URL$"
-character(len=32 ), parameter :: revision = "$Revision$"
-character(len=128), parameter :: revdate  = "$Date$"
+character(len=*), parameter :: source   = 'ensemble_manager_mod.f90'
+character(len=*), parameter :: revision = ''
+character(len=*), parameter :: revdate  = ''
 
 !PAR other storage option control can be implemented here. In particular, want to find
 !PAR some way, either allocating or multiple addressing, to use same chunk of storage
@@ -1858,9 +1855,3 @@ end function map_task_to_pe
 
 end module ensemble_manager_mod
 
-
-! <next few lines under version control, do not edit>
-! $URL$
-! $Id$
-! $Revision$
-! $Date$
diff --git a/filter/filter.f90 b/filter/filter.f90
@@ -1,8 +1,6 @@
 ! 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$
 
 program filter
 
@@ -57,10 +55,9 @@ program filter
 implicit none
 
 ! version controlled file description for error handling, do not edit
-character(len=256), parameter :: source   = &
-   "$URL$"
-character(len=32 ), parameter :: revision = "$Revision$"
-character(len=128), parameter :: revdate  = "$Date$"
+character(len=*), parameter :: source   = 'filter.f90'
+character(len=*), parameter :: revision = ''
+character(len=*), parameter :: revdate  = ''
 
 ! Some convenient global storage items
 character(len=129)      :: msgstring
@@ -1960,8 +1957,3 @@ end function failed_outlier
 
 end program filter
 
-! <next few lines under version control, do not edit>
-! $URL$
-! $Id$
-! $Revision$
-! $Date$
diff --git a/filter/wakeup_filter.f90 b/filter/wakeup_filter.f90
@@ -1,8 +1,6 @@
 ! 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$
 
 program wakeup_filter
 
@@ -24,8 +22,3 @@ program wakeup_filter
 
 end program wakeup_filter
 
-! <next few lines under version control, do not edit>
-! $URL$
-! $Id$
-! $Revision$
-! $Date$