From: Andy Spencer Date: Sun, 28 Aug 2011 20:21:40 +0000 (+0000) Subject: RSL v1.42 X-Git-Tag: v1.42^0 X-Git-Url: http://pileus.org/git/?p=~andy%2Frsl;a=commitdiff_plain;h=3160d8126d66792a65d592019880db8b4e734e84 RSL v1.42 --- diff --git a/CHANGES b/CHANGES index 8f7c5ee..932965a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,13 @@ /* Changes for RSL * *--------------------------------------------------------------------- + * v1.42 Released 7/12/2011 + * + * 1. radar_to_uf.c (RSL_radar_to_uf_fp): Changed scale_factor used for storing + * differential phase (PH) in UF from 100 to 10. The usual scale factor + * of 100 caused values over 327.67 to become negative when converted to + * short integer. + *--------------------------------------------------------------------- * v1.41 Released 6/22/2011 * * 1. wsr88d_m31.c: Simplified the WSR-88D ray structure and supporting code. diff --git a/Makefile.am b/Makefile.am index 3c106a8..a941299 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,7 +8,7 @@ colordir = $(libdir)/colors lib_LTLIBRARIES = librsl.la -librsl_la_LDFLAGS = -version-info 1:41 +librsl_la_LDFLAGS = -version-info 1:42 librsl_la_SOURCES = \ $(rapic_c) $(radtec_c)\ dorade.c dorade_print.c dorade_to_radar.c\ diff --git a/README b/README index c61065a..679b8f4 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -v1.41 (Released 6/22/2011) +v1.42 (Released 7/12/2011) This is the README file for the Radar Software Library (RSL). diff --git a/configure.in b/configure.in index 2791831..381c25b 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(rsl, v1.41) +AC_INIT(rsl, v1.42) AC_CONFIG_SRCDIR(volume.c) AM_INIT_AUTOMAKE diff --git a/doc/RSL_radar_intro.html b/doc/RSL_radar_intro.html index c356332..08f49b3 100644 --- a/doc/RSL_radar_intro.html +++ b/doc/RSL_radar_intro.html @@ -19,7 +19,7 @@ Introduction

By John H. Merritt and David B. Wolff; NASA/TRMM Office
-Software Verson 1.41 (released 6/22/2011)

+Software Verson 1.42 (released 7/12/2011)
This library is an object oriented programming environment to keep application programming simple, for the casual C programmer, as well as diff --git a/doc/index.html b/doc/index.html index 113a315..2063d17 100644 --- a/doc/index.html +++ b/doc/index.html @@ -6,6 +6,7 @@ TRMM Satellite Validation Office Web Site +

TRMM Radar Software Library

@@ -21,8 +22,8 @@

-Current RSL Version 1.40, released 10/10/2008
-Supports WSR-88D Level II Build 10 Format

+Current RSL Version 1.42, released 7/12/2011
+Supports WSR-88D Level II Build 12 Format In support of the Tropical Rainfall Measuring Mission's (TRMM) Global @@ -159,6 +160,6 @@ Supported Radar Data Formats - + diff --git a/doc/whats_new.html b/doc/whats_new.html index 4ed91ef..ff96d41 100644 --- a/doc/whats_new.html +++ b/doc/whats_new.html @@ -13,11 +13,16 @@ What's new?

-06/22/2011: Version 1.41 supports WSR-88D Level II Build 12 format.

+Version 1.42: Bug fix. +Changed scale_factor used for storing differential phase (PH) in UF from 100 to +10. The usual scale factor of 100 caused values over 327.67 to become negative +when converted to short integer.

-07/24/2008: Version 1.39 supports WSR-88D Level II Build 10 format.

+Version 1.41 supports WSR-88D Level II Build 12 format.

-02/15/2006: Version 1.34 supports WSR-88D Level II Build 8 format.

+Version 1.39 supports WSR-88D Level II Build 10 format. +

+Version 1.34 supports WSR-88D Level II Build 8 format.

RSL can read both the old and new WSR-88D Level II data format.

Version 1.33 supports WSR-88D Level II Build 5 format.

diff --git a/nsig.c b/nsig.c index 7e5c3c1..256f265 100644 --- a/nsig.c +++ b/nsig.c @@ -442,7 +442,7 @@ NSIG_Sweep **nsig_read_sweep(FILE *fp, NSIG_Product_file *prod_file) */ #define Vprint -#undef Vprint +/* #undef Vprint */ /* Determine if we need to byte-swap values. */ (void)nsig_endianess(&prod_file->rec1); @@ -511,10 +511,10 @@ NSIG_Sweep **nsig_read_sweep(FILE *fp, NSIG_Product_file *prod_file) /* This is a NEW sweep. */ iray = 0; #ifdef Vprint - {int isweep; + int isweep; isweep = NSIG_I2(idh[0]->sweep_num); printf("Number of rays in sweep %d is %d\n", isweep, max_rays); - } + #endif /* Allocate memory for sweep. */ s = (NSIG_Sweep **) calloc (nparams, sizeof(NSIG_Sweep*)); diff --git a/nsig_to_radar.c b/nsig_to_radar.c index 6ce8081..03d739f 100644 --- a/nsig_to_radar.c +++ b/nsig_to_radar.c @@ -240,17 +240,6 @@ RSL_nsig_to_radar if (radar_verbose_flag) fprintf(stderr, "Read %d bytes for rec2.\n", n); - /** Test for scan mode -- If scan is a RHI will return NULL **/ - /** because RSL can't handle RHI's. In the future, replace **/ - /** NULL will a routine to convert RHI's to RSL Format **/ - ant_scan_mode =NSIG_I2(prod_file->rec2.task_config.scan_info.ant_scan_mode); - if(ant_scan_mode == 2) - { - if (radar_verbose_flag) - fprintf(stderr, "RHI scan detected. Unable to process, returning NULL.\n"); - /* return NULL; */ - } - /* Count the bits set in 'data_mask' to determine the number * of parameters present. */ diff --git a/radar_to_uf.c b/radar_to_uf.c index 0d3af56..e281486 100644 --- a/radar_to_uf.c +++ b/radar_to_uf.c @@ -431,7 +431,9 @@ void RSL_radar_to_uf_fp(Radar *r, FILE *fp) /* ---- Begining of FIELD HEADER. */ if (q_fh) { uf_fh = uf+current_fh_index; - uf_fh[1] = scale_factor = 100; + if (k != PH_INDEX) scale_factor = 100; + else scale_factor = 10; + uf_fh[1] = scale_factor; uf_fh[2] = ray->h.range_bin1/1000.0; uf_fh[3] = ray->h.range_bin1 - (1000*uf_fh[2]); uf_fh[4] = ray->h.gate_size; diff --git a/rsl.h b/rsl.h index a821765..b0dfb08 100644 --- a/rsl.h +++ b/rsl.h @@ -27,7 +27,7 @@ #include "config.h" #endif -#define RSL_VERSION_STR "v1.41" +#define RSL_VERSION_STR "v1.42" /**********************************************************************/ /* Configure: Define USE_TWO_BYTE_PRECISION to have RSL store internal*/