[Dart-dev] DART/branches Revision: 12136

[dart at ucar.edu]

nancy at ucar.edu
2017-11-21 09:40:01 -0700 (Tue, 21 Nov 2017)
421
add RAW_STATE_VARIABLE to the simple advection defined observation
types since it doesn't use the standard obs_def_1d_mod.f90 file.

minor fixes in the obs_utilities to handle the cases where the
caller asks for the fill value and none exists for that variable.
it should return MISSING_R8 in that case but in some cases it
returned unset and in others it was a fatal error.

update the change log for last few changes.




Modified: DART/branches/rma_trunk/CHANGELOG
===================================================================
--- DART/branches/rma_trunk/CHANGELOG	2017-11-21 15:38:14 UTC (rev 12135)
+++ DART/branches/rma_trunk/CHANGELOG	2017-11-21 16:40:01 UTC (rev 12136)
@@ -580,7 +580,7 @@
 - Improved some error messages in location_io_mod and state_structure_mod
 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+ Nov 20 2017 :: 1D obs_diag fix, 1D power forward operator $Revision$
++ Nov 21 2017 :: 1D obs_diag fix, 1D power forward operator    Revision: 12123 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 - fixed a problem with tutorial section 18 - bad URL.
@@ -593,6 +593,11 @@
 
 - added a 1D power forward operator.
   
+- updates to the matlab plotting routines for NetCDF observation formats
+
+- World Ocean Database (WOD) converter supports partial year conversions
+  and 2013 file formats.
+
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 + MMM DD YYYY :: summary of next changes                    $Revision$
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Modified: DART/branches/rma_trunk/observations/forward_operators/obs_def_simple_advection_mod.f90
===================================================================
--- DART/branches/rma_trunk/observations/forward_operators/obs_def_simple_advection_mod.f90	2017-11-21 15:38:14 UTC (rev 12135)
+++ DART/branches/rma_trunk/observations/forward_operators/obs_def_simple_advection_mod.f90	2017-11-21 16:40:01 UTC (rev 12136)
@@ -5,6 +5,7 @@
 ! $Id$
 
 ! BEGIN DART PREPROCESS KIND LIST
+!RAW_STATE_VARIABLE,           QTY_STATE_VARIABLE,        COMMON_CODE
 !VELOCITY,                     QTY_VELOCITY,              COMMON_CODE
 !TRACER_CONCENTRATION,         QTY_TRACER_CONCENTRATION,  COMMON_CODE
 !TRACER_SOURCE,                QTY_TRACER_SOURCE,         COMMON_CODE

Modified: DART/branches/rma_trunk/observations/obs_converters/utilities/obs_utilities_mod.f90
===================================================================
--- DART/branches/rma_trunk/observations/obs_converters/utilities/obs_utilities_mod.f90	2017-11-21 15:38:14 UTC (rev 12135)
+++ DART/branches/rma_trunk/observations/obs_converters/utilities/obs_utilities_mod.f90	2017-11-21 16:40:01 UTC (rev 12136)
@@ -140,9 +140,9 @@
 
 subroutine query_3d_obs(obs, lat, lon, vval, vkind, obsv, okind, oerr, day, sec, qc)
 
-type(obs_type), intent(in)  :: obs
-integer,        intent(out) :: okind, vkind, day, sec
-real(r8),       intent(out) :: lat, lon, vval, obsv, oerr, qc
+ type(obs_type), intent(in)  :: obs
+ integer,        intent(out) :: okind, vkind, day, sec
+ real(r8),       intent(out) :: lat, lon, vval, obsv, oerr, qc
 
 real(r8)              :: obs_val(1), qc_val(1), locvals(3)
 type(obs_def_type)    :: obs_def
@@ -192,11 +192,11 @@
 
 subroutine add_obs_to_seq(seq, obs, obs_time, prev_obs, prev_time, first_obs)
 
-type(obs_sequence_type), intent(inout) :: seq
-type(obs_type),          intent(inout) :: obs, prev_obs
-type(time_type),         intent(in)    :: obs_time
-type(time_type),         intent(inout) :: prev_time
-logical,                 intent(inout) :: first_obs
+  type(obs_sequence_type), intent(inout) :: seq
+  type(obs_type),          intent(inout) :: obs, prev_obs
+  type(time_type),         intent(in)    :: obs_time
+  type(time_type),         intent(inout) :: prev_time
+  logical,                 intent(inout) :: first_obs
 
 ! insert(seq,obs) always works (i.e. it inserts the obs in
 ! proper time format) but it can be slow with a long file.
@@ -231,6 +231,7 @@
 !> created 11 Mar 2010,  nancy collins,  ncar/image
 
 subroutine getdimlen(ncid, dimname, dout)
+
  integer,            intent(in)   :: ncid
  character(len = *), intent(in)   :: dimname
  integer,            intent(out)  :: dout
@@ -297,17 +298,17 @@
 
 subroutine set_missing_name(name)
 
-character(len = *), intent(in)   :: name
+ character(len = *), intent(in)   :: name
 
-if (len(name) > NF90_MAX_NAME) then
-   print *, 'set_missing_name: name must be less than ', NF90_MAX_NAME, ' chars long'
-   print *, 'set_missing_name: name is ', len(name), ' long'
-   stop
-endif
+   if (len(name) > NF90_MAX_NAME) then
+      print *, 'set_missing_name: name must be less than ', NF90_MAX_NAME, ' chars long'
+      print *, 'set_missing_name: name is ', len(name), ' long'
+      stop
+   endif
 
 !>@todo fixme ... remove 'stop' use error_handler