[Dart-dev] DART/branches Revision: 12869

[dart at ucar.edu]

thoar at ucar.edu
2018-10-01 16:17:03 -0600 (Mon, 01 Oct 2018)
157
More accurate descriptors for SOIL_LIQUID_WATER, SOIL_ICE
AFAICT only noah is using SOIL_MOISTURE ... clm has liquid and ice
that make up soil moisture ...




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-10-01 21:29:42 UTC (rev 12868)
+++ DART/branches/cesm_clm/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2018-10-01 22:17:03 UTC (rev 12869)
@@ -252,8 +252,8 @@
     QTY_SNOW_THICKNESS              = 107, &
     QTY_SNOW_WATER                  = 108, &
     QTY_SNOWCOVER_FRAC              = 109, &
-    QTY_LIQUID_WATER                = 110, &
-    QTY_ICE                         = 111, &
+    QTY_SOIL_LIQUID_WATER           = 110, &
+    QTY_SOIL_ICE                    = 111, &
     QTY_CARBON                      = 112, &
     QTY_SOIL_CARBON                 = 113, &
     QTY_ROOT_CARBON                 = 114, &
@@ -750,8 +750,8 @@
 obs_kind_names(107) = obs_kind_type(QTY_SNOW_THICKNESS        ,'QTY_SNOW_THICKNESS')
 obs_kind_names(108) = obs_kind_type(QTY_SNOW_WATER            ,'QTY_SNOW_WATER')
 obs_kind_names(109) = obs_kind_type(QTY_SNOWCOVER_FRAC        ,'QTY_SNOWCOVER_FRAC')
-obs_kind_names(110) = obs_kind_type(QTY_LIQUID_WATER          ,'QTY_LIQUID_WATER')
-obs_kind_names(111) = obs_kind_type(QTY_ICE                   ,'QTY_ICE')
+obs_kind_names(110) = obs_kind_type(QTY_SOIL_LIQUID_WATER     ,'QTY_SOIL_LIQUID_WATER')
+obs_kind_names(111) = obs_kind_type(QTY_SOIL_ICE              ,'QTY_SOIL_ICE')
 obs_kind_names(112) = obs_kind_type(QTY_CARBON                ,'QTY_CARBON')
 obs_kind_names(113) = obs_kind_type(QTY_SOIL_CARBON           ,'QTY_SOIL_CARBON')
 obs_kind_names(114) = obs_kind_type(QTY_ROOT_CARBON           ,'QTY_ROOT_CARBON')

Modified: DART/branches/cesm_clm/models/clm/model_mod.f90
===================================================================
--- DART/branches/cesm_clm/models/clm/model_mod.f90	2018-10-01 21:29:42 UTC (rev 12868)
+++ DART/branches/cesm_clm/models/clm/model_mod.f90	2018-10-01 22:17:03 UTC (rev 12869)
@@ -63,8 +63,8 @@
 
 use     obs_kind_mod, only : QTY_SOIL_TEMPERATURE,       &
                              QTY_SOIL_MOISTURE,          &
-                             QTY_LIQUID_WATER,           &
-                             QTY_ICE,                    &
+                             QTY_SOIL_LIQUID_WATER,      &
+                             QTY_SOIL_ICE,               &
                              QTY_SNOWCOVER_FRAC,         &
                              QTY_SNOW_THICKNESS,         &
                              QTY_LEAF_CARBON,            &
@@ -417,6 +417,7 @@
       if((indx >= get_index_start(progvar(n)%domain, varstring)) .and. &
          (indx <= get_index_end(  progvar(n)%domain, varstring))) then
          var_type = progvar(n)%dart_qty
+       ! TJH maybe modify that if it is not 'land', it should be ???
          exit FINDTYPE
       endif
    enddo FINDTYPE
@@ -2046,17 +2047,17 @@
 
       ! TJH FIXME : make sure this is consistent with the COSMOS operator
       ! This is terrible ... the COSMOS operator wants m3/m3 ... CLM is kg/m2
-      call get_grid_vertval(state_handle, ens_size, location, QTY_LIQUID_WATER, interp_val_liq, istatus_liq)
+      call get_grid_vertval(state_handle, ens_size, location, QTY_SOIL_LIQUID_WATER, interp_val_liq, istatus_liq)
       call track_status(ens_size, istatus_liq, interp_val_liq, istatus, return_now)
       if (return_now) return
     
-      call get_grid_vertval(state_handle, ens_size, location, QTY_ICE,          interp_val_ice, istatus_ice)
+      call get_grid_vertval(state_handle, ens_size, location, QTY_SOIL_ICE,          interp_val_ice, istatus_ice)
       call track_status(ens_size, istatus_ice, interp_val_ice, istatus, return_now)
       if (return_now) return
 
       where (istatus == 0) expected_obs = interp_val_liq + interp_val_ice
 
-   case ( QTY_SOIL_TEMPERATURE, QTY_LIQUID_WATER, QTY_ICE )
+   case ( QTY_SOIL_TEMPERATURE, QTY_SOIL_LIQUID_WATER, QTY_SOIL_ICE )
 
       call get_grid_vertval(state_handle, ens_size, location, obs_kind, expected_obs, istatus)
 

Modified: DART/branches/cesm_clm/models/clm/work/input.nml
===================================================================
--- DART/branches/cesm_clm/models/clm/work/input.nml	2018-10-01 21:29:42 UTC (rev 12868)
+++ DART/branches/cesm_clm/models/clm/work/input.nml	2018-10-01 22:17:03 UTC (rev 12869)
@@ -152,17 +152,18 @@
 &obs_kind_nml
    assimilate_these_obs_types = 'SOIL_TEMPERATURE',
                                 'SOIL_MOISTURE',
+                                'BIOMASS',
                                 'TOWER_NETC_ECO_EXCHANGE',
                                 'TOWER_LATENT_HEAT_FLUX',
                                 'TOWER_SENSIBLE_HEAT_FLUX',
                                 'MODIS_SNOWCOVER_FRAC',
                                 'COSMOS_NEUTRON_INTENSITY',
-                                'MODIS_FPAR'
+                                'MODIS_LEAF_AREA_INDEX',
+                                'OCO2_SIF'
    evaluate_these_obs_types   = 'null'
    /
 
 
-
 # Each variable must have 6 entries.
 # 1: variable name
 # 2: DART KIND
@@ -184,10 +185,9 @@
    assimilation_period_seconds  = 3600
    calendar                     = 'Gregorian'
    debug                        = 0