diff --git a/src/cdi.inc b/src/cdi.inc index 5c469f15ee2a9296163c5c46cc6afff6f8a69808..b1ebbc3a9beb28ac4738ac138f5fd41b1e2895e3 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 840dbd4bd8d245824d85c2e24f41121c80d8f746..0746e06fa7b04da55ef014366134262db08ea18c 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)