Skip to content
GitLab
Commit 0deeb0b7 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Fortran interface update.

parent 914673c1
Hide whitespace changes
Inline Side-by-side
src/cdi.inc
View file @ 0deeb0b7
......@@ -225,14 +225,8 @@
PARAMETER (GRID_CURVILINEAR = 10)
INTEGER GRID_LCC
PARAMETER (GRID_LCC = 11)
INTEGER GRID_LCC2
PARAMETER (GRID_LCC2 = 12)
INTEGER GRID_LAEA
PARAMETER (GRID_LAEA = 13)
INTEGER GRID_SINUSOIDAL
PARAMETER (GRID_SINUSOIDAL = 14)
INTEGER GRID_PROJECTION
PARAMETER (GRID_PROJECTION = 15)
PARAMETER (GRID_PROJECTION = 12)
INTEGER CDI_PROJ_RLL
PARAMETER (CDI_PROJ_RLL = 21)
INTEGER CDI_PROJ_LCC
......@@ -1689,51 +1683,6 @@
! (INTEGER gridID)
EXTERNAL gridIsCircular
INTEGER gridIsRotated
! (INTEGER gridID)
EXTERNAL gridIsRotated
! gridInqProjParamRLL
! (INTEGER gridID,
! DOUBLEPRECISION xpole,
! DOUBLEPRECISION ypole,
! DOUBLEPRECISION angle)
EXTERNAL gridInqProjParamRLL
! gridDefProjParamRLL
! (INTEGER gridID,
! DOUBLEPRECISION xpole,
! DOUBLEPRECISION ypole,
! DOUBLEPRECISION angle)
EXTERNAL gridDefProjParamRLL
! gridDefXpole
! (INTEGER gridID,
! DOUBLEPRECISION xpole)
EXTERNAL gridDefXpole
DOUBLEPRECISION gridInqXpole
! (INTEGER gridID)
EXTERNAL gridInqXpole
! gridDefYpole
! (INTEGER gridID,
! DOUBLEPRECISION ypole)
EXTERNAL gridDefYpole
DOUBLEPRECISION gridInqYpole
! (INTEGER gridID)
EXTERNAL gridInqYpole
! gridDefAngle
! (INTEGER gridID,
! DOUBLEPRECISION angle)
EXTERNAL gridDefAngle
DOUBLEPRECISION gridInqAngle
! (INTEGER gridID)
EXTERNAL gridInqAngle
INTEGER gridInqTrunc
! (INTEGER gridID)
EXTERNAL gridInqTrunc
......@@ -1743,45 +1692,6 @@
! INTEGER trunc)
EXTERNAL gridDefTrunc
!
! Hexagonal GME grid
!
! gridDefGMEnd
! (INTEGER gridID,
! INTEGER nd)
EXTERNAL gridDefGMEnd
INTEGER gridInqGMEnd
! (INTEGER gridID)
EXTERNAL gridInqGMEnd
! gridDefGMEni
! (INTEGER gridID,
! INTEGER ni)
EXTERNAL gridDefGMEni
INTEGER gridInqGMEni
! (INTEGER gridID)
EXTERNAL gridInqGMEni
! gridDefGMEni2
! (INTEGER gridID,
! INTEGER ni2)
EXTERNAL gridDefGMEni2
INTEGER gridInqGMEni2
! (INTEGER gridID)
EXTERNAL gridInqGMEni2
! gridDefGMEni3
! (INTEGER gridID,
! INTEGER ni3)
EXTERNAL gridDefGMEni3
INTEGER gridInqGMEni3
! (INTEGER gridID)
EXTERNAL gridInqGMEni3
!
! Reference of an unstructured grid
!
......@@ -1823,10 +1733,46 @@
! INTEGER*1(16) uuid)
EXTERNAL gridInqUUID
!
! Rotated Lon/Lat grid
!
! gridDefParamRLL
! (INTEGER gridID,
! DOUBLEPRECISION xpole,
! DOUBLEPRECISION ypole,
! DOUBLEPRECISION angle)
EXTERNAL gridDefParamRLL
! gridInqParamRLL
! (INTEGER gridID,
! DOUBLEPRECISION xpole,
! DOUBLEPRECISION ypole,
! DOUBLEPRECISION angle)
EXTERNAL gridInqParamRLL
!
! Hexagonal GME grid
!
! gridDefParamGME
! (INTEGER gridID,
! INTEGER nd,
! INTEGER ni,
! INTEGER ni2,
! INTEGER ni3)
EXTERNAL gridDefParamGME
! gridInqParamGME
! (INTEGER gridID,
! INTEGER nd,
! INTEGER ni,
! INTEGER ni2,
! INTEGER ni3)
EXTERNAL gridInqParamGME
!
! Lambert Conformal Conic grid (GRIB version)
!
! gridDefLCC
! gridDefParamLCC
! (INTEGER gridID,
! DOUBLEPRECISION originLon,
! DOUBLEPRECISION originLat,
......@@ -1837,9 +1783,9 @@
! DOUBLEPRECISION yinc,
! INTEGER projflag,
! INTEGER scanflag)
EXTERNAL gridDefLCC
EXTERNAL gridDefParamLCC
! gridInqLCC
! gridInqParamLCC
! (INTEGER gridID,
! DOUBLEPRECISION originLon,
! DOUBLEPRECISION originLat,
......@@ -1850,45 +1796,7 @@
! DOUBLEPRECISION yinc,
! INTEGER projflag,
! INTEGER scanflag)
EXTERNAL gridInqLCC
!
! Lambert Conformal Conic 2 grid (PROJ version)
!
! gridDefLcc2
! (INTEGER gridID,
! DOUBLEPRECISION earth_radius,
! DOUBLEPRECISION lon_0,
! DOUBLEPRECISION lat_0,
! DOUBLEPRECISION lat_1,
! DOUBLEPRECISION lat_2)
EXTERNAL gridDefLcc2
! gridInqLcc2
! (INTEGER gridID,
! DOUBLEPRECISION earth_radius,
! DOUBLEPRECISION lon_0,
! DOUBLEPRECISION lat_0,
! DOUBLEPRECISION lat_1,
! DOUBLEPRECISION lat_2)
EXTERNAL gridInqLcc2
!
! Lambert Azimuthal Equal Area grid
!
! gridDefLaea
! (INTEGER gridID,
! DOUBLEPRECISION earth_radius,
! DOUBLEPRECISION lon_0,
! DOUBLEPRECISION lat_0)
EXTERNAL gridDefLaea
! gridInqLaea
! (INTEGER gridID,
! DOUBLEPRECISION earth_radius,
! DOUBLEPRECISION lon_0,
! DOUBLEPRECISION lat_0)
EXTERNAL gridInqLaea
EXTERNAL gridInqParamLCC
! gridDefArea
! (INTEGER gridID,
......
src/cdiFortran.c
View file @ 0deeb0b7
......@@ -354,29 +354,9 @@ FCALLSCFUN2 (DOUBLE, gridInqYval, GRIDINQYVAL, gridinqyval, INT, INT)
FCALLSCFUN1 (DOUBLE, gridInqXinc, GRIDINQXINC, gridinqxinc, INT)
FCALLSCFUN1 (DOUBLE, gridInqYinc, GRIDINQYINC, gridinqyinc, INT)
FCALLSCFUN1 (INT, gridIsCircular, GRIDISCIRCULAR, gridiscircular, INT)
FCALLSCFUN1 (INT, gridIsRotated, GRIDISROTATED, gridisrotated, INT)
FCALLSCSUB4 (gridInqParamRLL, GRIDINQPROJPARAMRLL, gridinqprojparamrll, INT, PDOUBLE, PDOUBLE, PDOUBLE)
FCALLSCSUB4 (gridDefParamRLL, GRIDDEFPROJPARAMRLL, griddefprojparamrll, INT, DOUBLE, DOUBLE, DOUBLE)
FCALLSCSUB2 (gridDefXpole, GRIDDEFXPOLE, griddefxpole, INT, DOUBLE)
FCALLSCFUN1 (DOUBLE, gridInqXpole, GRIDINQXPOLE, gridinqxpole, INT)
FCALLSCSUB2 (gridDefYpole, GRIDDEFYPOLE, griddefypole, INT, DOUBLE)
FCALLSCFUN1 (DOUBLE, gridInqYpole, GRIDINQYPOLE, gridinqypole, INT)
FCALLSCSUB2 (gridDefAngle, GRIDDEFANGLE, griddefangle, INT, DOUBLE)
FCALLSCFUN1 (DOUBLE, gridInqAngle, GRIDINQANGLE, gridinqangle, INT)
FCALLSCFUN1 (INT, gridInqTrunc, GRIDINQTRUNC, gridinqtrunc, INT)
FCALLSCSUB2 (gridDefTrunc, GRIDDEFTRUNC, griddeftrunc, INT, INT)
/* Hexagonal GME grid */
FCALLSCSUB2 (gridDefGMEnd, GRIDDEFGMEND, griddefgmend, INT, INT)
FCALLSCFUN1 (INT, gridInqGMEnd, GRIDINQGMEND, gridinqgmend, INT)
FCALLSCSUB2 (gridDefGMEni, GRIDDEFGMENI, griddefgmeni, INT, INT)
FCALLSCFUN1 (INT, gridInqGMEni, GRIDINQGMENI, gridinqgmeni, INT)
FCALLSCSUB2 (gridDefGMEni2, GRIDDEFGMENI2, griddefgmeni2, INT, INT)
FCALLSCFUN1 (INT, gridInqGMEni2, GRIDINQGMENI2, gridinqgmeni2, INT)
FCALLSCSUB2 (gridDefGMEni3, GRIDDEFGMENI3, griddefgmeni3, INT, INT)
FCALLSCFUN1 (INT, gridInqGMEni3, GRIDINQGMENI3, gridinqgmeni3, INT)
/* Reference of an unstructured grid */
FCALLSCSUB2 (gridDefNumber, GRIDDEFNUMBER, griddefnumber, INT, INT)
......@@ -388,20 +368,20 @@ FCALLSCFUN2 (INT, gridInqReference, GRIDINQREFERENCE, gridinqreference, INT, PST
FCALLSCSUB2 (gridDefUUID, GRIDDEFUUID, griddefuuid, INT, PVOID)
FCALLSCSUB2 (gridInqUUID, GRIDINQUUID, gridinquuid, INT, PVOID)
/* Lambert Conformal Conic grid (GRIB version) */
/* Rotated Lon/Lat grid */
FCALLSCSUB10 (gridDefParamLCC, GRIDDEFLCC, griddeflcc, INT, DOUBLE, DOUBLE, DOUBLE, DOUBLE, DOUBLE, DOUBLE, DOUBLE, INT, INT)
FCALLSCSUB10 (gridInqParamLCC, GRIDINQLCC, gridinqlcc, INT, PDOUBLE, PDOUBLE, PDOUBLE, PDOUBLE, PDOUBLE, PDOUBLE, PDOUBLE, PINT, PINT)
FCALLSCSUB4 (gridDefParamRLL, GRIDDEFPARAMRLL, griddefparamrll, INT, DOUBLE, DOUBLE, DOUBLE)
FCALLSCSUB4 (gridInqParamRLL, GRIDINQPARAMRLL, gridinqparamrll, INT, PDOUBLE, PDOUBLE, PDOUBLE)
/* Lambert Conformal Conic 2 grid (PROJ version) */
/* Hexagonal GME grid */
FCALLSCSUB6 (gridDefLcc2, GRIDDEFLCC2, griddeflcc2, INT, DOUBLE, DOUBLE, DOUBLE, DOUBLE, DOUBLE)
FCALLSCSUB6 (gridInqLcc2, GRIDINQLCC2, gridinqlcc2, INT, PDOUBLE, PDOUBLE, PDOUBLE, PDOUBLE, PDOUBLE)
FCALLSCSUB5 (gridDefParamGME, GRIDDEFPARAMGME, griddefparamgme, INT, INT, INT, INT, INT)
FCALLSCSUB5 (gridInqParamGME, GRIDINQPARAMGME, gridinqparamgme, INT, PINT, PINT, PINT, PINT)
/* Lambert Azimuthal Equal Area grid */
/* Lambert Conformal Conic grid (GRIB version) */
FCALLSCSUB4 (gridDefLaea, GRIDDEFLAEA, griddeflaea, INT, DOUBLE, DOUBLE, DOUBLE)
FCALLSCSUB4 (gridInqLaea, GRIDINQLAEA, gridinqlaea, INT, PDOUBLE, PDOUBLE, PDOUBLE)
FCALLSCSUB10 (gridDefParamLCC, GRIDDEFPARAMLCC, griddefparamlcc, INT, DOUBLE, DOUBLE, DOUBLE, DOUBLE, DOUBLE, DOUBLE, DOUBLE, INT, INT)
FCALLSCSUB10 (gridInqParamLCC, GRIDINQPARAMLCC, gridinqparamlcc, INT, PDOUBLE, PDOUBLE, PDOUBLE, PDOUBLE, PDOUBLE, PDOUBLE, PDOUBLE, PINT, PINT)
FCALLSCSUB2 (gridDefArea, GRIDDEFAREA, griddefarea, INT, DOUBLEV)
FCALLSCSUB2 (gridInqArea, GRIDINQAREA, gridinqarea, INT, DOUBLEV)
FCALLSCFUN1 (INT, gridHasArea, GRIDHASAREA, gridhasarea, INT)
......
Supports Markdown
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

Imprint | Privacy Policy