Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
a162449f
Commit
a162449f
authored
Jul 12, 2019
by
Uwe Schulzweida
Browse files
Renamed ISEC2_RowLonPtr to ISEC2_ReducedPointsPtr.
parent
285d6d8b
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/cdi.inc
View file @
a162449f
!
This
file
was
automatically
generated
,
don
'
t
edit
!
!
!
Fortran
interface
for
CDI
library
version
1.9.
7
!
Fortran
interface
for
CDI
library
version
1.9.
8
!
!
Author
:
!
-------
!
Uwe
Schulzweida
,
MPI
-
MET
,
Hamburg
,
Ju
ne
2019
!
Uwe
Schulzweida
,
MPI
-
MET
,
Hamburg
,
Ju
ly
2019
!
INTEGER
CDI_MAX_NAME
...
...
@@ -1978,16 +1978,16 @@
!
DOUBLEPRECISION
ybounds
(
*
))
EXTERNAL
gridInqYboundsPart
!
gridDefR
owlon
!
gridDefR
educedPoints
!
(
INTEGER
gridID
,
!
INTEGER
nrowlon
,
!
INTEGER
r
owlon
(
*
))
EXTERNAL
gridDefR
owlon
!
INTEGER
reducedPointsSize
,
!
INTEGER
r
educedPoints
(
*
))
EXTERNAL
gridDefR
educedPoints
!
gridInqR
owlon
!
gridInqR
educedPoints
!
(
INTEGER
gridID
,
!
INTEGER
r
owlon
(
*
))
EXTERNAL
gridInqR
owlon
!
INTEGER
r
educedPoints
(
*
))
EXTERNAL
gridInqR
educedPoints
!
gridChangeType
!
(
INTEGER
gridID
,
...
...
src/cdiFortran.c
View file @
a162449f
...
...
@@ -594,8 +594,8 @@ static int gridInqYboundsPart_fwrap(int gridID, int start, int size, double ybou
return
size_t_c2f
(
v
);
}
FCALLSCFUN4
(
INT
,
gridInqYboundsPart_fwrap
,
GRIDINQYBOUNDSPART
,
gridinqyboundspart
,
INT
,
INT
,
INT
,
DOUBLEV
)
FCALLSCSUB3
(
gridDefReducedPoints
,
GRIDDEFR
OWLON
,
griddefreduced
P
oints
,
INT
,
INT
,
INTV
)
FCALLSCSUB2
(
gridInqReducedPoints
,
GRIDINQR
OWLON
,
gridinqreduced
P
oints
,
INT
,
INTV
)
FCALLSCSUB3
(
gridDefReducedPoints
,
GRIDDEFR
EDUCEDPOINTS
,
griddefreduced
p
oints
,
INT
,
INT
,
INTV
)
FCALLSCSUB2
(
gridInqReducedPoints
,
GRIDINQR
EDUCEDPOINTS
,
gridinqreduced
p
oints
,
INT
,
INTV
)
FCALLSCSUB2
(
gridChangeType
,
GRIDCHANGETYPE
,
gridchangetype
,
INT
,
INT
)
FCALLSCSUB2
(
gridDefComplexPacking
,
GRIDDEFCOMPLEXPACKING
,
griddefcomplexpacking
,
INT
,
INT
)
FCALLSCFUN1
(
INT
,
gridInqComplexPacking
,
GRIDINQCOMPLEXPACKING
,
gridinqcomplexpacking
,
INT
)
...
...
src/make_fint.c
View file @
a162449f
...
...
@@ -15,7 +15,8 @@
#endif
//#include "config.h"
#define VERSION "1.9.7"
#define VERSION "1.9.8"
typedef
struct
{
size_t
naline
;
...
...
src/stream_cgribex.c
View file @
a162449f
...
...
@@ -256,7 +256,7 @@ bool cgribexGetGrid(stream_t *streamptr, int *isec2, int *isec4, grid_t *grid, i
{
int
nlon
=
0
;
for
(
int
ilat
=
0
;
ilat
<
ISEC2_NumLat
;
++
ilat
)
if
(
ISEC2_R
owLon
(
ilat
)
>
nlon
)
nlon
=
ISEC2_R
owLon
(
ilat
);
if
(
ISEC2_R
educedPoints
(
ilat
)
>
nlon
)
nlon
=
ISEC2_R
educedPoints
(
ilat
);
gridtype
=
GRID_GAUSSIAN
;
ISEC2_NumLon
=
nlon
;
ISEC4_NumValues
=
nlon
*
ISEC2_NumLat
;
...
...
@@ -355,7 +355,7 @@ bool cgribexGetGrid(stream_t *streamptr, int *isec2, int *isec4, grid_t *grid, i
uvRelativeToGrid
=
gribbyte_get_bit
(
ISEC2_ResFlag
,
5
);
grid
->
np
=
ISEC2_NumPar
;
grid
->
size
=
(
size_t
)
ISEC4_NumValues
;
grid
->
reducedPoints
=
ISEC2_R
owLon
Ptr
;
grid
->
reducedPoints
=
ISEC2_R
educedPoints
Ptr
;
grid
->
reducedPointsSize
=
(
size_t
)
ISEC2_NumLat
;
grid
->
y
.
size
=
(
size_t
)
ISEC2_NumLat
;
grid
->
x
.
inc
=
0
;
...
...
@@ -1603,7 +1603,7 @@ void cgribexDefGridRegular(int *isec2, double *fsec2, int gridID, int gridtype,
{
ISEC2_Reduced
=
true
;
nlon
=
0
;
gridInqReducedPoints
(
gridID
,
ISEC2_R
owLon
Ptr
);
gridInqReducedPoints
(
gridID
,
ISEC2_R
educedPoints
Ptr
);
}
else
{
...
...
Write
Preview
Markdown
is supported
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