Renamed gridXXXLCC to gridXXXParamLCC().

app/printinfo.h

@@ -420,7 +420,7 @@ void printGridInfoKernel(int gridID, int index, bool lproj)
       double originLon, originLat, lonParY, lat1, lat2, xincm, yincm;
       int projflag, scanflag;
 
-      gridInqLCC(gridID, &originLon, &originLat, &lonParY, &lat1, &lat2, &xincm, &yincm,
+      gridInqParamLCC(gridID, &originLon, &originLat, &lonParY, &lat1, &lat2, &xincm, &yincm,
                  &projflag, &scanflag);
 
 #ifdef CDO

src/cdi.h

@@ -848,9 +848,6 @@ double  gridInqYinc(int gridID);
 
 int     gridIsCircular(int gridID);
 
-void    gridInqParamRLL(int gridID, double *xpole, double *ypole, double *angle);
-void    gridDefParamRLL(int gridID, double xpole, double ypole, double angle);
-
 int     gridInqTrunc(int gridID);
 void    gridDefTrunc(int gridID, int trunc);
 /* Hexagonal GME grid */
@@ -897,9 +894,13 @@ void    gridInqUUID(int gridID, unsigned char *uuid);
 void    gridInqUUID(int gridID, unsigned char uuid[CDI_UUID_SIZE]);
 #endif
 
+/* Rotated Lon/Lat grid */
+void    gridInqParamRLL(int gridID, double *xpole, double *ypole, double *angle);
+void    gridDefParamRLL(int gridID, double xpole, double ypole, double angle);
+
 /* Lambert Conformal Conic grid (GRIB version) */
-void gridDefLCC(int gridID, double originLon, double originLat, double lonParY, double lat1, double lat2, double xinc, double yinc, int projflag, int scanflag);
-void gridInqLCC(int gridID, double *originLon, double *originLat, double *lonParY, double *lat1, double *lat2, double *xinc, double *yinc, int *projflag, int *scanflag);
+void    gridDefParamLCC(int gridID, double originLon, double originLat, double lonParY, double lat1, double lat2, double xinc, double yinc, int projflag, int scanflag);
+void    gridInqParamLCC(int gridID, double *originLon, double *originLat, double *lonParY, double *lat1, double *lat2, double *xinc, double *yinc, int *projflag, int *scanflag);
 
 void    gridDefArea(int gridID, const double area[]);
 void    gridInqArea(int gridID, double area[]);

src/cdiFortran.c

@@ -390,8 +390,8 @@ FCALLSCSUB2 (gridInqUUID, GRIDINQUUID, gridinquuid, INT, PVOID)
 
 /*  Lambert Conformal Conic grid (GRIB version)  */
 
-FCALLSCSUB10 (gridDefLCC, GRIDDEFLCC, griddeflcc, INT, DOUBLE, DOUBLE, DOUBLE, DOUBLE, DOUBLE, DOUBLE, DOUBLE, INT, INT)
-FCALLSCSUB10 (gridInqLCC, GRIDINQLCC, gridinqlcc, INT, PDOUBLE, PDOUBLE, PDOUBLE, PDOUBLE, PDOUBLE, PDOUBLE, PDOUBLE, PINT, PINT)
+FCALLSCSUB10 (gridDefParamLCC, GRIDDEFLCC, griddeflcc, INT, DOUBLE, DOUBLE, DOUBLE, DOUBLE, DOUBLE, DOUBLE, DOUBLE, INT, INT)
+FCALLSCSUB10 (gridInqParamLCC, GRIDINQLCC, gridinqlcc, INT, PDOUBLE, PDOUBLE, PDOUBLE, PDOUBLE, PDOUBLE, PDOUBLE, PDOUBLE, PINT, PINT)
 
 /*  Lambert Conformal Conic 2 grid (PROJ version)  */
 

src/grid.c

@@ -2562,7 +2562,7 @@ void gridComplete(grid_t *grid)
         switch (gridtype)
           {
           case GRID_LCC:
-            gridDefLCC(gridID, grid->lcc.originLon, grid->lcc.originLat, grid->lcc.lonParY,
+            gridDefParamLCC(gridID, grid->lcc.originLon, grid->lcc.originLat, grid->lcc.lonParY,
                        grid->lcc.lat1, grid->lcc.lat2, grid->lcc.xinc, grid->lcc.yinc,
                        grid->lcc.projflag, grid->lcc.scanflag);
             break;
@@ -3532,7 +3532,7 @@ void gridPrintKernel(grid_t *gridptr, int index, int opt, FILE *fp)
       {
 	double originLon = 0, originLat = 0, lonParY = 0, lat1 = 0, lat2 = 0, xincm = 0, yincm = 0;
 	int projflag = 0, scanflag = 0;
-	gridInqLCC(gridID, &originLon, &originLat, &lonParY, &lat1, &lat2, &xincm, &yincm,
+	gridInqParamLCC(gridID, &originLon, &originLat, &lonParY, &lat1, &lat2, &xincm, &yincm,
 		   &projflag, &scanflag);
 
 	fprintf(fp,
@@ -3662,10 +3662,10 @@ const double *gridInqYvalsPtr(int gridID)
 }
 
 /*
-@Function  gridDefLCC
+@Function  gridDefParamLCC
 @Title     Define the parameter of a Lambert Conformal Conic grid
 
-@Prototype void gridDefLCC(int gridID, double originLon, double originLat, double lonParY, double lat1, double lat2, double xinc, double yinc, int projflag, int scanflag)
+@Prototype void gridDefParamLCC(int gridID, double originLon, double originLat, double lonParY, double lat1, double lat2, double xinc, double yinc, int projflag, int scanflag)
 @Parameter
     @Item  gridID    Grid ID, from a previous call to @fref{gridCreate}.
     @Item  originLon Longitude of the first grid point.
@@ -3679,11 +3679,11 @@ const double *gridInqYvalsPtr(int gridID)
     @Item  scanflag  Scanning mode flag.
 
 @Description
-The function @func{gridDefLCC} defines the parameter of a Lambert Conformal Conic grid.
+The function @func{gridDefParamLCC} defines the parameter of a Lambert Conformal Conic grid.
 
 @EndFunction
 */
-void gridDefLCC(int gridID, double originLon, double originLat, double lonParY,
+void gridDefParamLCC(int gridID, double originLon, double originLat, double lonParY,
                 double lat1, double lat2, double xinc, double yinc,
                 int projflag, int scanflag)
 {
@@ -3709,10 +3709,10 @@ void gridDefLCC(int gridID, double originLon, double originLat, double lonParY,
 }
 
 /*
-@Function  gridInqLCC
+@Function  gridInqParamLCC
 @Title     Get the parameter of a Lambert Conformal Conic grid
 
-@Prototype void gridInqLCC(int gridID, double *originLon, double *originLat, double *lonParY, double *lat1, double *lat2, double *xinc, double *yinc, int *projflag, int *scanflag)
+@Prototype void gridInqParamLCC(int gridID, double *originLon, double *originLat, double *lonParY, double *lat1, double *lat2, double *xinc, double *yinc, int *projflag, int *scanflag)
 @Parameter
     @Item  gridID    Grid ID, from a previous call to @fref{gridCreate} or @fref{vlistInqVarGrid}.
     @Item  originLon Longitude of the first grid point.
@@ -3726,11 +3726,11 @@ void gridDefLCC(int gridID, double originLon, double originLat, double lonParY,
     @Item  scanflag  Scanning mode flag.
  
 @Description
-The function @func{gridInqLCC} returns the parameter of a Lambert Conformal Conic grid.
+The function @func{gridInqParamLCC} returns the parameter of a Lambert Conformal Conic grid.
 
 @EndFunction
 */
-void gridInqLCC(int gridID, double *originLon, double *originLat, double *lonParY,
+void gridInqParamLCC(int gridID, double *originLon, double *originLat, double *lonParY,
                 double *lat1, double *lat2, double *xinc, double *yinc,
                 int *projflag, int *scanflag)
 {

src/stream_cgribex.c

@@ -1767,7 +1767,7 @@ void cgribexDefGrid(int *isec1, int *isec2, double *fsec2, int *isec4, int gridI
 	int xsize = gridInqXsize(gridID),
           ysize = gridInqYsize(gridID);
 
-	gridInqLCC(gridID, &originLon, &originLat, &lonParY, &lat1, &lat2, &xincm, &yincm,
+	gridInqParamLCC(gridID, &originLon, &originLat, &lonParY, &lat1, &lat2, &xincm, &yincm,
 		   &projflag, &scanflag);
 
 	ISEC2_GridType = GRIB1_GTYPE_LCC;

src/stream_gribapi.c

@@ -2099,7 +2099,7 @@ void gribapiDefGrid(int editionNumber, grib_handle *gh, int gridID, int comptype
 	int xsize = gridInqXsize(gridID);
 	int ysize = gridInqYsize(gridID);
 
-	gridInqLCC(gridID, &originLon, &originLat, &lonParY, &lat1, &lat2, &xincm, &yincm,
+	gridInqParamLCC(gridID, &originLon, &originLat, &lonParY, &lat1, &lat2, &xincm, &yincm,
 		   &projflag, &scanflag);
 
         static const char mesg[] = "lambert";