RSL v1.43

[~andy/rsl] / wsr88d_to_radar.c

diff --git a/wsr88d_to_radar.c b/wsr88d_to_radar.c
index 575d9ed6ce48d1f3b25f010f3b2113c91e5c294b..6966143ff14777a519fe5bbd22fbdedb9a23fe85 100644 (file)
--- a/wsr88d_to_radar.c
+++ b/wsr88d_to_radar.c
@@ -83,7 +83,8 @@ int wsr88d_load_sweep_into_volume(Wsr88d_sweep ws,
     perror("wsr88d_load_sweep_into_volume: RSL_new_sweep");
     return -1;
   }
-    
+
+  v->sweep[nsweep]->h.elev = 0;
   v->sweep[nsweep]->h.nrays = 0;
   f = (float (*)(Range x))NULL;
   invf = (Range (*)(float x))NULL;
@@ -183,7 +184,7 @@ int wsr88d_load_sweep_into_volume(Wsr88d_sweep ws,
   if (v->sweep[nsweep]->h.nrays > 0)
     v->sweep[nsweep]->h.elev /= v->sweep[nsweep]->h.nrays;
   else {
-    free(v->sweep[nsweep]);  /* No rays loaded, free this sweep. */
+    RSL_free_sweep(v->sweep[nsweep]); /* No rays loaded, free this sweep. */
     v->sweep[nsweep] = NULL;
   }
   
@@ -301,7 +302,8 @@ Radar *RSL_wsr88d_to_radar(char *infile, char *call_or_first_tape_file)
    */
   if (n > 0) {
       strncpy(version, wsr88d_file_header.title.filename, 8);
-      if (strncmp(version,"AR2V0006",8) == 0 ||
+      if (strncmp(version,"AR2V0007",8) == 0 ||
+          strncmp(version,"AR2V0006",8) == 0 ||
           strncmp(version,"AR2V0004",8) == 0 ||
           strncmp(version,"AR2V0003",8) == 0 ||
           strncmp(version,"AR2V0002",8) == 0) {