[Dart-dev] DART/branches Revision: 12131

[dart at ucar.edu]

thoar at ucar.edu
2017-11-20 15:54:06 -0700 (Mon, 20 Nov 2017)
62
Adding some of the BGC forward operators from the Tb branch.




Modified: DART/branches/cesm_clm/assimilation_code/location/utilities/default_location_mod.f90
===================================================================
--- DART/branches/cesm_clm/assimilation_code/location/utilities/default_location_mod.f90	2017-11-20 22:34:51 UTC (rev 12130)
+++ DART/branches/cesm_clm/assimilation_code/location/utilities/default_location_mod.f90	2017-11-20 22:54:06 UTC (rev 12131)
@@ -23,17 +23,15 @@
           get_vertical_localization_coord, set_vertical_localization_coord
 
 ! 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$"
 
 integer :: location_vertical_localization_coord = 0
 
 logical, save :: module_initialized = .false.
 
-character(len = 129) :: errstring
-
 contains
 
 !----------------------------------------------------------------------------

Modified: DART/branches/cesm_clm/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90
===================================================================
--- DART/branches/cesm_clm/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2017-11-20 22:34:51 UTC (rev 12130)
+++ DART/branches/cesm_clm/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2017-11-20 22:54:06 UTC (rev 12131)
@@ -1,4 +1,4 @@
-! DART software - Copyright UCAR. This open source software is provided
+!  DART software - Copyright 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
 !
@@ -134,8 +134,8 @@
     QTY_ALTIMETER_TENDENCY          = 48
 
 ! kind for precip water; contrast with
-! total precip water (also in this file), 
-! which is the total column integrated value. 
+! total precip water (also in this file),
+! which is the total column integrated value.
 integer, parameter, public :: &
     QTY_PRECIPITABLE_WATER          = 49
 
@@ -271,16 +271,15 @@
     QTY_STEM_NITROGEN               = 126, &
     QTY_LEAF_NITROGEN               = 127, &
     QTY_WATER_TABLE_DEPTH           = 128, &
-    QTY_FPAR                        = 129, &
+    QTY_FRAC_PHOTO_AVAIL_RADIATION  = 129, &   ! generic "FPAR"
     QTY_TOTAL_WATER_STORAGE         = 130
 
-! kinds for NOAH  (Tim Hoar)
 integer, parameter, public :: &
     QTY_NEUTRON_INTENSITY           = 140, &
     QTY_CANOPY_WATER                = 141, &
     QTY_GROUND_HEAT_FLUX            = 142
 
-! more kinds for TIEGCM Alex Chartier 
+! more kinds for TIEGCM Alex Chartier
 integer, parameter, public :: &
     QTY_VERTICAL_TEC                = 143, &
     QTY_O_N2_COLUMN_DENSITY_RATIO   = 144
@@ -301,7 +300,7 @@
 integer, parameter, public :: &
     QTY_CO01                        = 161, &
     QTY_CO02                        = 162, &
-    QTY_CO03                        = 163 
+    QTY_CO03                        = 163
 
 integer, parameter, public :: &
     QTY_SFCO                        = 170, &
@@ -375,86 +374,141 @@
   QTY_VELOCITY_VERTICAL_NO          = 284, &
   QTY_GND_GPS_VTEC                  = 285, &
   QTY_DENSITY_ION_OP                = 286
- 
+
+! WRF-Hydro (James McCreight)
+integer, parameter, public :: &
+  QTY_STREAMFLOW                    = 290, &
+  QTY_SURFACE_HEAD                  = 291
+
 ! more land kinds
 integer, parameter, public :: &
   QTY_BRIGHTNESS_TEMPERATURE        = 300, &
   QTY_VEGETATION_TEMPERATURE        = 301, &
   QTY_CANOPY_HEIGHT                 = 302, &
-  QTY_FPAR_DIRECT                   = 303, &
-  QTY_FPAR_DIFFUSE                  = 304, &
-  QTY_FPAR_SUNLIT_DIRECT            = 305, &
-  QTY_FPAR_SUNLIT_DIFFUSE           = 306, &
-  QTY_FPAR_SHADED_DIRECT            = 307, &
-  QTY_FPAR_SHADED_DIFFUSE           = 308, &
-  QTY_FPSN                          = 309, &
-  QTY_FSIF                          = 310
+  QTY_FRACTION_ABSORBED_PAR         = 303, &  ! "FAPAR"
+  QTY_FPAR_DIRECT                   = 304, &