[Dart-dev] [4334] DART/trunk: Change default output filename in marine converter to ' obs_seq.marine',

[nancy at ucar.edu]

Revision: 4334
Author:   nancy
Date:     2010-03-31 08:55:58 -0600 (Wed, 31 Mar 2010)
Log Message:
-----------
Change default output filename in marine converter to 'obs_seq.marine',
and make the same change in the default marine obs_seq name in the
wrf_dart_obs_preprocess program.  Also fixed a cut-n-paste error in 
the windowing script where i had ASEC in two different places instead 
of ADAY, and finally fix the input filename to prepend the directory 
path in the madis_conv.csh script.
Thanks to Soyoung for finding the scripting problems and suggesting
the output name change to make it consistent with the other converters.

Modified Paths:
--------------
    DART/trunk/models/wrf/WRF_DART_utilities/wrf_dart_obs_preprocess.f90
    DART/trunk/observations/MADIS/convert_madis_marine.f90
    DART/trunk/observations/MADIS/shell_scripts/madis_conv.csh
    DART/trunk/observations/MADIS/shell_scripts/windowing.csh

-------------- next part --------------
Modified: DART/trunk/models/wrf/WRF_DART_utilities/wrf_dart_obs_preprocess.f90
===================================================================
--- DART/trunk/models/wrf/WRF_DART_utilities/wrf_dart_obs_preprocess.f90	2010-03-30 17:15:57 UTC (rev 4333)
+++ DART/trunk/models/wrf/WRF_DART_utilities/wrf_dart_obs_preprocess.f90	2010-03-31 14:55:58 UTC (rev 4334)
@@ -58,7 +58,7 @@
                       acars_extra        = 'obs_seq.acars',      &
                       land_sfc_extra     = 'obs_seq.land_sfc',   &
                       metar_extra        = 'obs_seq.metar',      &
-                      marine_sfc_extra   = 'obs_seq.marine_sfc', &
+                      marine_sfc_extra   = 'obs_seq.marine',     &
                       sat_wind_extra     = 'obs_seq.satwnd',     &
                       gpsro_extra        = 'obs_seq.gpsro',      &
                       trop_cyclone_extra = 'obs_seq.tc'

Modified: DART/trunk/observations/MADIS/convert_madis_marine.f90
===================================================================
--- DART/trunk/observations/MADIS/convert_madis_marine.f90	2010-03-30 17:15:57 UTC (rev 4333)
+++ DART/trunk/observations/MADIS/convert_madis_marine.f90	2010-03-31 14:55:58 UTC (rev 4334)
@@ -64,7 +64,7 @@
 implicit none
 
 character(len=15),  parameter :: marine_netcdf_file = 'marine_input.nc'
-character(len=129), parameter :: marine_out_file    = 'obs_seq.marine_sfc'
+character(len=129), parameter :: marine_out_file    = 'obs_seq.marine'
 
 ! the following logical parameters control which water-vapor variables appear in the output file,
 ! whether to use the NCEP error or Lin and Hubbard (2004) moisture error model, and if the

Modified: DART/trunk/observations/MADIS/shell_scripts/madis_conv.csh
===================================================================
--- DART/trunk/observations/MADIS/shell_scripts/madis_conv.csh	2010-03-30 17:15:57 UTC (rev 4333)
+++ DART/trunk/observations/MADIS/shell_scripts/madis_conv.csh	2010-03-31 14:55:58 UTC (rev 4334)
@@ -150,9 +150,10 @@
   endif
 
   # if the input is still zipped, unzip it
-  if ( -f ${infn}.gz ) gunzip ${infn}.gz
+  if ( -f $src_dir/${infn}.gz ) gunzip $src_dir/${infn}.gz
 
-  ln -sf $infn  ${type}_input.nc
+  ln -sf $src_dir/$infn  ${type}_input.nc
+
   # the rawinsonde converter needs two logicals for whether to output
   # significant level data as well as the default data.  set these to
   # T or F as you wish.  the other converters need no input.

Modified: DART/trunk/observations/MADIS/shell_scripts/windowing.csh
===================================================================
--- DART/trunk/observations/MADIS/shell_scripts/windowing.csh	2010-03-30 17:15:57 UTC (rev 4333)
+++ DART/trunk/observations/MADIS/shell_scripts/windowing.csh	2010-03-31 14:55:58 UTC (rev 4334)
@@ -282,7 +282,7 @@
     # sed the input.nml to set start/stop times
     sed -e "s/BDAY/$gobef[1]/" \
         -e "s/BSEC/$gobef[2]/" \
-        -e "s/ASEC/$goaft[2]/" \
+        -e "s/ADAY/$goaft[1]/" \
         -e "s/ASEC/$goaft[2]/" input.nml.template >! input.nml
 
     # run obs_seq_tool
@@ -311,7 +311,7 @@
   # sed the input.nml to unset start/stop times
   sed -e "s/BDAY/-1/" \
       -e "s/BSEC/-1/" \
-      -e "s/ASEC/-1/" \
+      -e "s/ADAY/-1/" \
       -e "s/ASEC/-1/" input.nml.template > input.nml
 
   # run obs_seq_tool one more time to stitch these together