[Dart-dev] [5799] DART/branches/development: Fixed the time zone offset problem.

[nancy at ucar.edu]

Revision: 5799
Author:   thoar
Date:     2012-07-18 14:15:46 -0600 (Wed, 18 Jul 2012)
Log Message:
-----------
Fixed the time zone offset problem.

Modified Paths:
--------------
    DART/branches/development/obs_def/obs_def_tower_mod.f90
    DART/branches/development/observations/Ameriflux/level4_to_obs.f90
    DART/branches/development/observations/Ameriflux/shell_scripts/CreateObs.csh
    DART/branches/development/observations/Ameriflux/work/input.nml

-------------- next part --------------
Modified: DART/branches/development/obs_def/obs_def_tower_mod.f90
===================================================================
--- DART/branches/development/obs_def/obs_def_tower_mod.f90	2012-07-18 15:19:03 UTC (rev 5798)
+++ DART/branches/development/obs_def/obs_def_tower_mod.f90	2012-07-18 20:15:46 UTC (rev 5799)
@@ -176,7 +176,7 @@
 ! The CLM h0 files are constructed such that the midnight that starts the
 ! day is IN the file. The last time in the file is 23:30 ... 
 
-100 format (A,'.clm2_',I4.4,'.h0.',I4.4,'-',I2.2,'-',I2.2,'-',I5.5,'.nc')
+100 format (A,'.clm2_',I4.4,'.h1.',I4.4,'-',I2.2,'-',I2.2,'-',I5.5,'.nc')
 
 ens_size = 0
 ENSEMBLESIZE : do i = 1,200

Modified: DART/branches/development/observations/Ameriflux/level4_to_obs.f90
===================================================================
--- DART/branches/development/observations/Ameriflux/level4_to_obs.f90	2012-07-18 15:19:03 UTC (rev 5798)
+++ DART/branches/development/observations/Ameriflux/level4_to_obs.f90	2012-07-18 20:15:46 UTC (rev 5799)
@@ -441,6 +441,7 @@
 
 subroutine decode_header(iunit)
 ! Reads the first line of the header and parses the information.
+! FIXME ... decode the header ... do not assume ...
 integer, intent(in) :: iunit
 
 read(iunit,'(A)',iostat=rcio) input_line
@@ -548,11 +549,12 @@
    tower%time_obs = time0
 
 endif
-   
+
+! 8AM East Coast is 1PM Greenwich 
 if (timezoneoffset < 0.0_r8) then
+   tower%time_obs = tower%time_obs + offset
+else
    tower%time_obs = tower%time_obs - offset
-else
-   tower%time_obs = tower%time_obs + offset
 endif
 
 ! The QC values can be 'missing' ... in which case the values are too

Modified: DART/branches/development/observations/Ameriflux/shell_scripts/CreateObs.csh
===================================================================
--- DART/branches/development/observations/Ameriflux/shell_scripts/CreateObs.csh	2012-07-18 15:19:03 UTC (rev 5798)
+++ DART/branches/development/observations/Ameriflux/shell_scripts/CreateObs.csh	2012-07-18 20:15:46 UTC (rev 5799)
@@ -6,6 +6,13 @@
 #===========================================================================
 
 cat << EOF >! baseinput.nml
+&preprocess_nml
+    input_obs_kind_mod_file = '../../../obs_kind/DEFAULT_obs_kind_mod.F90',
+   output_obs_kind_mod_file = '../../../obs_kind/obs_kind_mod.f90',
+     input_obs_def_mod_file = '../../../obs_def/DEFAULT_obs_def_mod.F90',
+    output_obs_def_mod_file = '../../../obs_def/obs_def_mod.f90',
+   input_files              = '../../../obs_def/obs_def_tower_mod.f90'
+   /
 
 &obs_kind_nml
    /

Modified: DART/branches/development/observations/Ameriflux/work/input.nml
===================================================================
--- DART/branches/development/observations/Ameriflux/work/input.nml	2012-07-18 15:19:03 UTC (rev 5798)
+++ DART/branches/development/observations/Ameriflux/work/input.nml	2012-07-18 20:15:46 UTC (rev 5799)
@@ -1,11 +1,9 @@
-
 &preprocess_nml
     input_obs_kind_mod_file = '../../../obs_kind/DEFAULT_obs_kind_mod.F90',
    output_obs_kind_mod_file = '../../../obs_kind/obs_kind_mod.f90',
      input_obs_def_mod_file = '../../../obs_def/DEFAULT_obs_def_mod.F90',
     output_obs_def_mod_file = '../../../obs_def/obs_def_mod.f90',
-   input_files              = '../../../obs_def/obs_def_eval_mod.f90',
-                              '../../../obs_def/obs_def_tower_mod.f90'
+   input_files              = '../../../obs_def/obs_def_tower_mod.f90'
    /
 
 &obs_kind_nml
@@ -23,8 +21,9 @@
    write_binary_obs_sequence = .false.  
    /
 
+
 &level4_to_obs_nml
-   text_input_file = '../data/AMF_USHa1_2003_L4_h_V002.txt',
+   text_input_file = '../data/USHa12003_L4_h.txt',
    obs_out_file    = 'obs_seq.out',
    year            = 2003,
    timezoneoffset  = -6,