[Dart-dev] DART/branches Revision: 12792

[dart at ucar.edu]

thoar at ucar.edu
2018-08-28 12:13:13 -0600 (Tue, 28 Aug 2018)
75
obs_def_cice_mod.f90 no longer has a dependence on the dart_cice_mod.f90





Modified: DART/branches/yz-cice/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90
===================================================================
--- DART/branches/yz-cice/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2018-08-28 17:59:34 UTC (rev 12791)
+++ DART/branches/yz-cice/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2018-08-28 18:13:13 UTC (rev 12792)
@@ -439,9 +439,9 @@
   QTY_SEAICE_FY                     = 354, &
   QTY_SEAICE_AGREG_FY               = 355, &
   QTY_SEAICE_AGREG_SURFACETEMP      = 356, &
-  QTY_SEAICE_AGREG_FREEBOARD        = 357
+  QTY_SEAICE_AGREG_FREEBOARD        = 357, &
+  QTY_SEAICE_CATEGORY               = 358
 
-
 integer, parameter, public :: &
   QTY_SEA_SURFACE_ANOMALY           = 360
 
@@ -859,6 +859,7 @@
 obs_kind_names(355) = obs_kind_type(QTY_SEAICE_AGREG_FY,       'QTY_SEAICE_AGREG_FY')
 obs_kind_names(356) = obs_kind_type(QTY_SEAICE_AGREG_SURFACETEMP,'QTY_SEAICE_AGREG_SURFACETEMP')
 obs_kind_names(357) = obs_kind_type(QTY_SEAICE_AGREG_FREEBOARD,'QTY_SEAICE_AGREG_FREEBOARD')
+obs_kind_names(358) = obs_kind_type(QTY_SEAICE_CATEGORY,       'QTY_SEAICE_CATEGORY')
 
 obs_kind_names(360) = obs_kind_type(QTY_SEA_SURFACE_ANOMALY,   'QTY_SEA_SURFACE_ANOMALY')
 obs_kind_names(361) = obs_kind_type(QTY_LARGE_SCALE_STATE,     'QTY_LARGE_SCALE_STATE')

Modified: DART/branches/yz-cice/models/cice/model_mod.f90
===================================================================
--- DART/branches/yz-cice/models/cice/model_mod.f90	2018-08-28 17:59:34 UTC (rev 12791)
+++ DART/branches/yz-cice/models/cice/model_mod.f90	2018-08-28 18:13:13 UTC (rev 12792)
@@ -53,6 +53,7 @@
                                   QTY_SEAICE_AGREG_SNOWVOLUME, &
                                   QTY_SEAICE_AGREG_THICKNESS , &
                                   QTY_SEAICE_AGREG_SNOWDEPTH , &
+                                  QTY_SEAICE_CATEGORY        , &
                                   QTY_U_SEAICE_COMPONENT     , &
                                   QTY_V_SEAICE_COMPONENT     , &
                                   QTY_SEAICE_ALBEDODIRVIZ    , &
@@ -874,8 +875,21 @@
 llat    = loc_array(2)
 cat_index = int(loc_array(3))
 
-if (debug > 1) print *, 'requesting interpolation of ', obs_type, ' at ', llon, llat, cat_index
+! Special case. Only used when trying to determine the number of ice categories.
+! Note the early return. The actual lat/lon is unimportant.
 
+if (obs_type == QTY_SEAICE_CATEGORY) then
+   if (cat_index <= Ncat) then
+      istatus      = 0
+      expected_obs = cat_index
+      RETURN
+   endif
+endif
+
+if (debug > 1) then
+   print *, 'requesting interpolation of ', obs_type, ' at ', llon, llat, cat_index
+endif
+
 ! The base_offset is the index of state vector that corresponds to 
 ! a variable block without regard to level or location, so it can be 
 ! viewed as pointing to first cat for cice 3d vars

Modified: DART/branches/yz-cice/models/cice/work/path_names_cice_to_dart
===================================================================
--- DART/branches/yz-cice/models/cice/work/path_names_cice_to_dart	2018-08-28 17:59:34 UTC (rev 12791)
+++ DART/branches/yz-cice/models/cice/work/path_names_cice_to_dart	2018-08-28 18:13:13 UTC (rev 12792)
@@ -14,13 +14,13 @@
 assimilation_code/modules/utilities/netcdf_utilities_mod.f90
 assimilation_code/modules/utilities/null_mpi_utilities_mod.f90
 assimilation_code/modules/utilities/null_win_mod.f90
+assimilation_code/modules/utilities/options_mod.f90
 assimilation_code/modules/utilities/random_seq_mod.f90
 assimilation_code/modules/utilities/sort_mod.f90
 assimilation_code/modules/utilities/time_manager_mod.f90
 assimilation_code/modules/utilities/types_mod.f90
 assimilation_code/modules/utilities/utilities_mod.f90
-assimilation_code/modules/utilities/options_mod.f90
+models/cice/cice_to_dart.f90
+models/cice/dart_cice_mod.f90
+models/cice/model_mod.f90
 models/utilities/default_model_mod.f90
-models/cice/model_mod.f90
-models/cice/dart_cice_mod.f90
-models/cice/cice_to_dart.f90

Modified: DART/branches/yz-cice/observations/forward_operators/obs_def_cice_mod.f90
===================================================================
--- DART/branches/yz-cice/observations/forward_operators/obs_def_cice_mod.f90	2018-08-28 17:59:34 UTC (rev 12791)
+++ DART/branches/yz-cice/observations/forward_operators/obs_def_cice_mod.f90	2018-08-28 18:13:13 UTC (rev 12792)
@@ -4,12 +4,9 @@
 !
 ! $Id$
 
-! FIXME: check to see if obs are of volume or thickness - for now we
+!>@todo FIXME: check to see if obs are of volume or thickness - for now we
 ! will assume volume.
 
-! FIXME: do we want to identify the satellite? (yes)
-!  AMSRE is a passive microwave
-
 ! BEGIN DART PREPROCESS KIND LIST
 !SYN_SEAICE_CONCENTR,             QTY_SEAICE_CONCENTR,           COMMON_CODE