[Dart-dev] [6449] DART/trunk/observations/DWL: finish renaming the original text files to dwl;
nancy at ucar.edu
nancy at ucar.edu
Tue Sep 3 03:05:13 MDT 2013
Revision: 6449
Author: nancy
Date: 2013-09-03 03:05:12 -0600 (Tue, 03 Sep 2013)
Log Message:
-----------
finish renaming the original text files to dwl;
add an accurate sample text input file.
Modified Paths:
--------------
DART/trunk/observations/DWL/data/text_input_file
DART/trunk/observations/DWL/dwl_to_obs.f90
Added Paths:
-----------
DART/trunk/observations/DWL/work/mkmf_dwl_to_obs
DART/trunk/observations/DWL/work/path_names_dwl_to_obs
Removed Paths:
-------------
DART/trunk/observations/DWL/work/mkmf_text_to_obs
DART/trunk/observations/DWL/work/path_names_text_to_obs
-------------- next part --------------
Modified: DART/trunk/observations/DWL/data/text_input_file
===================================================================
--- DART/trunk/observations/DWL/data/text_input_file 2013-09-03 08:46:10 UTC (rev 6448)
+++ DART/trunk/observations/DWL/data/text_input_file 2013-09-03 09:05:12 UTC (rev 6449)
@@ -1,2 +1,2 @@
- -45 270 5000 2008 1 30 12 0 0 5 10 2
- 30 300 2000 2008 1 31 6 30 0 10 -12 4
+ 270 -45 5000 2008-01-30_12:04:03 5 10 2
+ 300 30 2000 2008-12-31_06:30:00 19 -12 4
Modified: DART/trunk/observations/DWL/dwl_to_obs.f90
===================================================================
--- DART/trunk/observations/DWL/dwl_to_obs.f90 2013-09-03 08:46:10 UTC (rev 6448)
+++ DART/trunk/observations/DWL/dwl_to_obs.f90 2013-09-03 09:05:12 UTC (rev 6449)
@@ -50,9 +50,10 @@
! local variables
-logical, parameter :: debug = .false. ! set to .true. to print info
+logical, parameter :: debug = .true. ! set to .true. to print info
character (len=129) :: input_line
+character (len=20) :: date_string
integer :: oday, osec, rcio, iunit, otype
integer :: year, month, day, hour, minute, second
@@ -135,12 +136,13 @@
if (rcio /= 0) then
if (debug) print *, 'line number ', lcount
if (debug) print *, 'got bad read code from input file, rcio = ', rcio
+ if (debug) print *, '(bad read expected if end of file)'
exit obsloop
endif
- read(input_line, *, iostat=rcio) lat, lon, vert, &
- year, month, day, hour, minute, second, &
- uwnd, vwnd, werr
+ ! extract the different values from the input line
+ read(input_line, *, iostat=rcio) lon, lat, vert, date_string, &
+ uwnd, vwnd, werr
if (rcio /= 0) then
if (debug) print *, 'got bad read code getting next wind obs, rcio = ', rcio
if (debug) print *, 'line number ', lcount, ' input line was:'
@@ -148,8 +150,21 @@
exit obsloop
endif
- if (debug) print *, 'next observation located at lat, lon = ', lat, lon
+ if (debug) print *, 'next observation located at lon, lat = ', lon, lat
+
+ ! date format is: ccyy-mm-dd_hh:nn:ss
+ read(date_string, "(I4,5(1X,I2))", iostat=rcio) year, month, day, hour, minute, second
+ if (rcio /= 0) then
+ if (debug) print *, 'got bad read code getting next time value, rcio = ', rcio
+ if (debug) print *, 'line number ', lcount, ' input line was:'
+ if (debug) print *, trim(input_line)
+ exit obsloop
+ endif
+
+ if (debug) print *, 'next observation is at time ', year, month, day, hour, minute, second
+ if (debug) print *, 'next observation values/err ', uwnd, vwnd, werr
+
! check the lat/lon values to see if they are ok
if ( lat > 90.0_r8 .or. lat < -90.0_r8 ) cycle obsloop
if ( lon < 0.0_r8 .or. lon > 360.0_r8 ) cycle obsloop
Copied: DART/trunk/observations/DWL/work/mkmf_dwl_to_obs (from rev 6447, DART/trunk/observations/DWL/work/mkmf_text_to_obs)
===================================================================
--- DART/trunk/observations/DWL/work/mkmf_dwl_to_obs (rev 0)
+++ DART/trunk/observations/DWL/work/mkmf_dwl_to_obs 2013-09-03 09:05:12 UTC (rev 6449)
@@ -0,0 +1,18 @@
+#!/bin/csh
+#
+# 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
+#
+# DART $Id$
+
+../../../mkmf/mkmf -p dwl_to_obs -t ../../../mkmf/mkmf.template \
+ -a "../../.." path_names_dwl_to_obs
+
+exit $status
+
+# <next few lines under version control, do not edit>
+# $URL$
+# $Revision$
+# $Date$
+
Deleted: DART/trunk/observations/DWL/work/mkmf_text_to_obs
===================================================================
--- DART/trunk/observations/DWL/work/mkmf_text_to_obs 2013-09-03 08:46:10 UTC (rev 6448)
+++ DART/trunk/observations/DWL/work/mkmf_text_to_obs 2013-09-03 09:05:12 UTC (rev 6449)
@@ -1,18 +0,0 @@
-#!/bin/csh
-#
-# 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
-#
-# DART $Id$
-
-../../../mkmf/mkmf -p text_to_obs -t ../../../mkmf/mkmf.template \
- -a "../../.." path_names_text_to_obs
-
-exit $status
-
-# <next few lines under version control, do not edit>
-# $URL$
-# $Revision$
-# $Date$
-
Copied: DART/trunk/observations/DWL/work/path_names_dwl_to_obs (from rev 6447, DART/trunk/observations/DWL/work/path_names_text_to_obs)
===================================================================
--- DART/trunk/observations/DWL/work/path_names_dwl_to_obs (rev 0)
+++ DART/trunk/observations/DWL/work/path_names_dwl_to_obs 2013-09-03 09:05:12 UTC (rev 6449)
@@ -0,0 +1,12 @@
+observations/dwl/dwl_to_obs.f90
+location/threed_sphere/location_mod.f90
+obs_sequence/obs_sequence_mod.f90
+obs_kind/obs_kind_mod.f90
+obs_def/obs_def_mod.f90
+assim_model/assim_model_mod.f90
+models/template/model_mod.f90
+common/types_mod.f90
+random_seq/random_seq_mod.f90
+utilities/utilities_mod.f90
+time_manager/time_manager_mod.f90
+mpi_utilities/null_mpi_utilities_mod.f90
Deleted: DART/trunk/observations/DWL/work/path_names_text_to_obs
===================================================================
--- DART/trunk/observations/DWL/work/path_names_text_to_obs 2013-09-03 08:46:10 UTC (rev 6448)
+++ DART/trunk/observations/DWL/work/path_names_text_to_obs 2013-09-03 09:05:12 UTC (rev 6449)
@@ -1,12 +0,0 @@
-observations/dwl/dwl_to_obs.f90
-location/threed_sphere/location_mod.f90
-obs_sequence/obs_sequence_mod.f90
-obs_kind/obs_kind_mod.f90
-obs_def/obs_def_mod.f90
-assim_model/assim_model_mod.f90
-models/template/model_mod.f90
-common/types_mod.f90
-random_seq/random_seq_mod.f90
-utilities/utilities_mod.f90
-time_manager/time_manager_mod.f90
-mpi_utilities/null_mpi_utilities_mod.f90
More information about the Dart-dev
mailing list