[Dart-dev] [3690] DART/trunk/observations/MADIS:
Minor updates from Ryan relating to the observation window computation,
nancy at ucar.edu
nancy at ucar.edu
Tue Dec 9 13:58:21 MST 2008
An HTML attachment was scrubbed...
URL: http://mailman.ucar.edu/pipermail/dart-dev/attachments/20081209/fa18e54e/attachment.html
-------------- next part --------------
Modified: DART/trunk/observations/MADIS/convert_madis_acars.f90
===================================================================
--- DART/trunk/observations/MADIS/convert_madis_acars.f90 2008-12-09 20:50:42 UTC (rev 3689)
+++ DART/trunk/observations/MADIS/convert_madis_acars.f90 2008-12-09 20:58:21 UTC (rev 3690)
@@ -162,7 +162,7 @@
pres = pres_alt_to_pres(palt(n))
! add wind component data to obs. sequence
- if ( wdir(n) .ne. wdir_miss .and. wspd(n) .ne. wspd_miss ) then
+ if ( wdir(n) /= wdir_miss .and. wspd(n) /= wspd_miss ) then
call wind_dirspd_to_uv(wdir(n), wspd(n), uwnd, vwnd)
if ( abs(uwnd) < 150.0_r8 .and. abs(vwnd) < 150.0_r8 ) then
@@ -180,7 +180,7 @@
end if
! add air temperature data to obs. sequence
- if ( tair(n) .ne. tair_miss ) then
+ if ( tair(n) /= tair_miss ) then
oerr = ncep_acars_temp_error(pres * 0.01_r8)
call create_obs_type(lat(n), lon(n), pres, VERTISPRESSURE, tair(n), &
@@ -190,7 +190,7 @@
end if
! add relative humidity data to obs. sequence, but as specific humidity
- if ( tair(n) .ne. tair_miss .and. relh(n) .ne. relh_miss ) then
+ if ( tair(n) /= tair_miss .and. relh(n) /= relh_miss ) then
qsat = specific_humidity(sat_vapor_pressure(tair(n)), pres)
qobs = qsat * relh(n)
Modified: DART/trunk/observations/MADIS/convert_madis_marine.f90
===================================================================
--- DART/trunk/observations/MADIS/convert_madis_marine.f90 2008-12-09 20:50:42 UTC (rev 3689)
+++ DART/trunk/observations/MADIS/convert_madis_marine.f90 2008-12-09 20:58:21 UTC (rev 3690)
@@ -164,7 +164,7 @@
! determine whether observation is close to the analysis time
time_obs = increment_time(comp_day0, mod(tobs(n),86400), tobs(n) / 86400)
call get_time((time_anal - time_obs), dsec, dday)
- if ( dsec > dsecobs .or. dday > 0 ) cycle obsloop
+ if ( (dsec + dday * 86400) > dsecobs ) cycle obsloop
if ( lon(n) < 0.0_r8 ) lon(n) = lon(n) + 360.0_r8
do i = 1, nused
@@ -194,7 +194,7 @@
if ( elev(n) == elev_miss ) elev(n) = def_elev
! add wind component data to obs. sequence
- if ( wdir(n) .ne. wdir_miss .and. wspd(n) .ne. wspd_miss ) then
+ if ( wdir(n) /= wdir_miss .and. wspd(n) /= wspd_miss ) then
call wind_dirspd_to_uv(wdir(n), wspd(n), uwnd, vwnd)
if ( abs(uwnd) < 150.0_r8 .and. abs(vwnd) < 150.0_r8 ) then
@@ -213,7 +213,7 @@
end if
! add air temperature data to obs. sequence
- if ( tair(n) .ne. tair_miss ) then
+ if ( tair(n) /= tair_miss ) then
call create_obs_type(lat(n), lon(n), def_elev, VERTISSURFACE, tair(n), &
MARINE_SFC_TEMPERATURE, ncep_marine_temp_error, &
@@ -223,7 +223,7 @@
end if
! add dew-point temperature data to obs. sequence, but as specific humidity
- if ( tair(n) .ne. tair_miss .and. tdew(n) .ne. tdew_miss .and. sfcp(n) .ne. sfcp_miss ) then
+ if ( tair(n) /= tair_miss .and. tdew(n) /= tdew_miss .and. sfcp(n) /= sfcp_miss ) then
qobs = specific_humidity(sat_vapor_pressure(tdew(n)), sfcp(n))
qsat = specific_humidity(sat_vapor_pressure(tair(n)), sfcp(n))
Modified: DART/trunk/observations/MADIS/convert_madis_surface.f90
===================================================================
--- DART/trunk/observations/MADIS/convert_madis_surface.f90 2008-12-09 20:50:42 UTC (rev 3689)
+++ DART/trunk/observations/MADIS/convert_madis_surface.f90 2008-12-09 20:58:21 UTC (rev 3690)
@@ -151,14 +151,14 @@
! determine whether observation is close to analysis time
time_obs = increment_time(comp_day0, mod(tobs(n),86400), tobs(n) / 86400)
call get_time((time_anal - time_obs), dsec, dday)
- if ( dsec > dsecobs .or. dday > 0 ) cycle obsloop
+ if ( (dsec + dday * 86400) > dsecobs ) cycle obsloop
if ( lon(n) < 0.0_r8 ) lon(n) = lon(n) + 360.0_r8
! check to make sure this observation has not been used
do i = 1, nused
if ( lon(n) == lon(i) .and. lat(n) == lat(i) ) cycle obsloop
end do
- qc = 1
+ qc = 1.0_r8
! add altimeter data to text file
if ( alti(n) /= alti_miss ) then
@@ -170,7 +170,7 @@
end if
! add wind component data to text file
- if ( wdir(n) .ne. wdir_miss .and. wspd(n) .ne. wspd_miss ) then
+ if ( wdir(n) /= wdir_miss .and. wspd(n) /= wspd_miss ) then
call wind_dirspd_to_uv(wdir(n), wspd(n), uwnd, vwnd)
if ( abs(uwnd) < 150.0_r8 .and. abs(vwnd) < 150.0_r8 ) then
@@ -189,7 +189,7 @@
end if
! add air temperature data to text file
- if ( tair(n) .ne. tair_miss ) then
+ if ( tair(n) /= tair_miss ) then
call create_obs_type(lat(n), lon(n), elev(n), VERTISSURFACE, tair(n), &
LAND_SFC_TEMPERATURE, ncep_land_temp_error, oday, osec, qc, obs)
@@ -198,7 +198,7 @@
end if
! add dew-point temperature data to text file, but as specific humidity
- if ( tair(n) .ne. tair_miss .and. tdew(n) .ne. tdew_miss .and. alti(n) .ne. alti_miss ) then
+ if ( tair(n) /= tair_miss .and. tdew(n) /= tdew_miss .and. alti(n) /= alti_miss ) then
stn_pres = invert_altimeter(alti(n) * 0.01_r8, elev(n)) * 100.0_r8
qobs = specific_humidity(sat_vapor_pressure(tdew(n)), stn_pres)
Modified: DART/trunk/observations/MADIS/work/quickbuild.csh
===================================================================
--- DART/trunk/observations/MADIS/work/quickbuild.csh 2008-12-09 20:50:42 UTC (rev 3689)
+++ DART/trunk/observations/MADIS/work/quickbuild.csh 2008-12-09 20:58:21 UTC (rev 3690)
@@ -20,7 +20,7 @@
# so this MUST be run first.
#----------------------------------------------------------------------
-\rm -f preprocess *.o *.mod
+\rm -f preprocess *.o *.mod
\rm -f ../../../obs_def/obs_def_mod.f90
\rm -f ../../../obs_kind/obs_kind_mod.f90
@@ -61,6 +61,9 @@
endsw
end
+\rm -f *.o *.mod
+
+
echo "Success: All ${MODEL} programs compiled."
More information about the Dart-dev
mailing list