[Dart-dev] DART/branches Revision: 12867

[dart at ucar.edu]

thoar at ucar.edu
2018-10-01 14:21:31 -0600 (Mon, 01 Oct 2018)
114
Adding FO for solar induced fluorescence ...
Andy has code that puts FSIF in a CLM history file (gridcell-level)




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	2018-09-30 23:51:18 UTC (rev 12866)
+++ DART/branches/cesm_clm/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2018-10-01 20:21:31 UTC (rev 12867)
@@ -443,7 +443,8 @@
   QTY_X_LAMBDA                      = 352, &
   QTY_UNCONFINED_WATER              = 353, &
   QTY_SATURATED_WATER               = 354, &
-  QTY_SNOW_DEPTH                    = 355
+  QTY_SNOW_DEPTH                    = 355, &
+  QTY_SOLAR_INDUCED_FLUORESCENCE    = 356
 
 ! kinds for CICE added by C. Bitz
 integer, parameter, public :: &
@@ -908,6 +909,7 @@
 obs_kind_names(353) = obs_kind_type(QTY_UNCONFINED_WATER           ,'QTY_UNCONFINED_WATER')
 obs_kind_names(354) = obs_kind_type(QTY_SATURATED_WATER            ,'QTY_SATURATED_WATER')
 obs_kind_names(355) = obs_kind_type(QTY_SNOW_DEPTH                 ,'QTY_SNOW_DEPTH')
+obs_kind_names(356) = obs_kind_type(QTY_SOLAR_INDUCED_FLUORESCENCE ,'QTY_SOLAR_INDUCED_FLUORESCENCE')
 
 obs_kind_names(411) = obs_kind_type(QTY_SEAICE_AGREG_CONCENTR ,'QTY_SEAICE_AGREG_CONCENTR')
 obs_kind_names(412) = obs_kind_type(QTY_SEAICE_AGREG_VOLUME   ,'QTY_SEAICE_AGREG_VOLUME')

Modified: DART/branches/cesm_clm/models/clm/model_mod.f90
===================================================================
--- DART/branches/cesm_clm/models/clm/model_mod.f90	2018-09-30 23:51:18 UTC (rev 12866)
+++ DART/branches/cesm_clm/models/clm/model_mod.f90	2018-10-01 20:21:31 UTC (rev 12867)
@@ -79,6 +79,7 @@
                              QTY_FPAR_SUNLIT_DIFFUSE,    &
                              QTY_FPAR_SHADED_DIRECT,     &
                              QTY_FPAR_SHADED_DIFFUSE,    &
+                             QTY_SOLAR_INDUCED_FLUORESCENCE, &
                              get_index_for_quantity,      &
                              get_name_for_quantity
 
@@ -666,7 +667,7 @@
    call nc_close_file(ncid, routine, progvar(ivar)%origin)
    ncid = 0
 
-   if (debug > 0 .and. do_output()) call dump_progvar(ivar)
+!  if (debug > 0 .and. do_output()) call dump_progvar(ivar)
 enddo
 
 model_size = progvar(nfields)%indexN
@@ -2064,7 +2065,8 @@
           QTY_FRAC_PHOTO_AVAIL_RADIATION, &
           QTY_FPAR_SUNLIT_DIRECT, QTY_FPAR_SUNLIT_DIFFUSE, &
           QTY_FPAR_SHADED_DIRECT, QTY_FPAR_SHADED_DIFFUSE, &
-          QTY_LIVE_STEM_CARBON,   QTY_DEAD_STEM_CARBON)
+          QTY_LIVE_STEM_CARBON,   QTY_DEAD_STEM_CARBON, &
+          QTY_SOLAR_INDUCED_FLUORESCENCE)
 
       call compute_gridcell_value(state_handle, ens_size, location, obs_kind, expected_obs, istatus)
 
@@ -2219,7 +2221,7 @@
 enddo ELEMENTS
 
 do imem = 1,ens_size
-   write(*,*)'imem, total_area(imem), istatus(imem)', imem, total_area(imem), istatus(imem)
+!  write(*,*)'imem, total_area(imem), istatus(imem)', imem, total_area(imem), istatus(imem)
    if (total_area(imem) > 0.0_r8 .and. istatus(imem) == 0) then
       interp_val(imem) = total(imem) / total_area(imem)
    else