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
c7a4046a
Commit
c7a4046a
authored
Nov 27, 2007
by
Uwe Schulzweida
Browse files
more lambert
parent
58e3f6b1
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/cdi.h
View file @
c7a4046a
...
...
@@ -517,10 +517,8 @@ int gridInqGMEni3(int gridID);
void
gridDefGMEni3
(
int
gridID
,
int
ni3
);
/* Lambert grid */
void
gridDefLambert
(
int
gridID
,
double
originLon
,
double
originLat
,
double
lonParY
,
double
lat1
,
double
lat2
,
double
xinc
,
double
yinc
);
void
gridInqLambert
(
int
gridID
,
double
*
originLon
,
double
*
originLat
,
double
*
lonParY
,
double
*
lat1
,
double
*
lat2
,
double
*
xinc
,
double
*
yinc
);
void
gridDefLambert
(
int
gridID
,
double
originLon
,
double
originLat
,
double
lonParY
,
double
lat1
,
double
lat2
,
double
xinc
,
double
yinc
);
void
gridInqLambert
(
int
gridID
,
double
*
originLon
,
double
*
originLat
,
double
*
lonParY
,
double
*
lat1
,
double
*
lat2
,
double
*
xinc
,
double
*
yinc
);
void
gridDefArea
(
int
gridID
,
double
*
area
);
void
gridInqArea
(
int
gridID
,
double
*
area
);
...
...
src/cdi.inc
View file @
c7a4046a
!
!
Fortran
interface
for
CDI
library
version
1.0.
7
!
Fortran
interface
for
CDI
library
version
1.0.
9
!
INTEGER
CDI_UNDEFID
PARAMETER
(
CDI_UNDEFID
=
-
1
)
INTEGER
CDI_GLOBAL
PARAMETER
(
CDI_GLOBAL
=
-
1
)
!
!
Byte
order
!
...
...
@@ -14,6 +16,8 @@
!
!
Error
identifier
!
INTEGER
CDI_NOERR
PARAMETER
(
CDI_NOERR
=
0
)
INTEGER
CDI_ESYSTEM
PARAMETER
(
CDI_ESYSTEM
=
-
10
)
INTEGER
CDI_EINVAL
...
...
@@ -29,8 +33,8 @@
!
INTEGER
FILETYPE_GRB
PARAMETER
(
FILETYPE_GRB
=
1
)
INTEGER
FILETYPE_G2
PARAMETER
(
FILETYPE_G2
=
2
)
INTEGER
FILETYPE_G
B
2
PARAMETER
(
FILETYPE_G
B
2
=
2
)
INTEGER
FILETYPE_NC
PARAMETER
(
FILETYPE_NC
=
3
)
INTEGER
FILETYPE_NC2
...
...
@@ -51,7 +55,7 @@
INTEGER
COMPRESS_BZIP2
PARAMETER
(
COMPRESS_BZIP2
=
3
)
!
!
D
ata
types
!
external
d
ata
types
!
INTEGER
DATATYPE_PACK
PARAMETER
(
DATATYPE_PACK
=
0
)
...
...
@@ -130,6 +134,15 @@
INTEGER
DATATYPE_INT32
PARAMETER
(
DATATYPE_INT32
=
232
)
!
!
internal
data
types
!
INTEGER
DATATYPE_INT
PARAMETER
(
DATATYPE_INT
=
251
)
INTEGER
DATATYPE_FLT
PARAMETER
(
DATATYPE_FLT
=
252
)
INTEGER
DATATYPE_TXT
PARAMETER
(
DATATYPE_TXT
=
253
)
!
!
GRID
types
!
INTEGER
GRID_GENERIC
...
...
@@ -152,6 +165,8 @@
PARAMETER
(
GRID_CELL
=
9
)
INTEGER
GRID_CURVILINEAR
PARAMETER
(
GRID_CURVILINEAR
=
10
)
INTEGER
GRID_LAMBERT
PARAMETER
(
GRID_LAMBERT
=
11
)
!
!
ZAXIS
types
!
...
...
@@ -537,12 +552,6 @@
!
(
INTEGER
vlistID
)
EXTERNAL
vlistInqModel
!
vlistDefAttribute
!
(
INTEGER
vlistID
,
!
CHARACTER
*
(
*
)
attname
,
!
CHARACTER
*
(
*
)
attstring
)
EXTERNAL
vlistDefAttribute
!
!
VLIST
VAR
routines
!
...
...
@@ -804,6 +813,78 @@
!
INTEGER
flevelID
)
EXTERNAL
vlistFindLevel
!
!
VLIST
attributes
!
INTEGER
vlistInqNatts
!
(
INTEGER
vlistID
,
!
INTEGER
varID
,
!
INTEGER
nattsp
)
EXTERNAL
vlistInqNatts
INTEGER
vlistInqAttr
!
(
INTEGER
vlistID
,
!
INTEGER
varID
,
!
INTEGER
attrnum
,
!
CHARACTER
*
(
*
)
name
,
!
INTEGER
typep
,
!
INTEGER
lenp
)
EXTERNAL
vlistInqAttr
INTEGER
vlistDelAttr
!
(
INTEGER
vlistID
,
!
INTEGER
varID
,
!
CHARACTER
*
(
*
)
name
)
EXTERNAL
vlistDelAttr
INTEGER
vlistDefAttrInt
!
(
INTEGER
vlistID
,
!
INTEGER
varID
,
!
CHARACTER
*
(
*
)
name
,
!
INTEGER
len
,
!
INTEGER
ip
)
EXTERNAL
vlistDefAttrInt
INTEGER
vlistDefAttrFlt
!
(
INTEGER
vlistID
,
!
INTEGER
varID
,
!
CHARACTER
*
(
*
)
name
,
!
INTEGER
len
,
!
DOUBLEPRECISION
dp
)
EXTERNAL
vlistDefAttrFlt
INTEGER
vlistDefAttrTxt
!
(
INTEGER
vlistID
,
!
INTEGER
varID
,
!
CHARACTER
*
(
*
)
name
,
!
INTEGER
len
,
!
CHARACTER
*
(
*
)
tp
)
EXTERNAL
vlistDefAttrTxt
INTEGER
vlistInqAttrInt
!
(
INTEGER
vlistID
,
!
INTEGER
varID
,
!
CHARACTER
*
(
*
)
name
,
!
INTEGER
mlen
,
!
INTEGER
ip
)
EXTERNAL
vlistInqAttrInt
INTEGER
vlistInqAttrFlt
!
(
INTEGER
vlistID
,
!
INTEGER
varID
,
!
CHARACTER
*
(
*
)
name
,
!
INTEGER
mlen
,
!
DOUBLEPRECISION
dp
)
EXTERNAL
vlistInqAttrFlt
INTEGER
vlistInqAttrTxt
!
(
INTEGER
vlistID
,
!
INTEGER
varID
,
!
CHARACTER
*
(
*
)
name
,
!
INTEGER
mlen
,
!
CHARACTER
*
(
*
)
tp
)
EXTERNAL
vlistInqAttrTxt
!
!
GRID
routines
!
...
...
@@ -1077,6 +1158,31 @@
!
INTEGER
ni3
)
EXTERNAL
gridDefGMEni3
!
!
Lambert
grid
!
!
gridDefLambert
!
(
INTEGER
gridID
,
!
DOUBLEPRECISION
originLon
,
!
DOUBLEPRECISION
originLat
,
!
DOUBLEPRECISION
lonParY
,
!
DOUBLEPRECISION
lat1
,
!
DOUBLEPRECISION
lat2
,
!
DOUBLEPRECISION
xinc
,
!
DOUBLEPRECISION
yinc
)
EXTERNAL
gridDefLambert
!
gridInqLambert
!
(
INTEGER
gridID
,
!
DOUBLEPRECISION
originLon
,
!
DOUBLEPRECISION
originLat
,
!
DOUBLEPRECISION
lonParY
,
!
DOUBLEPRECISION
lat1
,
!
DOUBLEPRECISION
lat2
,
!
DOUBLEPRECISION
xinc
,
!
DOUBLEPRECISION
yinc
)
EXTERNAL
gridInqLambert
!
gridDefArea
!
(
INTEGER
gridID
,
!
DOUBLEPRECISION
area
)
...
...
src/cdiFortran.c
View file @
c7a4046a
...
...
@@ -25,7 +25,10 @@
/* Compress types */
/* Data types */
/* external data types */
/* internal data types */
/* GRID types */
...
...
@@ -123,7 +126,6 @@ FCALLSCSUB2 (vlistDefInstitut, VLISTDEFINSTITUT, vlistdefinstitut, INT, INT)
FCALLSCFUN1
(
INT
,
vlistInqInstitut
,
VLISTINQINSTITUT
,
vlistinqinstitut
,
INT
)
FCALLSCSUB2
(
vlistDefModel
,
VLISTDEFMODEL
,
vlistdefmodel
,
INT
,
INT
)
FCALLSCFUN1
(
INT
,
vlistInqModel
,
VLISTINQMODEL
,
vlistinqmodel
,
INT
)
FCALLSCSUB3
(
vlistDefAttribute
,
VLISTDEFATTRIBUTE
,
vlistdefattribute
,
INT
,
STRING
,
STRING
)
/* VLIST VAR routines */
...
...
@@ -173,6 +175,18 @@ FCALLSCFUN3 (INT, vlistFlagLevel, VLISTFLAGLEVEL, vlistflaglevel, INT, INT, INT)
FCALLSCFUN2
(
INT
,
vlistFindVar
,
VLISTFINDVAR
,
vlistfindvar
,
INT
,
INT
)
FCALLSCFUN3
(
INT
,
vlistFindLevel
,
VLISTFINDLEVEL
,
vlistfindlevel
,
INT
,
INT
,
INT
)
/* VLIST attributes */
FCALLSCFUN3
(
INT
,
vlistInqNatts
,
VLISTINQNATTS
,
vlistinqnatts
,
INT
,
INT
,
PINT
)
FCALLSCFUN6
(
INT
,
vlistInqAttr
,
VLISTINQATTR
,
vlistinqattr
,
INT
,
INT
,
INT
,
PSTRING
,
PINT
,
PINT
)
FCALLSCFUN3
(
INT
,
vlistDelAttr
,
VLISTDELATTR
,
vlistdelattr
,
INT
,
INT
,
STRING
)
FCALLSCFUN5
(
INT
,
vlistDefAttrInt
,
VLISTDEFATTRINT
,
vlistdefattrint
,
INT
,
INT
,
STRING
,
INT
,
PINT
)
FCALLSCFUN5
(
INT
,
vlistDefAttrFlt
,
VLISTDEFATTRFLT
,
vlistdefattrflt
,
INT
,
INT
,
STRING
,
INT
,
PDOUBLE
)
FCALLSCFUN5
(
INT
,
vlistDefAttrTxt
,
VLISTDEFATTRTXT
,
vlistdefattrtxt
,
INT
,
INT
,
STRING
,
INT
,
STRING
)
FCALLSCFUN5
(
INT
,
vlistInqAttrInt
,
VLISTINQATTRINT
,
vlistinqattrint
,
INT
,
INT
,
STRING
,
INT
,
PINT
)
FCALLSCFUN5
(
INT
,
vlistInqAttrFlt
,
VLISTINQATTRFLT
,
vlistinqattrflt
,
INT
,
INT
,
STRING
,
INT
,
PDOUBLE
)
FCALLSCFUN5
(
INT
,
vlistInqAttrTxt
,
VLISTINQATTRTXT
,
vlistinqattrtxt
,
INT
,
INT
,
STRING
,
INT
,
PSTRING
)
/* GRID routines */
FCALLSCSUB2
(
gridName
,
GRIDNAME
,
gridname
,
INT
,
PSTRING
)
...
...
@@ -236,6 +250,11 @@ FCALLSCFUN1 (INT, gridInqGMEni2, GRIDINQGMENI2, gridinqgmeni2, INT)
FCALLSCSUB2
(
gridDefGMEni2
,
GRIDDEFGMENI2
,
griddefgmeni2
,
INT
,
INT
)
FCALLSCFUN1
(
INT
,
gridInqGMEni3
,
GRIDINQGMENI3
,
gridinqgmeni3
,
INT
)
FCALLSCSUB2
(
gridDefGMEni3
,
GRIDDEFGMENI3
,
griddefgmeni3
,
INT
,
INT
)
/* Lambert grid */
FCALLSCSUB8
(
gridDefLambert
,
GRIDDEFLAMBERT
,
griddeflambert
,
INT
,
DOUBLE
,
DOUBLE
,
DOUBLE
,
DOUBLE
,
DOUBLE
,
DOUBLE
,
DOUBLE
)
FCALLSCSUB8
(
gridInqLambert
,
GRIDINQLAMBERT
,
gridinqlambert
,
INT
,
PDOUBLE
,
PDOUBLE
,
PDOUBLE
,
PDOUBLE
,
PDOUBLE
,
PDOUBLE
,
PDOUBLE
)
FCALLSCSUB2
(
gridDefArea
,
GRIDDEFAREA
,
griddefarea
,
INT
,
PDOUBLE
)
FCALLSCSUB2
(
gridInqArea
,
GRIDINQAREA
,
gridinqarea
,
INT
,
PDOUBLE
)
FCALLSCFUN1
(
INT
,
gridHasArea
,
GRIDHASAREA
,
gridhasarea
,
INT
)
...
...
src/grid.c
View file @
c7a4046a
...
...
@@ -2995,7 +2995,7 @@ void gridPrint(int gridID, int opt)
{
double
xfirst
=
0
.
0
,
xinc
=
0
.
0
;
if
(
type
==
GRID_LONLAT
||
type
==
GRID_GAUSSIAN
)
if
(
type
==
GRID_LONLAT
||
type
==
GRID_GAUSSIAN
||
type
==
GRID_GENERIC
)
{
xfirst
=
gridInqXval
(
gridID
,
0
);
xinc
=
gridInqXinc
(
gridID
);
...
...
@@ -3041,7 +3041,7 @@ void gridPrint(int gridID, int opt)
{
double
yfirst
=
0
.
0
,
yinc
=
0
.
0
;
if
(
type
==
GRID_LONLAT
)
if
(
type
==
GRID_LONLAT
||
type
==
GRID_GENERIC
)
{
yfirst
=
gridInqYval
(
gridID
,
0
);
yinc
=
gridInqYinc
(
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