Blob Blame History Raw
diff -up grib2/wgrib2/fnlist.c.nogctpc grib2/wgrib2/fnlist.c
--- grib2/wgrib2/fnlist.c.nogctpc	2023-02-02 06:56:16.000000000 -0700
+++ grib2/wgrib2/fnlist.c	2023-05-18 09:13:54.163960833 -0600
@@ -130,8 +130,6 @@ struct function functions[] = {
    {"ilat",f_ilat, inv, 1, "lat,lon and grid value at Xth grid point, X=1,..,npnts (WxText enabled)", 100},
    {"lev",f_lev, inv, 0, "level (code table 4.5)", 200},
    {"lev0",f_lev0, inv, 0, "level for g2ctl/GrADS", -1},
-   {"ll2i",f_ll2i, inv, 2, "x=lon y=lat, converts to (i), 1..ndata", 100},
-   {"ll2ij",f_ll2ij, inv, 2, "x=lon y=lat, converts lon-lat to (i,j) using gctpc", 100},
    {"lon",f_lon, inv, 2, "value at grid point nearest lon=X lat=Y (WxText enabled)", 100},
    {"match_inv",f_match_inv, inv, 0, "inventory used by -match, -not, -if and -not_if", 100},
    {"max",f_max, inv, 0, "print maximum value", 100},
@@ -202,7 +200,6 @@ struct function functions[] = {
    {"export_lonlat",f_export_lonlat, misc, 1, "save lon-lat data in binary file", 100},
    {"fix_CFSv2_fcst",f_fix_CFSv2_fcst, misc, 3, "fixes CFSv2 monthly fcst X=daily or 00/06/12/18 Y=pert no. Z=number ens fcsts v1.0", 100},
    {"fix_ncep",f_fix_ncep, misc, 0, "fix ncep PDT=8 headers produced by cnvgrib", 100},
-   {"gctpc",f_gctpc, misc, 1, " X=0,1 use gctpc library (default=1)", 100},
    {"grid_changes",f_grid_changes, misc, 0, "prints number of grid changes", 100},
    {"grid_def",f_grid_def, misc, 0, "read lon and lat data from grib file -- experimental", 100},
    {"h",f_h, misc, 0, "help, shows common options", 100},
diff -up grib2/wgrib2/fnlist.h.nogctpc grib2/wgrib2/fnlist.h
--- grib2/wgrib2/fnlist.h.nogctpc	2023-02-02 06:56:16.000000000 -0700
+++ grib2/wgrib2/fnlist.h	2023-05-18 09:13:54.152960874 -0600
@@ -132,8 +132,6 @@ int f_ijlat(int mode, unsigned char **se
 int f_ilat(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1);
 int f_lev(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local);
 int f_lev0(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local);
-int f_ll2i(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1, const char *arg2);
-int f_ll2ij(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1, const char *arg2);
 int f_lon(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1, const char *arg2);
 int f_match_inv(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local);
 int f_max(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local);
@@ -204,7 +202,6 @@ int f_error_final(int mode, unsigned cha
 int f_export_lonlat(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1);
 int f_fix_CFSv2_fcst(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1, const char *arg2, const char *arg3);
 int f_fix_ncep(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local);
-int f_gctpc(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1);
 int f_grid_changes(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local);
 int f_grid_def(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local);
 int f_h(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local);
diff -up grib2/wgrib2/geo.c.nogctpc grib2/wgrib2/geo.c
--- grib2/wgrib2/geo.c.nogctpc	2022-10-17 13:23:19.000000000 -0600
+++ grib2/wgrib2/geo.c	2023-05-18 09:15:03.706701998 -0600
@@ -917,10 +917,6 @@ int closest_init(unsigned char **sec) {
     int grid_type;
 
 
-    if (geolocation == gctpc) {
-       if (gctpc_ll2xy_init(sec, lon, lat) == 0) return 0;
-    }
-
     grid_type = code_table_3_1(sec);
 
     if  (!GDS_Scan_staggered(scan) && nx > 0 && ny > 0 && output_order == wesn) {
@@ -974,11 +970,6 @@ long int closest(unsigned char **sec, do
     unsigned int k;
 
 
-    if (geolocation == gctpc) {
-	/* will fix it so that everything is 0 for out of bounds */
-	if (gctpc_ll2i(1, &plon, &plat, &k) == 0) return ((long int) k) - 1;
-    }
-
     grid_type = code_table_3_1(sec);
     
     if  (!GDS_Scan_staggered(scan) && nx > 0 && ny > 0 && output_order == wesn) {
diff -up grib2/wgrib2/wgrib2.c.nogctpc grib2/wgrib2/wgrib2.c
--- grib2/wgrib2/wgrib2.c.nogctpc	2022-10-18 09:12:07.000000000 -0600
+++ grib2/wgrib2/wgrib2.c	2023-05-18 09:15:51.930521495 -0600
@@ -162,8 +162,6 @@ int wgrib2(int argc, const char **argv)
     if (initial_call) {		/* only done 1st time */
 	setup_user_gribtable();
 //      jas_init();
-//      gctpc initialiation
-        init(-1,-1,"gctpc_error.txt", "gctpc_param.txt");
         initial_call = 0;
     }
 
@@ -577,11 +575,6 @@ int wgrib2(int argc, const char **argv)
             if (latlon) {
 		i = 1;
 
-		if (use_gctpc && i != 0) {				/* use gctpc to get lat lon values */
-		    i = gctpc_get_latlon(sec, &lon, &lat);
-		    if (i == 0) geolocation = gctpc;
-		}
-
 #ifdef USE_PROJ4
 		if (use_proj4 && i != 0) {				/* use Proj4 to get lat lon values */
 		    i = proj4_get_latlon(sec, &lon, &lat);