Commit ae05e6c7 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Renamed gridInqRowlon() to gridInqReducedPoints().

parent bb9f4fed
...@@ -997,7 +997,7 @@ size_t gridInqYbounds(int gridID, double ybounds[]); ...@@ -997,7 +997,7 @@ size_t gridInqYbounds(int gridID, double ybounds[]);
size_t gridInqYboundsPart(int gridID, int start, size_t size, double ybounds[]); size_t gridInqYboundsPart(int gridID, int start, size_t size, double ybounds[]);
void gridDefRowlon(int gridID, int nrowlon, const int rowlon[]); void gridDefRowlon(int gridID, int nrowlon, const int rowlon[]);
void gridInqRowlon(int gridID, int rowlon[]); void gridInqReducedPoints(int gridID, int rowlon[]);
void gridChangeType(int gridID, int gridtype); void gridChangeType(int gridID, int gridtype);
void gridDefComplexPacking(int gridID, int lpack); void gridDefComplexPacking(int gridID, int lpack);
......
...@@ -595,7 +595,7 @@ static int gridInqYboundsPart_fwrap(int gridID, int start, int size, double ybou ...@@ -595,7 +595,7 @@ static int gridInqYboundsPart_fwrap(int gridID, int start, int size, double ybou
} }
FCALLSCFUN4 (INT, gridInqYboundsPart_fwrap, GRIDINQYBOUNDSPART, gridinqyboundspart, INT, INT, INT, DOUBLEV) FCALLSCFUN4 (INT, gridInqYboundsPart_fwrap, GRIDINQYBOUNDSPART, gridinqyboundspart, INT, INT, INT, DOUBLEV)
FCALLSCSUB3 (gridDefRowlon, GRIDDEFROWLON, griddefrowlon, INT, INT, INTV) FCALLSCSUB3 (gridDefRowlon, GRIDDEFROWLON, griddefrowlon, INT, INT, INTV)
FCALLSCSUB2 (gridInqRowlon, GRIDINQROWLON, gridinqrowlon, INT, INTV) FCALLSCSUB2 (gridInqReducedPoints, GRIDINQROWLON, gridinqrowlon, INT, INTV)
FCALLSCSUB2 (gridChangeType, GRIDCHANGETYPE, gridchangetype, INT, INT) FCALLSCSUB2 (gridChangeType, GRIDCHANGETYPE, gridchangetype, INT, INT)
FCALLSCSUB2 (gridDefComplexPacking, GRIDDEFCOMPLEXPACKING, griddefcomplexpacking, INT, INT) FCALLSCSUB2 (gridDefComplexPacking, GRIDDEFCOMPLEXPACKING, griddefcomplexpacking, INT, INT)
FCALLSCFUN1 (INT, gridInqComplexPacking, GRIDINQCOMPLEXPACKING, gridinqcomplexpacking, INT) FCALLSCFUN1 (INT, gridInqComplexPacking, GRIDINQCOMPLEXPACKING, gridinqcomplexpacking, INT)
......
...@@ -1408,7 +1408,7 @@ void gridDefRowlon(int gridID, int nrowlon, const int rowlon[]) ...@@ -1408,7 +1408,7 @@ void gridDefRowlon(int gridID, int nrowlon, const int rowlon[])
@EndFunction @EndFunction
*/ */
void gridInqRowlon(int gridID, int *rowlon) void gridInqReducedPoints(int gridID, int *rowlon)
{ {
grid_t *gridptr = grid_to_pointer(gridID); grid_t *gridptr = grid_to_pointer(gridID);
......
...@@ -561,7 +561,7 @@ module mo_cdi ...@@ -561,7 +561,7 @@ module mo_cdi
public :: gridInqYbounds public :: gridInqYbounds
public :: gridInqYboundsPart public :: gridInqYboundsPart
public :: gridDefRowlon public :: gridDefRowlon
public :: gridInqRowlon public :: gridInqReducedPoints
public :: gridChangeType public :: gridChangeType
public :: gridDefComplexPacking public :: gridDefComplexPacking
public :: gridInqComplexPacking public :: gridInqComplexPacking
...@@ -2333,12 +2333,12 @@ module mo_cdi ...@@ -2333,12 +2333,12 @@ module mo_cdi
integer(c_int), intent(in) :: rowlon_dummy(*) integer(c_int), intent(in) :: rowlon_dummy(*)
end subroutine gridDefRowlon end subroutine gridDefRowlon
subroutine gridInqRowlon(gridID_dummy, rowlon_dummy) bind(c, name =& subroutine gridInqReducedPoints(gridID_dummy, rowlon_dummy) bind(c, name =&
& 'gridInqRowlon') & 'gridInqReducedPoints')
import c_int import c_int
integer(c_int), value :: gridID_dummy integer(c_int), value :: gridID_dummy
integer(c_int), intent(inout) :: rowlon_dummy(*) integer(c_int), intent(inout) :: rowlon_dummy(*)
end subroutine gridInqRowlon end subroutine gridInqReducedPoints
subroutine gridChangeType(gridID_dummy, gridtype_dummy) bind(c, name =& subroutine gridChangeType(gridID_dummy, gridtype_dummy) bind(c, name =&
& 'gridChangeType') & 'gridChangeType')
......
...@@ -1603,7 +1603,7 @@ void cgribexDefGridRegular(int *isec2, double *fsec2, int gridID, int gridtype, ...@@ -1603,7 +1603,7 @@ void cgribexDefGridRegular(int *isec2, double *fsec2, int gridID, int gridtype,
{ {
ISEC2_Reduced = true; ISEC2_Reduced = true;
nlon = 0; nlon = 0;
gridInqRowlon(gridID, ISEC2_RowLonPtr); gridInqReducedPoints(gridID, ISEC2_RowLonPtr);
} }
else else
{ {
......
...@@ -1898,7 +1898,7 @@ void gribapiDefGridRegular(grib_handle *gh, int gridID, int gridtype, bool gridI ...@@ -1898,7 +1898,7 @@ void gribapiDefGridRegular(grib_handle *gh, int gridID, int gridtype, bool gridI
int *rowlon = (int *) Malloc(nlat*sizeof(int)); int *rowlon = (int *) Malloc(nlat*sizeof(int));
long *pl = (long *) Malloc(nlat*sizeof(long)); long *pl = (long *) Malloc(nlat*sizeof(long));
gridInqRowlon(gridID, rowlon); gridInqReducedPoints(gridID, rowlon);
for ( size_t i = 0; i < nlat; ++i ) pl[i] = rowlon[i]; for ( size_t i = 0; i < nlat; ++i ) pl[i] = rowlon[i];
GRIB_CHECK(grib_set_long_array(gh, "pl", pl, nlat), 0); GRIB_CHECK(grib_set_long_array(gh, "pl", pl, nlat), 0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment