[Dart-dev] DART/branches Revision: 10844

[dart at ucar.edu]

thoar at ucar.edu
2016-12-27 16:15:20 -0700 (Tue, 27 Dec 2016)
325
Updating the obs_diag program to reflect the new behavior of the open_file() routine
which apparently no longer supports a 'rewind' action for opening.

In order to test this on Yongfei's files, I had to support her obs_kinds and obs_types.

The svn properties on obs_def_cice_mod.f90 were nonexistent, so I fixed them too.




Modified: DART/branches/rma_cice/diagnostics/threed_sphere/obs_diag.f90
===================================================================
--- DART/branches/rma_cice/diagnostics/threed_sphere/obs_diag.f90	2016-12-27 18:39:36 UTC (rev 10843)
+++ DART/branches/rma_cice/diagnostics/threed_sphere/obs_diag.f90	2016-12-27 23:15:20 UTC (rev 10844)
@@ -431,7 +431,7 @@
 ! Open file for histogram of innovations, as a function of standard deviation.
 !----------------------------------------------------------------------
 
-nsigmaUnit = open_file('LargeInnov.txt',form='formatted',action='rewind')
+nsigmaUnit = open_file('LargeInnov.txt',form='formatted',action='write')
 write(nsigmaUnit,'(a)')'Any observations flagged as bad are dumped into the last bin.'
 write(nsigmaUnit,'(a)') '   day   secs    lon      lat    level         obs    prior   zscore   key   kind'
 

Modified: DART/branches/rma_cice/obs_def/obs_def_cice_mod.f90
===================================================================
--- DART/branches/rma_cice/obs_def/obs_def_cice_mod.f90	2016-12-27 18:39:36 UTC (rev 10843)
+++ DART/branches/rma_cice/obs_def/obs_def_cice_mod.f90	2016-12-27 23:15:20 UTC (rev 10844)
@@ -1,8 +1,8 @@
-! DART software - Copyright 2004 - 2011 UCAR. This open source software
-! is
-! provided by UCAR, "as is", without charge, subject to all terms of use
-! at
+! DART software - Copyright 2004 - 2013 UCAR. This open source software is
+! provided by UCAR, "as is", without charge, subject to all terms of use at
 ! http://www.image.ucar.edu/DAReS/DART/DART_download
+!
+! $Id$
 
 ! FIXME: check to see if obs are of volume or thickness - for now we
 ! will assume volume.
@@ -12,6 +12,7 @@
 
 ! BEGIN DART PREPROCESS KIND LIST
 !SAT_SEAICE_AGREG_CONCENTR,       KIND_SEAICE_AGREG_CONCENTR,     COMMON_CODE
+!SYN_SEAICE_CONCENTR,             KIND_SEAICE_CONCENTR,           COMMON_CODE
 !SAT_SEAICE_AGREG_VOLUME,         KIND_SEAICE_AGREG_VOLUME,       COMMON_CODE
 !SAT_SEAICE_AGREG_SNOWVOLUME,     KIND_SEAICE_AGREG_SNOWVOLUME,   COMMON_CODE
 !SAT_SEAICE_AGREG_THICKNESS,      KIND_SEAICE_AGREG_THICKNESS,    COMMON_CODE
@@ -21,5 +22,11 @@
 !SAT_SEAICE_CONCENTR,             KIND_SEAICE_CONCENTR,           COMMON_CODE
 !SAT_SEAICE_VOLUME,               KIND_SEAICE_VOLUME,             COMMON_CODE
 !SAT_SEAICE_SNOWVOLUME,           KIND_SEAICE_SNOWVOLUME,         COMMON_CODE
+!SAT_SEAICE_AGREG_FY,             KIND_SEAICE_AGREG_FY,           COMMON_CODE
 ! END DART PREPROCESS KIND LIST
 
+! <next few lines under version control, do not edit>
+! $URL$
+! $Id$
+! $Revision$
+! $Date$


Property changes on: DART/branches/rma_cice/obs_def/obs_def_cice_mod.f90
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Rev Author HeadURL Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: DART/branches/rma_cice/obs_kind/DEFAULT_obs_kind_mod.F90
===================================================================
--- DART/branches/rma_cice/obs_kind/DEFAULT_obs_kind_mod.F90	2016-12-27 18:39:36 UTC (rev 10843)
+++ DART/branches/rma_cice/obs_kind/DEFAULT_obs_kind_mod.F90	2016-12-27 23:15:20 UTC (rev 10844)
@@ -400,12 +400,15 @@
   KIND_SEAICE_ICEENTHALPY008         = 349, &
   KIND_SEAICE_SNOWENTHALPY001        = 350, &
   KIND_SEAICE_SNOWENTHALPY002        = 351, &
-  KIND_SEAICE_SNOWENTHALPY003        = 352
+  KIND_SEAICE_SNOWENTHALPY003        = 352, &
+  KIND_SOM_TEMPERATURE               = 353, &
+  KIND_SEAICE_FY                     = 354, &
+  KIND_SEAICE_AGREG_FY               = 355 
 
 ! max_obs_generic is private to this module.  see comment below near the max_obs_specific
 ! declaration for more info about publics and private values.
 
-integer, parameter :: max_obs_generic = 352
+integer, parameter :: max_obs_generic = 355
 
 !----------------------------------------------------------------------------
 ! This list is autogenerated by the 'preprocess' program.  To add new
@@ -773,7 +776,9 @@
 obs_kind_names(350) = obs_kind_type(KIND_SEAICE_SNOWENTHALPY001,'KIND_SEAICE_SNOWENTHALPY001')
 obs_kind_names(351) = obs_kind_type(KIND_SEAICE_SNOWENTHALPY002,'KIND_SEAICE_SNOWENTHALPY002')
 obs_kind_names(352) = obs_kind_type(KIND_SEAICE_SNOWENTHALPY003,'KIND_SEAICE_SNOWENTHALPY003')
-
+obs_kind_names(353) = obs_kind_type(KIND_SOM_TEMPERATURE,'KIND_SOM_TEMPERATURE')
+obs_kind_names(354) = obs_kind_type(KIND_SEAICE_FY, 'KIND_SEAICE_FY')
+obs_kind_names(355) = obs_kind_type(KIND_SEAICE_AGREG_FY,'KIND_SEAICE_AGREG_FY')