Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
ae05e6c7
Commit
ae05e6c7
authored
Jul 12, 2019
by
Uwe Schulzweida
Browse files
Renamed gridInqRowlon() to gridInqReducedPoints().
parent
bb9f4fed
Changes
6
Show whitespace changes
Inline
Side-by-side
src/cdi.h
View file @
ae05e6c7
...
@@ -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
gridInqR
owlon
(
int
gridID
,
int
rowlon
[]);
void
gridInqR
educedPoints
(
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
);
...
...
src/cdiFortran.c
View file @
ae05e6c7
...
@@ -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
(
gridInqR
owlon
,
GRIDINQROWLON
,
gridinqrowlon
,
INT
,
INTV
)
FCALLSCSUB2
(
gridInqR
educedPoints
,
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
)
...
...
src/grid.c
View file @
ae05e6c7
...
@@ -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
gridInqR
owlon
(
int
gridID
,
int
*
rowlon
)
void
gridInqR
educedPoints
(
int
gridID
,
int
*
rowlon
)
{
{
grid_t
*
gridptr
=
grid_to_pointer
(
gridID
);
grid_t
*
gridptr
=
grid_to_pointer
(
gridID
);
...
...
src/mo_cdi.f90
View file @
ae05e6c7
...
@@ -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
::
gridInqR
owlon
public
::
gridInqR
educedPoints
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
gridInqR
owlon
(
gridID_dummy
,
rowlon_dummy
)
bind
(
c
,
name
=
&
subroutine
gridInqR
educedPoints
(
gridID_dummy
,
rowlon_dummy
)
bind
(
c
,
name
=
&
&
'gridInqR
owlon
'
)
&
'gridInqR
educedPoints
'
)
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
gridInqR
owlon
end
subroutine
gridInqR
educedPoints
subroutine
gridChangeType
(
gridID_dummy
,
gridtype_dummy
)
bind
(
c
,
name
=
&
subroutine
gridChangeType
(
gridID_dummy
,
gridtype_dummy
)
bind
(
c
,
name
=
&
&
'gridChangeType'
)
&
'gridChangeType'
)
...
...
src/stream_cgribex.c
View file @
ae05e6c7
...
@@ -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
;
gridInqR
owlon
(
gridID
,
ISEC2_RowLonPtr
);
gridInqR
educedPoints
(
gridID
,
ISEC2_RowLonPtr
);
}
}
else
else
{
{
...
...
src/stream_gribapi.c
View file @
ae05e6c7
...
@@ -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
));
gridInqR
owlon
(
gridID
,
rowlon
);
gridInqR
educedPoints
(
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
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment