Skip to content

GitLab

Commit 7d8e0a66 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

IEG: added support for coordinate scale factor [patch from Kevin Sieck]

parent b4654097
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 32 deletions
ChangeLog
View file @ 7d8e0a66
2014-11-05 Uwe Schulzweida
* IEG: added support for coordinate scale factor [patch from Kevin Sieck]
2014-10-31 Uwe Schulzweida
* Version 1.6.5.1 released
......
src/ieg.h
View file @ 7d8e0a66
......@@ -51,6 +51,7 @@
#define IEG_G_ScanFlag(x) (x[13])
#define IEG_G_LatSP(x) (x[16]) /* Latitude of the southern pole of rotation */
#define IEG_G_LonSP(x) (x[17]) /* Longitude of the southern pole of rotation */
#define IEG_G_ResFac(x) (x[19]) /* Resolution factor */
typedef struct {
......
src/ieglib.c
View file @ 7d8e0a66
......@@ -26,7 +26,7 @@ static int iegDefaultDprec = 0;
*/
#undef LIBVERSION
#define LIBVERSION 1.3.2
#define LIBVERSION 1.3.3
#define XSTRING(x) #x
#define STRING(x) XSTRING(x)
static const char ieg_libvers[] = STRING(LIBVERSION) " of "__DATE__" "__TIME__;
......
src/stream_ieg.c
View file @ 7d8e0a66
......@@ -227,6 +227,32 @@ void iegDefTime(int *pdb, int date, int time, int taxisID)
pdb[5] = 128;
}
static
int calc_resfac(double xfirst, double xlast, double xinc, double yfirst, double ylast, double yinc)
{
int i, j;
int iresfac = 1000;
int ifact;
int ifacarr[5] = {1000, 10000, 100000, 1000000, 10000000};
double vals[6] = {xfirst, xlast, xinc, yfirst, ylast, yinc};
for ( j = 0; j < 5; ++j )
{
ifact = ifacarr[j];
for ( i = 0; i < 6; ++i )
{
if ( fabs(vals[i]*ifact-(lround(vals[i]*ifact))) > FLT_EPSILON ) break;
}
if ( i == 6 )
{
iresfac = ifact;
break;
}
}
return (iresfac);
}
static
void iegDefGrid(int *gdb, int gridID)
{
......@@ -242,7 +268,7 @@ void iegDefGrid(int *gdb, int gridID)
ysize = gridInqYsize(gridID);
if ( (ysize == 32 || ysize == 48 || ysize == 64 ||
ysize == 96 || ysize == 160) &&
ysize == 96 || ysize == 160) &&
(xsize == 2*ysize || xsize == 1) )
{
gridtype = GRID_GAUSSIAN;
......@@ -302,22 +328,28 @@ void iegDefGrid(int *gdb, int gridID)
else
IEG_G_GridType(gdb) = 0;
int iresfac = calc_resfac(xfirst, xlast, xinc, yfirst, ylast, yinc);
double resfac = (double) iresfac;
if ( iresfac == 1000 ) iresfac = 0;
IEG_G_ResFac(gdb) = iresfac;
IEG_G_NumLon(gdb) = nlon;
IEG_G_NumLat(gdb) = nlat;
IEG_G_FirstLat(gdb) = lround(yfirst*1000);
IEG_G_LastLat(gdb) = lround(ylast*1000);
IEG_G_FirstLon(gdb) = lround(xfirst*1000);
IEG_G_LastLon(gdb) = lround(xlast*1000);
IEG_G_LonIncr(gdb) = lround(xinc*1000);
if ( fabs(xinc*1000 - IEG_G_LonIncr(gdb)) > FLT_EPSILON )
IEG_G_FirstLat(gdb) = lround(yfirst*resfac);
IEG_G_LastLat(gdb) = lround(ylast*resfac);
IEG_G_FirstLon(gdb) = lround(xfirst*resfac);
IEG_G_LastLon(gdb) = lround(xlast*resfac);
IEG_G_LonIncr(gdb) = lround(xinc*resfac);
if ( fabs(xinc*resfac - IEG_G_LonIncr(gdb)) > FLT_EPSILON )
IEG_G_LonIncr(gdb) = 0;
if ( gridtype == GRID_GAUSSIAN )
IEG_G_LatIncr(gdb) = nlat/2;
else
{
IEG_G_LatIncr(gdb) = lround(yinc*1000);
if ( fabs(yinc*1000 - IEG_G_LatIncr(gdb)) > FLT_EPSILON )
IEG_G_LatIncr(gdb) = lround(yinc*resfac);
if ( fabs(yinc*resfac - IEG_G_LatIncr(gdb)) > FLT_EPSILON )
IEG_G_LatIncr(gdb) = 0;
if ( IEG_G_LatIncr(gdb) < 0 ) IEG_G_LatIncr(gdb) = -IEG_G_LatIncr(gdb);
......@@ -336,8 +368,8 @@ void iegDefGrid(int *gdb, int gridID)
if ( gridIsRotated(gridID) )
{
IEG_G_LatSP(gdb) = - lround(gridInqYpole(gridID) * 1000);
IEG_G_LonSP(gdb) = lround((gridInqXpole(gridID) + 180) * 1000);
IEG_G_LatSP(gdb) = - lround(gridInqYpole(gridID) * resfac);
IEG_G_LonSP(gdb) = lround((gridInqXpole(gridID) + 180) * resfac);
IEG_G_Size(gdb) = 42;
}
else
......@@ -647,21 +679,26 @@ void iegAddRecord(stream_t *streamptr, int param, int *pdb, int *gdb, double *vc
gridtype = GRID_GENERIC;
memset(&grid, 0, sizeof(grid_t));
grid.type = gridtype;
grid.type = gridtype;
grid.size = IEG_G_NumLon(gdb)*IEG_G_NumLat(gdb);
grid.xsize = IEG_G_NumLon(gdb);
grid.ysize = IEG_G_NumLat(gdb);
grid.xinc = 0;
grid.yinc = 0;
grid.xdef = 0;
int iresfac = IEG_G_ResFac(gdb);
if ( iresfac == 0 ) iresfac = 1000;
double resfac = 1./(double) iresfac;
/* if ( IEG_G_FirstLon != 0 || IEG_G_LastLon != 0 ) */
{
if ( grid.xsize > 1 )
{
if ( IEG_G_ResFlag(gdb) && IEG_G_LonIncr(gdb) > 0 )
grid.xinc = IEG_G_LonIncr(gdb) * 0.001;
grid.xinc = IEG_G_LonIncr(gdb) * resfac;
else
grid.xinc = (IEG_G_LastLon(gdb) - IEG_G_FirstLon(gdb)) * 0.001 / (grid.xsize - 1);
grid.xinc = (IEG_G_LastLon(gdb) - IEG_G_FirstLon(gdb)) * resfac / (grid.xsize - 1);
/* correct xinc if necessary */
if ( IEG_G_FirstLon(gdb) == 0 && IEG_G_LastLon(gdb) > 354000 )
......@@ -675,9 +712,9 @@ void iegAddRecord(stream_t *streamptr, int param, int *pdb, int *gdb, double *vc
}
}
}
grid.xfirst = IEG_G_FirstLon(gdb) * 0.001;
grid.xlast = IEG_G_LastLon(gdb) * 0.001;
grid.xdef = 2;
grid.xfirst = IEG_G_FirstLon(gdb) * resfac;
grid.xlast = IEG_G_LastLon(gdb) * resfac;
grid.xdef = 2;
}
grid.ydef = 0;
/* if ( IEG_G_FirstLat != 0 || IEG_G_LastLat != 0 ) */
......@@ -685,22 +722,22 @@ void iegAddRecord(stream_t *streamptr, int param, int *pdb, int *gdb, double *vc
if ( grid.ysize > 1 )
{
if ( IEG_G_ResFlag(gdb) && IEG_G_LatIncr(gdb) > 0 )
grid.yinc = IEG_G_LatIncr(gdb) * 0.001;
grid.yinc = IEG_G_LatIncr(gdb) * resfac;
else
grid.yinc = (IEG_G_LastLat(gdb) - IEG_G_FirstLat(gdb)) * 0.001 / (grid.ysize - 1);
grid.yinc = (IEG_G_LastLat(gdb) - IEG_G_FirstLat(gdb)) * resfac / (grid.ysize - 1);
}
grid.yfirst = IEG_G_FirstLat(gdb) * 0.001;
grid.ylast = IEG_G_LastLat(gdb) * 0.001;
grid.ydef = 2;
grid.yfirst = IEG_G_FirstLat(gdb) * resfac;
grid.ylast = IEG_G_LastLat(gdb) * resfac;
grid.ydef = 2;
}
/*
grid.xfirst= IEG_G_FirstLon(gdb) * 0.001;
grid.xlast = IEG_G_LastLon(gdb) * 0.001;
grid.xinc = IEG_G_LonIncr(gdb) * 0.001;
grid.xdef = 2;
grid.yfirst= IEG_G_FirstLat(gdb) * 0.001;
grid.ylast = IEG_G_LastLat(gdb) * 0.001;
grid.yinc = IEG_G_LatIncr(gdb) * 0.001;
grid.xfirst= IEG_G_FirstLon(gdb) * resfac;
grid.xlast = IEG_G_LastLon(gdb) * resfac;
grid.xinc = IEG_G_LonIncr(gdb) * resfac;
grid.xdef = 2;
grid.yfirst= IEG_G_FirstLat(gdb) * resfac;
grid.ylast = IEG_G_LastLat(gdb) * resfac;
grid.yinc = IEG_G_LatIncr(gdb) * resfac;
grid.ydef = 2;
*/
grid.xvals = NULL;
......@@ -710,8 +747,8 @@ void iegAddRecord(stream_t *streamptr, int param, int *pdb, int *gdb, double *vc
if ( IEG_G_GridType(gdb) == 10 )
{
grid.isRotated = TRUE;
grid.ypole = - IEG_G_LatSP(gdb) * 0.001;
grid.xpole = IEG_G_LonSP(gdb) * 0.001 - 180;
grid.ypole = - IEG_G_LatSP(gdb) * resfac;
grid.xpole = IEG_G_LonSP(gdb) * resfac - 180;
grid.angle = 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