[Dart-dev] DART/branches Revision: 12865

[dart at ucar.edu]

thoar at ucar.edu
2018-09-28 08:50:47 -0600 (Fri, 28 Sep 2018)
228
Changes from the git branch.
The sort_mod.f90 routine has sorting overloads for more types.
The noah model has the work from the summer with Jingjing.
The wrf_hydro obs_diag has an extension to support identity streamflow obs.




Modified: DART/branches/rma_wrfHydro/assimilation_code/modules/io/direct_netcdf_mod.f90
===================================================================
--- DART/branches/rma_wrfHydro/assimilation_code/modules/io/direct_netcdf_mod.f90	2018-09-28 01:43:46 UTC (rev 12864)
+++ DART/branches/rma_wrfHydro/assimilation_code/modules/io/direct_netcdf_mod.f90	2018-09-28 14:50:47 UTC (rev 12865)
@@ -123,10 +123,10 @@
           nc_get_num_times
 
 ! version controlled file description for error handling, do not edit
-character(len=256), parameter :: source   = &
+character(len=*), parameter :: source   = &
    "$URL$"
-character(len=32 ), parameter :: revision = "$Revision$"
-character(len=128), parameter :: revdate  = "$Date$"
+character(len=*), parameter :: revision = "$Revision$"
+character(len=*), parameter :: revdate  = "$Date$"
 
 ! only a single MPI Task reads and writes reads the state variable,
 ! when using single_file_{input,output} = .true.
@@ -1478,9 +1478,9 @@
           variable = max(minclamp, variable)
        endif
    
-      write(msgstring, *) trim(varname)// ' lower bound ', minclamp, ' min value ', my_minmax(1)
-      call error_handler(E_ALLMSG, 'clamp_variable', msgstring, &
-                         source,revision,revdate)
+! TJH TOO VERBOSE      write(msgstring, *) trim(varname)// ' lower bound ', minclamp, ' min value ', my_minmax(1)
+! TJH TOO VERBOSE      call error_handler(E_ALLMSG, 'clamp_variable', msgstring, &
+! TJH TOO VERBOSE                         source,revision,revdate)
    endif
 endif ! min range set
 
@@ -1494,9 +1494,9 @@
          variable = min(maxclamp, variable)
       endif
 
-      write(msgstring, *) trim(varname)// ' upper bound ', maxclamp, ' max value ', my_minmax(2)
-      call error_handler(E_ALLMSG, 'clamp_variable', msgstring, &
-                         source,revision,revdate)
+! TJH TOO VERBOSE      write(msgstring, *) trim(varname)// ' upper bound ', maxclamp, ' max value ', my_minmax(2)
+! TJH TOO VERBOSE      call error_handler(E_ALLMSG, 'clamp_variable', msgstring, &
+! TJH TOO VERBOSE                         source,revision,revdate)
    endif
 
 endif ! max range set

Modified: DART/branches/rma_wrfHydro/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90
===================================================================
--- DART/branches/rma_wrfHydro/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2018-09-28 01:43:46 UTC (rev 12864)
+++ DART/branches/rma_wrfHydro/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2018-09-28 14:50:47 UTC (rev 12865)
@@ -281,7 +281,10 @@
     QTY_WATER_TABLE_DEPTH           = 128, &
     QTY_FPAR                        = 129, &
     QTY_TOTAL_WATER_STORAGE         = 130, &
-    QTY_SNOW_TEMPERATURE            = 131
+    QTY_SNOW_TEMPERATURE            = 131, &
+    QTY_SURFACE_RUNOFF              = 132, &
+    QTY_UNDER_RUNOFF                = 133, &
+    QTY_AQUIFER_WATER               = 134
 
 ! kinds for NOAH  (Tim Hoar)
 integer, parameter, public :: &
@@ -740,6 +743,9 @@
 obs_kind_names(129) = obs_kind_type(QTY_FPAR                  ,'QTY_FPAR')
 obs_kind_names(130) = obs_kind_type(QTY_TOTAL_WATER_STORAGE   ,'QTY_TOTAL_WATER_STORAGE')
 obs_kind_names(131) = obs_kind_type(QTY_SNOW_TEMPERATURE      ,'QTY_SNOW_TEMPERATURE')
+obs_kind_names(132) = obs_kind_type(QTY_SURFACE_RUNOFF        ,'QTY_SURFACE_RUNOFF')
+obs_kind_names(133) = obs_kind_type(QTY_UNDER_RUNOFF          ,'QTY_UNDER_RUNOFF')
+obs_kind_names(134) = obs_kind_type(QTY_AQUIFER_WATER         ,'QTY_AQUIFER_WATER')
 
 obs_kind_names(140) = obs_kind_type(QTY_NEUTRON_INTENSITY     ,'QTY_NEUTRON_INTENSITY')
 obs_kind_names(141) = obs_kind_type(QTY_CANOPY_WATER          ,'QTY_CANOPY_WATER')

Modified: DART/branches/rma_wrfHydro/assimilation_code/modules/utilities/distributed_state_mod.f90
===================================================================
--- DART/branches/rma_wrfHydro/assimilation_code/modules/utilities/distributed_state_mod.f90	2018-09-28 01:43:46 UTC (rev 12864)
+++ DART/branches/rma_wrfHydro/assimilation_code/modules/utilities/distributed_state_mod.f90	2018-09-28 14:50:47 UTC (rev 12865)
@@ -33,10 +33,10 @@
           free_state_window, create_mean_window, free_mean_window
 
 ! version controlled file description for error handling, do not edit
-character(len=256), parameter :: source   = &
+character(len=*), parameter :: source   = &
    "$URL$"
-character(len=32 ), parameter :: revision = "$Revision$"
-character(len=128), parameter :: revdate  = "$Date$"
+character(len=*), parameter :: revision = "$Revision$"
+character(len=*), parameter :: revdate  = "$Date$"
 
 contains
 
@@ -44,6 +44,7 @@
 !> Gets all copies of an element of the state vector from the process who owns it
 !> Assumes ensemble complete. This differes from get_state as it now works on an
 !> array of state indices rather than a single index.
+
 subroutine get_state_array(x, my_index, state_ens_handle)
 
 real(r8),            intent(out) :: x(data_count) !> all copies of an element of the state vector
@@ -71,9 +72,11 @@
 
 end subroutine get_state_array