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

added taxisDefFdate() and taxisDefFtime() - Define the forecast reference date

parent b25f8326
Hide whitespace changes
Inline Side-by-side
src/cdi.h
View file @ ca6d49e6
......@@ -191,6 +191,7 @@ extern "C" {
#define TAXIS_ABSOLUTE 1
#define TAXIS_RELATIVE 2
#define TAXIS_FORECAST 3
/* TUNIT types */
......@@ -901,9 +902,15 @@ void taxisDefVtime(int taxisID, int time);
/* taxisDefRdate: Define the reference date */
void taxisDefRdate(int taxisID, int date);
/* taxisDefRtime: Define the reference date */
/* taxisDefRtime: Define the reference time */
void taxisDefRtime(int taxisID, int time);
/* taxisDefFdate: Define the forecast reference date */
void taxisDefFdate(int taxisID, int date);
/* taxisDefFtime: Define the forecast reference time */
void taxisDefFtime(int taxisID, int time);
int taxisHasBounds(int taxisID);
void taxisDeleteBounds(int taxisID);
......
src/mo_cdi.f90
View file @ ca6d49e6
......@@ -146,6 +146,7 @@ module mo_cdi
integer :: TSTEP_INSTANT3 = 13
integer :: TAXIS_ABSOLUTE = 1
integer :: TAXIS_RELATIVE = 2
integer :: TAXIS_FORECAST = 3
integer :: TUNIT_SECOND = 1
integer :: TUNIT_MINUTE = 2
integer :: TUNIT_HOUR = 3
......@@ -2670,6 +2671,22 @@ module mo_cdi
end subroutine taxisDefRtime
end interface
interface
subroutine taxisDefFdate(taxisID,date) bind(c,name='taxisDefFdate')
import :: c_int
integer(c_int), value :: taxisID
integer(c_int), value :: date
end subroutine taxisDefFdate
end interface
interface
subroutine taxisDefFtime(taxisID,time) bind(c,name='taxisDefFtime')
import :: c_int
integer(c_int), value :: taxisID
integer(c_int), value :: time
end subroutine taxisDefFtime
end interface
interface
integer(c_int) function taxisHasBounds(taxisID) bind(c,name='taxisHasBounds')
import :: c_int
......@@ -3381,6 +3398,8 @@ module mo_cdi
public :: taxisDefVtime
public :: taxisDefRdate
public :: taxisDefRtime
public :: taxisDefFdate
public :: taxisDefFtime
public :: taxisHasBounds
public :: taxisDeleteBounds
public :: taxisDefVdateBounds
......@@ -3574,6 +3593,7 @@ module mo_cdi
public :: TSTEP_INSTANT3
public :: TAXIS_ABSOLUTE
public :: TAXIS_RELATIVE
public :: TAXIS_FORECAST
public :: TUNIT_SECOND
public :: TUNIT_MINUTE
public :: TUNIT_HOUR
......
src/taxis.c
View file @ ca6d49e6
......@@ -99,7 +99,7 @@ void taxis_defaults(void)
#endif
static
void taxisDefaultValue ( taxis_t *taxisptr )
void taxisDefaultValue(taxis_t* taxisptr)
{
taxisptr->self = CDI_UNDEFID;
taxisptr->used = FALSE;
......@@ -108,6 +108,8 @@ void taxisDefaultValue ( taxis_t *taxisptr )
taxisptr->vtime = 0;
taxisptr->rdate = CDI_UNDEFID;
taxisptr->rtime = 0;
taxisptr->fdate = CDI_UNDEFID;
taxisptr->ftime = 0;
taxisptr->calendar = cdiDefaultCalendar;
taxisptr->unit = DefaultTimeUnit;
taxisptr->numavg = 0;
......@@ -366,7 +368,7 @@ void taxisDefVtime(int taxisID, int vtime)
@Item rdate Reference date (YYYYMMDD)
@Description
The function @func{taxisDefVdate} defines the reference date of a Time axis.
The function @func{taxisDefRdate} defines the reference date of a Time axis.
@EndFunction
*/
......@@ -397,7 +399,7 @@ void taxisDefRdate(int taxisID, int rdate)
@Item rtime Reference time (hhmmss)
@Description
The function @func{taxisDefVdate} defines the reference time of a Time axis.
The function @func{taxisDefRtime} defines the reference time of a Time axis.
@EndFunction
*/
......@@ -418,6 +420,68 @@ void taxisDefRtime(int taxisID, int rtime)
taxisptr->rtime = rtime;
}
/*
@Function taxisDefFdate
@Title Define the forecast reference date
@Prototype void taxisDefFdate(int taxisID, int fdate)
@Parameter
@Item taxisID Time axis ID, from a previous call to @fref{taxisCreate}
@Item fdate Forecast reference date (YYYYMMDD)
@Description
The function @func{taxisDefFdate} defines the forecast reference date of a Time axis.
@EndFunction
*/
void taxisDefFdate(int taxisID, int fdate)
{
taxis_t *taxisptr;
if ( reshGetStatus ( taxisID, &taxisOps ) == CLOSED )
{
Warning("%s", "Operation not executed.");
return;
}
taxisptr = ( taxis_t * ) reshGetVal ( taxisID, &taxisOps );
taxis_check_ptr(__func__, taxisptr);
taxisptr->fdate = fdate;
}
/*
@Function taxisDefFtime
@Title Define the forecast reference time
@Prototype void taxisDefFtime(int taxisID, int ftime)
@Parameter
@Item taxisID Time axis ID, from a previous call to @fref{taxisCreate}
@Item ftime Forecast reference time (hhmmss)
@Description
The function @func{taxisDefFtime} defines the forecast reference time of a Time axis.
@EndFunction
*/
void taxisDefFtime(int taxisID, int ftime)
{
taxis_t *taxisptr;
if ( reshGetStatus ( taxisID, &taxisOps ) == CLOSED )
{
Warning("%s", "Operation not executed.");
return;
}
taxisptr = ( taxis_t * ) reshGetVal ( taxisID, &taxisOps );
taxis_check_ptr(__func__, taxisptr);
taxisptr->ftime = ftime;
}
/*
@Function taxisDefCalendar
@Title Define the calendar
......@@ -426,7 +490,7 @@ void taxisDefRtime(int taxisID, int rtime)
@Parameter
@Item taxisID Time axis ID, from a previous call to @fref{taxisCreate}
@Item calendar 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}.
@Description
......@@ -620,7 +684,7 @@ void taxisDefVdateBounds(int taxisID, int vdate_lb, int vdate_ub)
taxisptr->vdate_lb = vdate_lb;
taxisptr->vdate_ub = vdate_ub;
taxisptr->has_bounds = TRUE;
}
......@@ -1210,6 +1274,8 @@ void ptaxisCopy(taxis_t *dest, taxis_t *source)
dest->vtime = source->vtime;
dest->rdate = source->rdate;
dest->rtime = source->rtime;
dest->fdate = source->fdate;
dest->ftime = source->ftime;
dest->calendar = source->calendar;
dest->unit = source->unit;
dest->numavg = source->numavg;
......@@ -1244,6 +1310,8 @@ void taxisPrintKernel ( taxis_t * taxisptr, FILE * fp )
fprintf ( fp, "vtime = %d\n", taxisptr->vtime );
fprintf ( fp, "rdate = %d\n", taxisptr->rdate );
fprintf ( fp, "rtime = %d\n", taxisptr->rtime );
fprintf ( fp, "fdate = %d\n", taxisptr->fdate );
fprintf ( fp, "ftime = %d\n", taxisptr->ftime );
fprintf ( fp, "calendar = %d\n", taxisptr->calendar );
fprintf ( fp, "unit = %d\n", taxisptr->unit );
fprintf ( fp, "numavg = %d\n", taxisptr->numavg );
......@@ -1285,6 +1353,8 @@ int taxisCompareP ( void * taxisptr1, void * taxisptr2 )
t1->vtime == t2->vtime &&
t1->rdate == t2->rdate &&
t1->rtime == t2->rtime &&
t1->fdate == t2->fdate &&
t1->ftime == t2->ftime &&
t1->calendar == t2->calendar &&
t1->unit == t2->unit &&
t1->numavg == t2->numavg &&
......@@ -1303,7 +1373,7 @@ taxisTxCode ( void )
return TAXIS;
}
enum { taxisNint = 18 };
enum { taxisNint = 20 };
static int
taxisGetPackSize(void *p, void *context)
......@@ -1327,6 +1397,7 @@ taxisUnpack(char * unpackBuffer, int unpackBufferSize, int * unpackBufferPos,
taxis_t * taxisP;
int intBuffer[taxisNint];
uint32_t d;
int idx = 0;
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
intBuffer, taxisNint, DATATYPE_INT, context);
......@@ -1341,34 +1412,39 @@ taxisUnpack(char * unpackBuffer, int unpackBufferSize, int * unpackBufferPos,
if ( ! taxisP ) Error("No memory");
xassert(!checkForSameID
|| namespaceAdaptKey(intBuffer[0], nspTarget) == taxisP->self);
taxisP->used = intBuffer[1];
taxisP->type = intBuffer[2];
taxisP->vdate = intBuffer[3];
taxisP->vtime = intBuffer[4];
taxisP->rdate = intBuffer[5];
taxisP->rtime = intBuffer[6];
taxisP->calendar = intBuffer[7];
taxisP->unit = intBuffer[8];
taxisP->numavg = intBuffer[9];
taxisP->has_bounds = intBuffer[10];
taxisP->vdate_lb = intBuffer[11];
taxisP->vtime_lb = intBuffer[12];
taxisP->vdate_ub = intBuffer[13];
taxisP->vtime_ub = intBuffer[14];
if (intBuffer[15])
|| namespaceAdaptKey(intBuffer[idx++], nspTarget) == taxisP->self);
taxisP->used = intBuffer[idx++];
taxisP->type = intBuffer[idx++];
taxisP->vdate = intBuffer[idx++];
taxisP->vtime = intBuffer[idx++];
taxisP->rdate = intBuffer[idx++];
taxisP->rtime = intBuffer[idx++];
taxisP->fdate = intBuffer[idx++];
taxisP->ftime = intBuffer[idx++];
taxisP->calendar = intBuffer[idx++];
taxisP->unit = intBuffer[idx++];
taxisP->numavg = intBuffer[idx++];
taxisP->climatology = intBuffer[idx++];
taxisP->has_bounds = intBuffer[idx++];
taxisP->vdate_lb = intBuffer[idx++];
taxisP->vtime_lb = intBuffer[idx++];
taxisP->vdate_ub = intBuffer[idx++];
taxisP->vtime_ub = intBuffer[idx++];
if (intBuffer[idx])
{
size_t len = intBuffer[15];
size_t len = intBuffer[idx];
char *name = xmalloc(len + 1);
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
name, len, DATATYPE_TXT, context);
name[len] = '\0';
taxisP->name = name;
}
if (intBuffer[16])
idx++;
if (intBuffer[idx])
{
size_t len = intBuffer[16];
size_t len = intBuffer[idx];
char *longname = xmalloc(len + 1);
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
longname, len, DATATYPE_TXT, context);
......@@ -1376,8 +1452,6 @@ taxisUnpack(char * unpackBuffer, int unpackBufferSize, int * unpackBufferPos,
taxisP->longname = longname;
}
taxisP->climatology = intBuffer[17];
return taxisP->self;
}
......@@ -1389,25 +1463,28 @@ taxisPack(void * voidP, void * packBuffer, int packBufferSize, int * packBufferP
taxis_t *taxisP = (taxis_t *)voidP;
int intBuffer[taxisNint];
uint32_t d;
intBuffer[0] = taxisP->self;
intBuffer[1] = taxisP->used;
intBuffer[2] = taxisP->type;
intBuffer[3] = taxisP->vdate;
intBuffer[4] = taxisP->vtime;
intBuffer[5] = taxisP->rdate;
intBuffer[6] = taxisP->rtime;
intBuffer[7] = taxisP->calendar;
intBuffer[8] = taxisP->unit;
intBuffer[9] = taxisP->numavg;
intBuffer[10] = taxisP->has_bounds;
intBuffer[11] = taxisP->vdate_lb;
intBuffer[12] = taxisP->vtime_lb;
intBuffer[13] = taxisP->vdate_ub;
intBuffer[14] = taxisP->vtime_ub;
intBuffer[15] = taxisP->name ? strlen(taxisP->name) : 0;
intBuffer[16] = taxisP->longname ? strlen(taxisP->longname) : 0;
intBuffer[17] = taxisP->climatology;
int idx = 0;
intBuffer[idx++] = taxisP->self;
intBuffer[idx++] = taxisP->used;
intBuffer[idx++] = taxisP->type;
intBuffer[idx++] = taxisP->vdate;
intBuffer[idx++] = taxisP->vtime;
intBuffer[idx++] = taxisP->rdate;
intBuffer[idx++] = taxisP->rtime;
intBuffer[idx++] = taxisP->rdate;
intBuffer[idx++] = taxisP->rtime;
intBuffer[idx++] = taxisP->calendar;
intBuffer[idx++] = taxisP->unit;
intBuffer[idx++] = taxisP->numavg;
intBuffer[idx++] = taxisP->climatology;
intBuffer[idx++] = taxisP->has_bounds;
intBuffer[idx++] = taxisP->vdate_lb;
intBuffer[idx++] = taxisP->vtime_lb;
intBuffer[idx++] = taxisP->vdate_ub;
intBuffer[idx++] = taxisP->vtime_ub;
intBuffer[idx++] = taxisP->name ? strlen(taxisP->name) : 0;
intBuffer[idx++] = taxisP->longname ? strlen(taxisP->longname) : 0;
serializePack(intBuffer, taxisNint, DATATYPE_INT,
packBuffer, packBufferSize, packBufferPos, context);
......
src/taxis.h
View file @ ca6d49e6
......@@ -10,40 +10,42 @@ typedef struct {
/* Time format hhmmss */
int self;
int used;
int type; /* time type */
int vdate; /* verification date */
int vtime; /* verification time */
int rdate; /* reference date */
int rtime; /* reference time */
int type; // time type
int vdate; // verification date
int vtime; // verification time
int rdate; // reference date
int rtime; // reference time
int fdate; // forecast reference date
int ftime; // forecast reference time
int calendar;
int unit; /* time unit */
int unit; // time unit
int numavg;
int climatology;
int has_bounds;
int vdate_lb; /* lower bounds of vdate */
int vtime_lb; /* lower bounds of vtime */
int vdate_ub; /* upper bounds of vdate */
int vtime_ub; /* upper bounds of vtime */
char *name;
char *longname;
int vdate_lb; // lower bounds of vdate
int vtime_lb; // lower bounds of vtime
int vdate_ub; // upper bounds of vdate
int vtime_ub; // upper bounds of vtime
char* name;
char* longname;
}
taxis_t;
void ptaxisInit(taxis_t *taxis);
void ptaxisCopy(taxis_t *dest, taxis_t *source);
taxis_t *taxisPtr(int taxisID);
void cdiDecodeTimeval(double timevalue, taxis_t *taxis, int *date, int *time);
double cdiEncodeTimeval(int date, int time, taxis_t *taxis);
void timeval2vtime(double timevalue, taxis_t *taxis, int *vdate, int *vtime);
double vtime2timeval(int vdate, int vtime, taxis_t *taxis);
void ptaxisInit(taxis_t* taxis);
void ptaxisCopy(taxis_t* dest, taxis_t* source);
taxis_t* taxisPtr(int taxisID);
void cdiDecodeTimeval(double timevalue, taxis_t* taxis, int* date, int* time);
double cdiEncodeTimeval(int date, int time, taxis_t* taxis);
void timeval2vtime(double timevalue, taxis_t* taxis, int* vdate, int* vtime);
double vtime2timeval(int vdate, int vtime, taxis_t *taxis);
#if !defined (SX)
extern resOps taxisOps;
#endif
int
taxisUnpack(char * unpackBuffer, int unpackBufferSize, int * unpackBufferPos,
int nspTarget, void *context, int checkForSameID);
taxisUnpack(char* unpackBuffer, int unpackBufferSize, int* unpackBufferPos,
int nspTarget, void* context, int checkForSameID);
#endif /* _TAXIS_H */
/*
......
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