diff --git a/src/cdi.inc b/src/cdi.inc index 3a9b16101067b781a5c9dba7cbeb4eed157dae0a..02373deb4071d2fd2353b483f610a0d452f10293 100644 --- a/src/cdi.inc +++ b/src/cdi.inc @@ -4,7 +4,7 @@ ! ! Author: ! ------- -! Uwe Schulzweida, MPI-MET, Hamburg, May 2019 +! Uwe Schulzweida, MPI-MET, Hamburg, June 2019 ! INTEGER CDI_MAX_NAME @@ -339,14 +339,14 @@ PARAMETER (TSTEP_COV = 9) INTEGER TSTEP_RATIO PARAMETER (TSTEP_RATIO = 10) + INTEGER TSTEP_SUM + PARAMETER (TSTEP_SUM = 11) INTEGER TSTEP_RANGE - PARAMETER (TSTEP_RANGE = 11) + PARAMETER (TSTEP_RANGE = 12) INTEGER TSTEP_INSTANT2 - PARAMETER (TSTEP_INSTANT2 = 12) + PARAMETER (TSTEP_INSTANT2 = 13) INTEGER TSTEP_INSTANT3 - PARAMETER (TSTEP_INSTANT3 = 13) - INTEGER TSTEP_SUM - PARAMETER (TSTEP_SUM = 14) + PARAMETER (TSTEP_INSTANT3 = 14) INTEGER TAXIS_ABSOLUTE PARAMETER (TAXIS_ABSOLUTE = 1) INTEGER TAXIS_RELATIVE @@ -539,6 +539,11 @@ ! (INTEGER streamID) EXTERNAL streamSync +! streamDefNumWorker +! (INTEGER streamID, +! INTEGER numWorker) + EXTERNAL streamDefNumWorker + ! streamDefVlist ! (INTEGER streamID, ! INTEGER vlistID) @@ -1546,6 +1551,8 @@ PARAMETER (CDI_KEY_SECTION2PADDING = 820) INTEGER CDI_KEY_UVRELATIVETOGRID PARAMETER (CDI_KEY_UVRELATIVETOGRID = 821) + INTEGER CDI_KEY_CONSTITUENTTYPE + PARAMETER (CDI_KEY_CONSTITUENTTYPE = 822) INTEGER cdiDefKeyInt ! (INTEGER cdiID, ! INTEGER varID, diff --git a/src/cdiFortran.c b/src/cdiFortran.c index c036ed3520a9837815cf8200a93e916b1955dc6f..14d48e85fffdca405f563670c73ac3176cbac365 100644 --- a/src/cdiFortran.c +++ b/src/cdiFortran.c @@ -143,6 +143,7 @@ FCALLSCFUN2 (INT, streamOpenWrite, STREAMOPENWRITE, streamopenwrite, STRING, INT FCALLSCFUN1 (INT, streamOpenAppend, STREAMOPENAPPEND, streamopenappend, STRING) FCALLSCSUB1 (streamClose, STREAMCLOSE, streamclose, INT) FCALLSCSUB1 (streamSync, STREAMSYNC, streamsync, INT) +FCALLSCSUB2 (streamDefNumWorker, STREAMDEFNUMWORKER, streamdefnumworker, INT, INT) FCALLSCSUB2 (streamDefVlist, STREAMDEFVLIST, streamdefvlist, INT, INT) FCALLSCFUN1 (INT, streamInqVlist, STREAMINQVLIST, streaminqvlist, INT) FCALLSCFUN1 (INT, streamInqFiletype, STREAMINQFILETYPE, streaminqfiletype, INT)