From 835f0f1d0f7a677f5f90abc9f3c2c0aa7763ddc1 Mon Sep 17 00:00:00 2001
From: Uwe Schulzweida <uwe.schulzweida@mpimet.mpg.de>
Date: Mon, 6 Feb 2017 09:46:04 +0100
Subject: [PATCH] Fortran interface update.
---
src/cdi.inc | 15 +++++++++++----
src/cdiFortran.c | 1 +
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/cdi.inc b/src/cdi.inc
index 5c469f15e..b1ebbc3a9 100644
--- a/src/cdi.inc
+++ b/src/cdi.inc
@@ -4,7 +4,7 @@
!
! Author:
! -------
-! Uwe Schulzweida, MPI-MET, Hamburg, January 2017
+! Uwe Schulzweida, MPI-MET, Hamburg, February 2017
!
INTEGER CDI_MAX_NAME
@@ -1407,6 +1407,13 @@
! CHARACTER*(*) name)
EXTERNAL cdiDelAtt
+ INTEGER cdiCopyAtts
+! (INTEGER cdiID1,
+! INTEGER varID1,
+! INTEGER cdiID2,
+! INTEGER varID2)
+ EXTERNAL cdiCopyAtts
+
INTEGER cdiDefAttInt
! (INTEGER cdiID,
! INTEGER varID,
@@ -1600,10 +1607,10 @@
PARAMETER (CDI_KEY_YUNITS = 914)
INTEGER CDI_KEY_VDIMNAME
PARAMETER (CDI_KEY_VDIMNAME = 920)
- INTEGER CDI_KEY_MAPNAME
- PARAMETER (CDI_KEY_MAPNAME = 921)
INTEGER CDI_KEY_MAPPING
- PARAMETER (CDI_KEY_MAPPING = 922)
+ PARAMETER (CDI_KEY_MAPPING = 921)
+ INTEGER CDI_KEY_MAPNAME
+ PARAMETER (CDI_KEY_MAPNAME = 922)
!
! CDI zaxis string key values
!
diff --git a/src/cdiFortran.c b/src/cdiFortran.c
index 840dbd4bd..0746e06fa 100644
--- a/src/cdiFortran.c
+++ b/src/cdiFortran.c
@@ -292,6 +292,7 @@ FCALLSCFUN2 (STRING, vlistInqVarUnitsPtr, VLISTINQVARUNITSPTR, vlistinqvarunitsp
FCALLSCFUN3 (INT, cdiInqNatts, CDIINQNATTS, cdiinqnatts, INT, INT, PINT)
FCALLSCFUN6 (INT, cdiInqAtt, CDIINQATT, cdiinqatt, INT, INT, INT, PSTRING, PINT, PINT)
FCALLSCFUN3 (INT, cdiDelAtt, CDIDELATT, cdidelatt, INT, INT, STRING)
+FCALLSCFUN4 (INT, cdiCopyAtts, CDICOPYATTS, cdicopyatts, INT, INT, INT, INT)
FCALLSCFUN6 (INT, cdiDefAttInt, CDIDEFATTINT, cdidefattint, INT, INT, STRING, INT, INT, INTV)
FCALLSCFUN6 (INT, cdiDefAttFlt, CDIDEFATTFLT, cdidefattflt, INT, INT, STRING, INT, INT, DOUBLEV)
FCALLSCFUN5 (INT, cdiDefAttTxt, CDIDEFATTTXT, cdidefatttxt, INT, INT, STRING, INT, PPSTRING)
--
GitLab