[Dart-dev] DART/branches Revision: 11484

dart at ucar.edu dart at ucar.edu
Fri Apr 14 09:54:01 MDT 2017


thoar at ucar.edu
2017-04-14 09:53:59 -0600 (Fri, 14 Apr 2017)
193
This is an observation converter for solar induced fluorescence observations
which come in netCDF format from GOME-2 (global ozone monitoring experiment)
(these are from Joanna Joiner - GFDL)




Modified: DART/branches/Tb/obs_def/obs_def_tower_mod.f90
===================================================================
--- DART/branches/Tb/obs_def/obs_def_tower_mod.f90	2017-04-14 15:52:32 UTC (rev 11483)
+++ DART/branches/Tb/obs_def/obs_def_tower_mod.f90	2017-04-14 15:53:59 UTC (rev 11484)
@@ -26,7 +26,8 @@
 !TOWER_V_WIND_COMPONENT,         KIND_V_WIND_COMPONENT,           COMMON_CODE
 !TOWER_GLOBAL_RADIATION,         KIND_RADIATION,                  COMMON_CODE
 !TOWER_NET_CARBON_FLUX,          KIND_NET_CARBON_FLUX,            COMMON_CODE
-!FSIF,                           KIND_FSIF,                       COMMON_CODE
+!SOLAR_INDUCED_FLUORESCENCE,     KIND_SOLAR_INDUCED_FLUORESCENCE, COMMON_CODE
+!PARNORM_SIF,                    KIND_PAR_NORMALIZED_SIF,         COMMON_CODE
 !FPSN,                           KIND_FPSN,                       COMMON_CODE
 !TOWER_LATENT_HEAT_FLUX,         KIND_LATENT_HEAT_FLUX
 !TOWER_SENSIBLE_HEAT_FLUX,       KIND_SENSIBLE_HEAT_FLUX
@@ -504,6 +505,7 @@
 real(r8) :: numer, denom
 
 integer :: stat(4)
+integer :: obs_mytag !>@todo remove this usage
 
 istatus = 1           ! positive indicates failure, 0 == success
 obs_val = MISSING_R8
@@ -510,10 +512,10 @@
 
 if ( .not. module_initialized ) call initialize_module(state_time)
 
-call interpolate(state, location, KIND_RADIATION_VISIBLE_DOWN, visible_in, stat(1))
-call interpolate(state, location, KIND_RADIATION_NEAR_IR_DOWN,     nir_in, stat(2))
-call interpolate(state, location, KIND_RADIATION_VISIBLE_UP,  visible_out, stat(3))
-call interpolate(state, location, KIND_RADIATION_NEAR_IR_UP,      nir_out, stat(4))
+call interpolate(state, location, KIND_RADIATION_VISIBLE_DOWN, visible_in, obs_mytag, stat(1))
+call interpolate(state, location, KIND_RADIATION_NEAR_IR_DOWN,     nir_in, obs_mytag, stat(2))
+call interpolate(state, location, KIND_RADIATION_VISIBLE_UP,  visible_out, obs_mytag, stat(3))
+call interpolate(state, location, KIND_RADIATION_NEAR_IR_UP,      nir_out, obs_mytag, stat(4))
 
 if (any(stat /= 0)) then
    istatus = stat(1)*1000 + stat(2)*100 + stat(3)*10 + stat(4)

Modified: DART/branches/Tb/obs_kind/DEFAULT_obs_kind_mod.F90
===================================================================
--- DART/branches/Tb/obs_kind/DEFAULT_obs_kind_mod.F90	2017-04-14 15:52:32 UTC (rev 11483)
+++ DART/branches/Tb/obs_kind/DEFAULT_obs_kind_mod.F90	2017-04-14 15:53:59 UTC (rev 11484)
@@ -357,7 +357,7 @@
     KIND_FPAR_SHADED_DIRECT          = 307, &
     KIND_FPAR_SHADED_DIFFUSE         = 308, &
     KIND_FPSN                        = 309, &
-    KIND_FSIF                        = 310, &
+    KIND_SOLAR_INDUCED_FLUORESCENCE  = 310, &
     KIND_GROSS_PRIMARY_PROD_FLUX     = 311, &
     KIND_ER_FLUX                     = 312, &
     KIND_BIOMASS                     = 313, &
@@ -381,8 +381,8 @@
 ! frequencies/polarizations are better for cloudy vs. vegetated vs. ...
 ! so there is a need to discriminate.
 integer, parameter, public :: &
