Merge branch 'master' into aweather

[~andy/rsl] / src / rsl.h

diff --git a/rsl.h b/src/rsl.h
similarity index 92%
rename from rsl.h
rename to src/rsl.h
index 41cb299f3348ec337ad48b87daa34b6776f6b4e8..c0762245e31e6f1c083b84dc450647cb0d2f6a76 100644 (file)
--- a/rsl.h
+++ b/src/rsl.h
@@ -27,8 +27,6 @@
 #include "config.h"
 #endif
 
-#define RSL_VERSION_STR "v1.44"
-
 /**********************************************************************/
 /* Configure: Define USE_TWO_BYTE_PRECISION to have RSL store internal*/
 /*            values with two bytes.  Otherwise, use one byte.        */
@@ -46,7 +44,7 @@
 /*            so you shouldn't have to modify anything here.          */
 /**********************************************************************/
 #ifndef COLORDIR
-#define COLORDIR "/home/kelley/trmm/lib/colors"
+#define COLORDIR DATADIRRSL "/colors"
 #endif
 
 /* These are the color table indexes. See RSL_set/get_color_table. */
@@ -57,18 +55,18 @@
 /* The default color tables for reflectivity, velocity, spectral width,
  * height, rainfall, and zdr.
  */
-#define REFL_RED_FILE   COLORDIR "/red_reflectivity.clr"
-#define REFL_GREEN_FILE COLORDIR "/grn_reflectivity.clr"
-#define REFL_BLUE_FILE  COLORDIR "/blu_reflectivity.clr"
-#define VEL_RED_FILE    COLORDIR "/red_velocity.clr"
-#define VEL_GREEN_FILE  COLORDIR "/grn_velocity.clr"
-#define VEL_BLUE_FILE   COLORDIR "/blu_velocity.clr"
-#define SW_RED_FILE     COLORDIR "/red_spectral_width.clr"
-#define SW_GREEN_FILE   COLORDIR "/grn_spectral_width.clr"
-#define SW_BLUE_FILE    COLORDIR "/blu_spectral_width.clr"
-#define HEIGHT_RED_FILE   COLORDIR "/red_height.clr"
-#define HEIGHT_GREEN_FILE COLORDIR "/grn_height.clr"
-#define HEIGHT_BLUE_FILE  COLORDIR "/blu_height.clr"
+#define REFL_RED_FILE       COLORDIR "/red_reflectivity.clr"
+#define REFL_GREEN_FILE     COLORDIR "/grn_reflectivity.clr"
+#define REFL_BLUE_FILE      COLORDIR "/blu_reflectivity.clr"
+#define VEL_RED_FILE        COLORDIR "/red_velocity.clr"
+#define VEL_GREEN_FILE      COLORDIR "/grn_velocity.clr"
+#define VEL_BLUE_FILE       COLORDIR "/blu_velocity.clr"
+#define SW_RED_FILE         COLORDIR "/red_spectral_width.clr"
+#define SW_GREEN_FILE       COLORDIR "/grn_spectral_width.clr"
+#define SW_BLUE_FILE        COLORDIR "/blu_spectral_width.clr"
+#define HEIGHT_RED_FILE     COLORDIR "/red_height.clr"
+#define HEIGHT_GREEN_FILE   COLORDIR "/grn_height.clr"
+#define HEIGHT_BLUE_FILE    COLORDIR "/blu_height.clr"
 #define RAINFALL_RED_FILE   COLORDIR "/red_rainfall.clr"
 #define RAINFALL_GREEN_FILE COLORDIR "/grn_rainfall.clr"
 #define RAINFALL_BLUE_FILE  COLORDIR "/blu_rainfall.clr"
@@ -844,39 +842,11 @@ Range HC_INVF(float x);
 Range VC_INVF(float x);
 Range SD_INVF(float x);
 
+/* Type identifiers and function tables */
+extern char *RSL_ftype[];
+extern float (*RSL_f_list[])(Range x);
+extern Range (*RSL_invf_list[])(float x);
 
-/* If you like these variables, you can use them in your application
- * by defining USE_RSL_VARS before #include "rsl.h"
- */
-#ifdef USE_RSL_VARS
-static char *RSL_ftype[] = {"DZ", "VR", "SW", "CZ", "ZT", "DR", 
-                            "LR", "ZD", "DM", "RH", "PH", "XZ", 
-                            "CD", "MZ", "MD", "ZE", "VE", "KD", 
-                            "TI", "DX", "CH", "AH", "CV", "AV",
-                            "SQ", "VS", "VL", "VG", "VT", "NP",
-                            "HC", "VC", "V2", "S2", "V3", "S3",
-                            "CR", "CC", "PR", "SD", "ZZ", "RD",
-                            "ET", "EZ"};
-
-static  float (*RSL_f_list[])(Range x) = {DZ_F, VR_F, SW_F, CZ_F, ZT_F, DR_F,
-                                          LR_F, ZD_F, DM_F, RH_F, PH_F, XZ_F,
-                                          CD_F, MZ_F, MD_F, ZE_F, VE_F, KD_F,
-                                          TI_F, DX_F, CH_F, AH_F, CV_F, AV_F,
-                                          SQ_F, VS_F, VL_F, VG_F, VT_F, NP_F,
-                                          HC_F, VC_F, VR_F, SW_F, VR_F, SW_F,
-                                          DZ_F, CZ_F, PH_F, SD_F, DZ_F, DZ_F,
-                                          ZT_F, DZ_F};
-
-static  Range (*RSL_invf_list[])(float x)
-         = {DZ_INVF, VR_INVF, SW_INVF, CZ_INVF, ZT_INVF, DR_INVF, 
-            LR_INVF, ZD_INVF, DM_INVF, RH_INVF, PH_INVF, XZ_INVF, 
-            CD_INVF, MZ_INVF, MD_INVF, ZE_INVF, VE_INVF, KD_INVF,
-            TI_INVF, DX_INVF, CH_INVF, AH_INVF, CV_INVF, AV_INVF,
-            SQ_INVF, VS_INVF, VL_INVF, VG_INVF, VT_INVF, NP_INVF,
-            HC_INVF, VC_INVF, VR_INVF, SW_INVF, VR_INVF, SW_INVF,
-            DZ_INVF, CZ_INVF, PH_INVF, SD_INVF, DZ_INVF, DZ_INVF,
-            ZT_INVF, DZ_INVF};
-#endif
 /* Secret routines that are quite useful and useful to developers. */
 void radar_load_date_time(Radar *radar);
 int big_endian(void);