Skip to content
GitLab
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
bb4f4ecf
Commit
bb4f4ecf
authored
Apr 11, 2017
by
Uwe Schulzweida
Browse files
Cleanup usage of GRID_LCC.
parent
072e3ce3
Changes
6
Hide whitespace changes
Inline
Side-by-side
app/printinfo.h
View file @
bb4f4ecf
...
...
@@ -422,7 +422,7 @@ void printGridInfoKernel(int gridID, int index, bool lproj)
my_reset_text_color
(
stdout
);
}
if
(
gridtype
==
GRID_CURVILINEAR
||
gridtype
==
GRID_UNSTRUCTURED
||
gridtype
==
GRID_LCC
)
if
(
gridtype
==
GRID_CURVILINEAR
||
gridtype
==
GRID_UNSTRUCTURED
)
{
if
(
gridHasArea
(
gridID
)
||
gridInqXbounds
(
gridID
,
NULL
)
||
gridInqYbounds
(
gridID
,
NULL
)
)
...
...
src/gribapi_utilities.c
View file @
bb4f4ecf
...
...
@@ -755,7 +755,7 @@ void gribapiGetGrid(grib_handle *gh, grid_t *grid)
Error
(
"Unsupported grid type: %s"
,
gridNamePtr
(
gridtype
));
}
if
(
gridtype
==
GRID_GAUSSIAN
||
gridtype
==
GRID_LONLAT
||
gridtype
==
GRID_PROJECTION
||
gridtype
==
GRID_LCC
)
if
(
gridtype
==
GRID_GAUSSIAN
||
gridtype
==
GRID_LONLAT
||
gridtype
==
GRID_PROJECTION
)
{
long
temp
;
GRIB_CHECK
(
grib_get_long
(
gh
,
"uvRelativeToGrid"
,
&
temp
),
0
);
...
...
@@ -763,7 +763,7 @@ void gribapiGetGrid(grib_handle *gh, grid_t *grid)
grid
->
uvRelativeToGrid
=
(
bool
)
temp
;
}
if
(
gridtype
==
GRID_GAUSSIAN
||
gridtype
==
GRID_LONLAT
||
gridtype
==
GRID_PROJECTION
||
gridtype
==
GRID_LCC
)
if
(
gridtype
==
GRID_GAUSSIAN
||
gridtype
==
GRID_LONLAT
||
gridtype
==
GRID_PROJECTION
)
{
long
temp
;
GRIB_CHECK
(
grib_get_long
(
gh
,
"iScansNegatively"
,
&
temp
),
0
);
...
...
src/pio_util.c
View file @
bb4f4ecf
...
...
@@ -184,7 +184,7 @@ cdiPioQueryVarDims(int varShape[3], int vlistID, int varID)
varShape
[
1
]
=
gridInqSize
(
gridID
)
/
2
;
break
;
case
GRID_GENERIC
:
case
GRID_
LCC
:
case
GRID_
PROJECTION
:
case
GRID_GME
:
case
GRID_CURVILINEAR
:
case
GRID_UNSTRUCTURED
:
...
...
src/stream_cdf_o.c
View file @
bb4f4ecf
...
...
@@ -2053,12 +2053,6 @@ void cdfDefGrid(stream_t *streamptr, int gridID, int gridindex)
cdfDefTrajLon
(
streamptr
,
gridID
,
gridindex
);
cdfDefTrajLat
(
streamptr
,
gridID
,
gridindex
);
}
/*
else if ( gridtype == GRID_LCC )
{
cdfDefLcc(streamptr, gridID);
}
*/
else
{
Error
(
"Unsupported grid type: %s"
,
gridNamePtr
(
gridtype
));
...
...
src/stream_cgribex.c
View file @
bb4f4ecf
...
...
@@ -410,7 +410,7 @@ void cgribexAddRecord(stream_t * streamptr, int param, int *isec1, int *isec2, d
if
(
proj_lonlat_to_lcc_func
)
{
x_0
=
xval_0
;
y_0
=
yval_0
;
proj_lonlat_to_lcc_func
(
grid_missval
,
lon_0
,
lat_0
,
lat_1
,
lat_2
,
a
,
rf
,
1
,
&
x_0
,
&
y_0
);
proj_lonlat_to_lcc_func
(
grid_missval
,
lon_0
,
lat_0
,
lat_1
,
lat_2
,
a
,
rf
,
(
size_t
)
1
,
&
x_0
,
&
y_0
);
if
(
IS_NOT_EQUAL
(
x_0
,
grid_missval
)
&&
IS_NOT_EQUAL
(
y_0
,
grid_missval
)
)
{
x_0
=
-
x_0
;
y_0
=
-
y_0
;
}
}
...
...
src/stream_gribapi.c
View file @
bb4f4ecf
...
...
@@ -510,7 +510,7 @@ void gribapiAddRecord(stream_t * streamptr, int param, grib_handle *gh,
if
(
proj_lonlat_to_lcc_func
)
{
x_0
=
xval_0
;
y_0
=
yval_0
;
proj_lonlat_to_lcc_func
(
grid_missval
,
lon_0
,
lat_0
,
lat_1
,
lat_2
,
a
,
rf
,
1
,
&
x_0
,
&
y_0
);
proj_lonlat_to_lcc_func
(
grid_missval
,
lon_0
,
lat_0
,
lat_1
,
lat_2
,
a
,
rf
,
(
size_t
)
1
,
&
x_0
,
&
y_0
);
if
(
IS_NOT_EQUAL
(
x_0
,
grid_missval
)
&&
IS_NOT_EQUAL
(
y_0
,
grid_missval
)
)
{
x_0
=
-
x_0
;
y_0
=
-
y_0
;
}
}
...
...
@@ -2981,7 +2981,7 @@ void gribapiSetExtMode(grib_handle *gh, int gridID, long datasize, const double
#endif
int
gridtype
=
gridInqType
(
gridID
);
if
(
gridtype
==
GRID_GENERIC
||
gridtype
==
GRID_LONLAT
||
gridtype
==
GRID_GAUSSIAN
||
gridtype
==
GRID_GAUSSIAN_REDUCED
||
gridtype
==
GRID_PROJECTION
||
gridtype
==
GRID_LCC
)
gridtype
==
GRID_GAUSSIAN_REDUCED
||
gridtype
==
GRID_PROJECTION
)
{
//scanModeIN = gribapiGetScanningMode(gh);
int
scanModeIN
=
gridInqScanningMode
(
gridID
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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