[Dart-dev] Added/ Revision: 12806

[dart at ucar.edu]

thoar at ucar.edu
2018-08-31 11:50:26 -0600 (Fri, 31 Aug 2018)
247
Reintegrating yz-cice branch. This codifies Yongfei's latest efforts.

Using new /glade filesystem layout. Many of the observation converters
that end in _to_obs_netcdf.f90 may be able to be consolidated and replaced by 
a perfect_model_obs run.




Modified: DART/branches/rma_trunk/CHANGELOG
===================================================================
--- DART/branches/rma_trunk/CHANGELOG	2018-08-31 16:53:03 UTC (rev 12805)
+++ DART/branches/rma_trunk/CHANGELOG	2018-08-31 17:50:26 UTC (rev 12806)
@@ -745,7 +745,7 @@
 - Removed makefiles for the obsolete trans_time program.
 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+ Jun 18 2018 :: CAM/CESM 2.0, DART QC 8, closest_member_tool  Revision: XXXXX 
++ Jun 18 2018 :: CAM/CESM 2.0, DART QC 8, closest_member_tool  Revision: 12681 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 - Support for CAM assimilations in the CESM 2.0 release.  See 
@@ -786,7 +786,7 @@
 "convert_all_state_verticals_first = .true.' can also be set.
 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+ MMM DD YYYY :: summary of next changes                    $Revision$
++ Aug 14 2018 :: WRF Polar, obs_diag files                     Revision: 12778
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 - fix for WRF's wind direction vectors when using the Polar Stereographic 
@@ -798,6 +798,20 @@
 
 - increased the maximum number of input files to obs_diag from 100 to 10000.
 
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ Aug 31 2018 :: reintegrate CICE branch (yz-cice)          $Revision$
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+- Yongfei Zhang and Cecilia Bitz had improvements to the CICE model and 
+  observation converters and forward operators. These changes also use the
+  locations of the 'new' glade filesystem. They used CESM tag: cesm2_0_alpha06n
+
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ MMM DD YYYY :: summary of next changes                    $Revision$
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+
+
 # <next few lines under version control, do not edit>
 # $URL$
 # $Revision$

Modified: DART/branches/rma_trunk/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90
===================================================================
--- DART/branches/rma_trunk/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2018-08-31 16:53:03 UTC (rev 12805)
+++ DART/branches/rma_trunk/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2018-08-31 17:50:26 UTC (rev 12806)
@@ -22,10 +22,18 @@
 implicit none
 private
 
-public :: get_name_for_type_of_obs, assimilate_this_type_of_obs, &
-          evaluate_this_type_of_obs, get_quantity_for_type_of_obs, get_index_for_type_of_obs, &
-          write_type_of_obs_table, read_type_of_obs_table, get_type_of_obs_from_menu, map_type_of_obs_table,  &
-          use_ext_prior_this_type_of_obs, get_name_for_quantity, get_index_for_quantity
+public :: get_name_for_type_of_obs,       &
+          assimilate_this_type_of_obs,    &
+          evaluate_this_type_of_obs,      &
+          get_quantity_for_type_of_obs,   &
+          get_index_for_type_of_obs,      &
+          write_type_of_obs_table,        &
+          read_type_of_obs_table,         &
+          get_type_of_obs_from_menu,      &
+          map_type_of_obs_table,          &
+          use_ext_prior_this_type_of_obs, &
+          get_name_for_quantity,          &
+          get_index_for_quantity
 
 ! Added by nsc to try to limit the number of global vars exported from
 ! this program.  i do not like this terminology, but since we are still
@@ -438,7 +446,9 @@
   QTY_SOM_TEMPERATURE               = 353, &
   QTY_SEAICE_FY                     = 354, &
   QTY_SEAICE_AGREG_FY               = 355, &
-  QTY_SEAICE_AGREG_SURFACETEMP      = 356 
+  QTY_SEAICE_AGREG_SURFACETEMP      = 356, &
+  QTY_SEAICE_AGREG_FREEBOARD        = 357, &
+  QTY_SEAICE_CATEGORY               = 358
 
 integer, parameter, public :: &
   QTY_SEA_SURFACE_ANOMALY           = 360
@@ -473,10 +483,10 @@
 !----------------------------------------------------------------------------
 
 ! 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$"
 
 logical, save :: module_initialized = .false.
 
@@ -856,6 +866,8 @@
 obs_kind_names(354) = obs_kind_type(QTY_SEAICE_FY,             'QTY_SEAICE_FY')
 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')