[Dart-dev] [3294] DART/trunk/obs_def/obs_def_radar_mod.f90: Set the private key number inside the interactive_obs code;

[nancy at subversion.ucar.edu]

An HTML attachment was scrubbed...
URL: http://mailman.ucar.edu/pipermail/dart-dev/attachments/20080407/7a30680f/attachment.html
-------------- next part --------------
Modified: DART/trunk/obs_def/obs_def_radar_mod.f90
===================================================================
--- DART/trunk/obs_def/obs_def_radar_mod.f90	2008-04-07 20:18:22 UTC (rev 3293)
+++ DART/trunk/obs_def/obs_def_radar_mod.f90	2008-04-07 20:42:26 UTC (rev 3294)
@@ -434,13 +434,18 @@
 
 implicit none
 
-integer, intent(inout) :: velkey
+integer, intent(out) :: velkey
+
 real(r8)             :: orientation(3)
 type(location_type)  :: location
 real(r8)             :: nyquistv
 
 if ( .not. module_initialized ) call initialize_module
 
+! increment local key counter and set velkey
+velkeycount = velkeycount + 1
+velkey = velkeycount
+
 !Make sure enough space is allocated
 if(velkey >= max_rad_vel_obs) then
    write(*, *) 'velkey (',velkey,') exceeds max_rad_vel_obs (',max_rad_vel_obs,')'
@@ -457,9 +462,13 @@
 
 write(*, *)
 write(*, *) 'Beginning to inquire information on radar location.'
-write(*, *) 'Make sure that you select 3 (height) for vertical coordinate'
-write(*, *) 'option and enter height in units gpm.'
 write(*, *)
+write(*, *) 'WARNING!! Make sure that you select 3 (height) for the vertical'
+write(*, *) 'coordinate option and enter height in units gpm.  This location'
+write(*, *) 'question will be repeated again later for this same observation,'
+write(*, *) 'and you must enter the same longitude, latitude, and height'
+write(*, *) 'as you enter here.'
+write(*, *)
 
 call interactive_location(location)
 
@@ -475,11 +484,8 @@
 
 call interactive_nyquistvel(nyquistv)
 
-call set_rad_vel(velkey+1, location, orientation, nyquistv)
+call set_rad_vel(velkey, location, orientation, nyquistv)
 
-! Finally increment velkey to keep track of specialized obs
-velkey = velkey + 1
-
 write(*, *)
 write(*, *) 'End of specialized section for radial velocity.'
 write(*, *) 'You will now have to enter the regular obs information.'
@@ -502,10 +508,14 @@
 
 implicit none
 
-integer, intent(inout) :: refkey
+integer, intent(out) :: refkey
 
 if ( .not. module_initialized ) call initialize_module
 
+! generate a unique local key number
+refkeycount = refkeycount + 1
+refkey = refkeycount
+
 !Make sure enough space is allocated
 if(refkey >= max_rad_ref_obs) then
    write(*, *) 'refkey (',refkey,') exceeds max_rad_ref_obs (',max_rad_ref_obs,')'
@@ -528,8 +538,6 @@
 ! subroutine to read that metadata interactively (and write the subroutine
 ! that goes with it!)
 
-! Finally increment refkey to keep track of specialized obs
-refkey = refkey + 1
 
 write(*, *)
 write(*, *) 'End of specialized section for radial velocity.'