Skip to content

GitLab

Commit 93d10d01 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

added taxisInqFdate() and taxisInqFtime() - Get the forecast reference date

parent ca6d49e6
Hide whitespace changes
Inline Side-by-side
Showing with 196 additions and 12 deletions
doc/tex/c_quick_ref.tex
View file @ 93d10d01
......@@ -636,6 +636,24 @@ Create a Time axis.
Define the calendar.
\section*{\tt \htmlref{taxisDefFdate}{taxisDefFdate}}
\begin{verbatim}
void taxisDefFdate (int taxisID, int date);
\end{verbatim}
Define the forecast reference date.
\section*{\tt \htmlref{taxisDefFtime}{taxisDefFtime}}
\begin{verbatim}
void taxisDefFtime (int taxisID, int time);
\end{verbatim}
Define the forecast reference time.
\section*{\tt \htmlref{taxisDefRdate}{taxisDefRdate}}
\begin{verbatim}
......@@ -651,7 +669,7 @@ Define the reference date.
void taxisDefRtime (int taxisID, int time);
\end{verbatim}
Define the reference date.
Define the reference time.
\section*{\tt \htmlref{taxisDefVdate}{taxisDefVdate}}
......@@ -690,6 +708,24 @@ Destroy a Time axis.
Get the calendar.
\section*{\tt \htmlref{taxisInqFdate}{taxisInqFdate}}
\begin{verbatim}
int taxisInqFdate (int taxisID);
\end{verbatim}
Get the forecast reference date.
\section*{\tt \htmlref{taxisInqFtime}{taxisInqFtime}}
\begin{verbatim}
int taxisInqFtime (int taxisID);
\end{verbatim}
Get the forecast reference time.
\section*{\tt \htmlref{taxisInqRdate}{taxisInqRdate}}
\begin{verbatim}
......
doc/tex/f_quick_ref.tex
View file @ 93d10d01
......@@ -638,6 +638,24 @@ Create a Time axis.
Define the calendar.
\section*{\tt \htmlref{taxisDefFdate}{taxisDefFdate}}
\begin{verbatim}
SUBROUTINE taxisDefFdate (INTEGER taxisID, INTEGER date)
\end{verbatim}
Define the forecast reference date.
\section*{\tt \htmlref{taxisDefFtime}{taxisDefFtime}}
\begin{verbatim}
SUBROUTINE taxisDefFtime (INTEGER taxisID, INTEGER time)
\end{verbatim}
Define the forecast reference time.
\section*{\tt \htmlref{taxisDefRdate}{taxisDefRdate}}
\begin{verbatim}
......@@ -653,7 +671,7 @@ Define the reference date.
SUBROUTINE taxisDefRtime (INTEGER taxisID, INTEGER time)
\end{verbatim}
Define the reference date.
Define the reference time.
\section*{\tt \htmlref{taxisDefVdate}{taxisDefVdate}}
......@@ -692,6 +710,24 @@ Destroy a Time axis.
Get the calendar.
\section*{\tt \htmlref{taxisInqFdate}{taxisInqFdate}}
\begin{verbatim}
INTEGER FUNCTION taxisInqFdate (INTEGER taxisID)
\end{verbatim}
Get the forecast reference date.
\section*{\tt \htmlref{taxisInqFtime}{taxisInqFtime}}
\begin{verbatim}
INTEGER FUNCTION taxisInqFtime (INTEGER taxisID)
\end{verbatim}
Get the forecast reference time.
\section*{\tt \htmlref{taxisInqRdate}{taxisInqRdate}}
\begin{verbatim}
......
src/cdi.h
View file @ 93d10d01
......@@ -944,6 +944,12 @@ int taxisInqRdate(int taxisID);
/* taxisInqRtime: Get the reference time */
int taxisInqRtime(int taxisID);
/* taxisInqFdate: Get the forecast reference date */
int taxisInqFdate(int taxisID);
/* taxisInqFtime: Get the forecast reference time */
int taxisInqFtime(int taxisID);
/* taxisInqCalendar: Get the calendar */
int taxisInqCalendar(int taxisID);
......
src/cdi.inc
View file @ 93d10d01
! This file was automatically generated, don't edit!
!
! Fortran interface for CDI library version 1.6.3
! Fortran interface for CDI library version 1.6.4
!
! Author:
! -------
......@@ -325,6 +325,8 @@
PARAMETER (TAXIS_ABSOLUTE = 1)
INTEGER TAXIS_RELATIVE
PARAMETER (TAXIS_RELATIVE = 2)
INTEGER TAXIS_FORECAST
PARAMETER (TAXIS_FORECAST = 3)
!
! TUNIT types
!
......@@ -2021,6 +2023,16 @@
! INTEGER time)
EXTERNAL taxisDefRtime
! taxisDefFdate
! (INTEGER taxisID,
! INTEGER date)
EXTERNAL taxisDefFdate
! taxisDefFtime
! (INTEGER taxisID,
! INTEGER time)
EXTERNAL taxisDefFtime
INTEGER taxisHasBounds
! (INTEGER taxisID)
EXTERNAL taxisHasBounds
......@@ -2088,6 +2100,14 @@
! (INTEGER taxisID)
EXTERNAL taxisInqRtime
INTEGER taxisInqFdate
! (INTEGER taxisID)
EXTERNAL taxisInqFdate
INTEGER taxisInqFtime
! (INTEGER taxisID)
EXTERNAL taxisInqFtime
INTEGER taxisInqCalendar
! (INTEGER taxisID)
EXTERNAL taxisInqCalendar
......
src/cdiFortran.c
View file @ 93d10d01
......@@ -429,6 +429,8 @@ FCALLSCSUB2 (taxisDefVdate, TAXISDEFVDATE, taxisdefvdate, INT, INT)
FCALLSCSUB2 (taxisDefVtime, TAXISDEFVTIME, taxisdefvtime, INT, INT)
FCALLSCSUB2 (taxisDefRdate, TAXISDEFRDATE, taxisdefrdate, INT, INT)
FCALLSCSUB2 (taxisDefRtime, TAXISDEFRTIME, taxisdefrtime, INT, INT)
FCALLSCSUB2 (taxisDefFdate, TAXISDEFFDATE, taxisdeffdate, INT, INT)
FCALLSCSUB2 (taxisDefFtime, TAXISDEFFTIME, taxisdefftime, INT, INT)
FCALLSCFUN1 (INT, taxisHasBounds, TAXISHASBOUNDS, taxishasbounds, INT)
FCALLSCSUB1 (taxisDeleteBounds, TAXISDELETEBOUNDS, taxisdeletebounds, INT)
FCALLSCSUB3 (taxisDefVdateBounds, TAXISDEFVDATEBOUNDS, taxisdefvdatebounds, INT, INT, INT)
......@@ -443,6 +445,8 @@ FCALLSCFUN1 (INT, taxisInqVdate, TAXISINQVDATE, taxisinqvdate, INT)
FCALLSCFUN1 (INT, taxisInqVtime, TAXISINQVTIME, taxisinqvtime, INT)
FCALLSCFUN1 (INT, taxisInqRdate, TAXISINQRDATE, taxisinqrdate, INT)
FCALLSCFUN1 (INT, taxisInqRtime, TAXISINQRTIME, taxisinqrtime, INT)
FCALLSCFUN1 (INT, taxisInqFdate, TAXISINQFDATE, taxisinqfdate, INT)
FCALLSCFUN1 (INT, taxisInqFtime, TAXISINQFTIME, taxisinqftime, INT)
FCALLSCFUN1 (INT, taxisInqCalendar, TAXISINQCALENDAR, taxisinqcalendar, INT)
FCALLSCFUN1 (INT, taxisInqTunit, TAXISINQTUNIT, taxisinqtunit, INT)
FCALLSCFUN1 (INT, taxisInqNumavg, TAXISINQNUMAVG, taxisinqnumavg, INT)
......
src/make_fint.c
View file @ 93d10d01
......@@ -15,7 +15,7 @@
#endif
//#include "config.h"
#define VERSION "1.6.3"
#define VERSION "1.6.4"
typedef struct
{
size_t naline;
......
src/mo_cdi.f90
View file @ 93d10d01
......@@ -2796,6 +2796,20 @@ module mo_cdi
end function taxisInqRtime
end interface
interface
integer(c_int) function taxisInqFdate(taxisID) bind(c,name='taxisInqFdate')
import :: c_int
integer(c_int), value :: taxisID
end function taxisInqFdate
end interface
interface
integer(c_int) function taxisInqFtime(taxisID) bind(c,name='taxisInqFtime')
import :: c_int
integer(c_int), value :: taxisID
end function taxisInqFtime
end interface
interface
integer(c_int) function taxisInqCalendar(taxisID) bind(c,name='taxisInqCalendar')
import :: c_int
......@@ -3414,6 +3428,8 @@ module mo_cdi
public :: taxisInqVtime
public :: taxisInqRdate
public :: taxisInqRtime
public :: taxisInqFdate
public :: taxisInqFtime
public :: taxisInqCalendar
public :: taxisInqTunit
public :: taxisInqNumavg
......
src/taxis.c
View file @ 93d10d01
......@@ -633,7 +633,7 @@ void taxisCopyTimestep(int taxisID2, int taxisID1)
@Prototype int taxisInqVdate(int taxisID)
@Parameter
@Item taxisID Time axis ID, from a previous call to @fref{taxisCreate}
@Item taxisID Time axis ID, from a previous call to @fref{taxisCreate} or @fref{vlistInqTaxis}
@Description
The function @func{taxisInqVdate} returns the verification date of a Time axis.
......@@ -694,7 +694,7 @@ void taxisDefVdateBounds(int taxisID, int vdate_lb, int vdate_ub)
@Prototype int taxisInqVtime(int taxisID)
@Parameter
@Item taxisID Time axis ID, from a previous call to @fref{taxisCreate}
@Item taxisID Time axis ID, from a previous call to @fref{taxisCreate} or @fref{vlistInqTaxis}
@Description
The function @func{taxisInqVtime} returns the verification time of a Time axis.
......@@ -755,13 +755,13 @@ void taxisDefVtimeBounds(int taxisID, int vtime_lb, int vtime_ub)
@Prototype int taxisInqRdate(int taxisID)
@Parameter
@Item taxisID Time axis ID, from a previous call to @fref{taxisCreate}
@Item taxisID Time axis ID, from a previous call to @fref{taxisCreate} or @fref{vlistInqTaxis}
@Description
The function @func{taxisInqRdate} returns the reference date of a Time axis.
@Result
@func{taxisInqVdate} returns the reference date.
@func{taxisInqRdate} returns the reference date.
@EndFunction
*/
......@@ -788,13 +788,13 @@ int taxisInqRdate(int taxisID)
@Prototype int taxisInqRtime(int taxisID)
@Parameter
@Item taxisID Time axis ID, from a previous call to @fref{taxisCreate}
@Item taxisID Time axis ID, from a previous call to @fref{taxisCreate} or @fref{vlistInqTaxis}
@Description
The function @func{taxisInqRtime} returns the reference time of a Time axis.
@Result
@func{taxisInqVtime} returns the reference time.
@func{taxisInqRtime} returns the reference time.
@EndFunction
*/
......@@ -815,13 +815,79 @@ int taxisInqRtime(int taxisID)
return (taxisptr->rtime);
}
/*
@Function taxisInqFdate
@Title Get the forecast reference date
@Prototype int taxisInqFdate(int taxisID)
@Parameter
@Item taxisID Time axis ID, from a previous call to @fref{taxisCreate} or @fref{vlistInqTaxis}
@Description
The function @func{taxisInqFdate} returns the forecast reference date of a Time axis.
@Result
@func{taxisInqFdate} returns the forecast reference date.
@EndFunction
*/
int taxisInqFdate(int taxisID)
{
taxis_t *taxisptr;
taxisptr = ( taxis_t * ) reshGetVal ( taxisID, &taxisOps );
taxis_check_ptr(__func__, taxisptr);
if ( taxisptr->fdate == -1 )
{
taxisptr->fdate = taxisptr->vdate;
taxisptr->ftime = taxisptr->vtime;
}
return (taxisptr->fdate);
}
/*
@Function taxisInqFtime
@Title Get the forecast reference time
@Prototype int taxisInqFtime(int taxisID)
@Parameter
@Item taxisID Time axis ID, from a previous call to @fref{taxisCreate} or @fref{vlistInqTaxis}
@Description
The function @func{taxisInqFtime} returns the forecast reference time of a Time axis.
@Result
@func{taxisInqFtime} returns the forecast reference time.
@EndFunction
*/
int taxisInqFtime(int taxisID)
{
taxis_t *taxisptr;
taxisptr = ( taxis_t * ) reshGetVal ( taxisID, &taxisOps );
taxis_check_ptr(__func__, taxisptr);
if ( taxisptr->fdate == -1 )
{
taxisptr->fdate = taxisptr->vdate;
taxisptr->ftime = taxisptr->vtime;
}
return (taxisptr->ftime);
}
/*
@Function taxisInqCalendar
@Title Get the calendar
@Prototype int taxisInqCalendar(int taxisID)
@Parameter
@Item taxisID Time axis ID, from a previous call to @fref{taxisCreate}
@Item taxisID Time axis ID, from a previous call to @fref{taxisCreate} or @fref{vlistInqTaxis}
@Description
The function @func{taxisInqCalendar} returns the calendar of a Time axis.
......@@ -829,7 +895,7 @@ The function @func{taxisInqCalendar} returns the calendar of a Time axis.
@Result
@func{taxisInqCalendar} returns the type of the calendar,
one of the set of predefined CDI calendar types.
The valid CDI calendar types are @func{CALENDAR_STANDARD}, @func{CALENDAR_PROLEPTIC},
The valid CDI calendar types are @func{CALENDAR_STANDARD}, @func{CALENDAR_PROLEPTIC},
@func{CALENDAR_360DAYS}, @func{CALENDAR_365DAYS} and @func{CALENDAR_366DAYS}.
@EndFunction
......
Markdown is supported
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