-    KIND_BRIGHTNESS_TEMPERATURE_6H   = 329, &
-    KIND_BRIGHTNESS_TEMPERATURE_6V   = 330, &
+    KIND_BRIGHTNESS_TEMPERATURE_06H  = 329, &
+    KIND_BRIGHTNESS_TEMPERATURE_06V  = 330, &
     KIND_BRIGHTNESS_TEMPERATURE_10H  = 331, &
     KIND_BRIGHTNESS_TEMPERATURE_10V  = 332, &
     KIND_BRIGHTNESS_TEMPERATURE_18H  = 333, &
@@ -420,7 +420,8 @@
     KIND_RTM_HMV                     = 363, &
     KIND_NUM_SNOW_LAYERS             = 364, &
     KIND_SNOW_DEPTH                  = 365, &
-    KIND_SNOW_INTERFACES             = 366
+    KIND_SNOW_INTERFACES             = 366, &
+    KIND_PAR_NORMALIZED_SIF          = 367
 
 !   KIND_T_VEG_CKYH   is KIND_VEGETATION_TEMPERATURE
 !   KIND_ELAI_CKYH    is KIND_LEAF_AREA_INDEX
@@ -429,7 +430,7 @@
 !! PRIVATE ONLY TO THIS MODULE. see comment below near the max_obs_specific
 !! declaration.
 
-integer, parameter :: max_obs_generic = 366
+integer, parameter :: max_obs_generic = 367
 
 !----------------------------------------------------------------------------
 ! This list is autogenerated by the 'preprocess' program.  To add new
@@ -749,7 +750,7 @@
 obs_kind_names(307) = obs_kind_type(KIND_FPAR_SHADED_DIRECT, 'KIND_FPAR_SHADED_DIRECT')
 obs_kind_names(308) = obs_kind_type(KIND_FPAR_SHADED_DIFFUSE, 'KIND_FPAR_SHADED_DIFFUSE')
 obs_kind_names(309) = obs_kind_type(KIND_FPSN, 'KIND_FPSN')
-obs_kind_names(310) = obs_kind_type(KIND_FSIF, 'KIND_FSIF')
+obs_kind_names(310) = obs_kind_type(KIND_SOLAR_INDUCED_FLUORESCENCE, 'KIND_SOLAR_INDUCED_FLUORESCENCE')
 obs_kind_names(311) = obs_kind_type(KIND_GROSS_PRIMARY_PROD_FLUX, 'KIND_GROSS_PRIMARY_PROD_FLUX')
 obs_kind_names(312) = obs_kind_type(KIND_ER_FLUX, 'KIND_ER_FLUX')
 obs_kind_names(313) = obs_kind_type(KIND_BIOMASS, 'KIND_BIOMASS')
@@ -769,8 +770,8 @@
 obs_kind_names(327) = obs_kind_type(KIND_DEAD_ROOT_NITROGEN, 'KIND_DEAD_ROOT_NITROGEN')
 obs_kind_names(328) = obs_kind_type(KIND_STEM_AREA_INDEX, 'KIND_STEM_AREA_INDEX')
 
-obs_kind_names(329) = obs_kind_type(KIND_BRIGHTNESS_TEMPERATURE_6H,  'KIND_BRIGHTNESS_TEMPERATURE_6H')
-obs_kind_names(330) = obs_kind_type(KIND_BRIGHTNESS_TEMPERATURE_6V,  'KIND_BRIGHTNESS_TEMPERATURE_6V')
+obs_kind_names(329) = obs_kind_type(KIND_BRIGHTNESS_TEMPERATURE_06H, 'KIND_BRIGHTNESS_TEMPERATURE_06H')
+obs_kind_names(330) = obs_kind_type(KIND_BRIGHTNESS_TEMPERATURE_06V, 'KIND_BRIGHTNESS_TEMPERATURE_06V')
 obs_kind_names(331) = obs_kind_type(KIND_BRIGHTNESS_TEMPERATURE_10H, 'KIND_BRIGHTNESS_TEMPERATURE_10H')
 obs_kind_names(332) = obs_kind_type(KIND_BRIGHTNESS_TEMPERATURE_10V, 'KIND_BRIGHTNESS_TEMPERATURE_10V')
 obs_kind_names(333) = obs_kind_type(KIND_BRIGHTNESS_TEMPERATURE_18H, 'KIND_BRIGHTNESS_TEMPERATURE_18H')


More information about the Dart-dev mailing list