Commit c7ba612e authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

renamed stream_int.X to cdi_int.X

parent 6a3bda76
......@@ -184,6 +184,8 @@ src/cdi.inc -text
src/cdiFortran.c -text
src/cdiFortran.h -text
src/cdi_error.c -text
src/cdi_int.c -text
src/cdi_int.h -text
src/cdi_limits.h -text
src/cdi_util.c -text
src/cdilib.c -text
......@@ -262,8 +264,6 @@ src/stream_gribapi.h -text
src/stream_history.c -text
src/stream_ieg.c -text
src/stream_ieg.h -text
src/stream_int.c -text
src/stream_int.h -text
src/stream_record.c -text
src/stream_srv.c -text
src/stream_srv.h -text
......
......@@ -92,8 +92,8 @@ libcdi_la_SOURCES = \
stream_history.c \
stream_ieg.c \
stream_ieg.h \
stream_int.c \
stream_int.h \
cdi_int.c \
cdi_int.h \
stream_record.c \
stream_srv.c \
stream_srv.h \
......
......@@ -118,11 +118,10 @@ am_libcdi_la_OBJECTS = basetime.lo binary.lo calendar.lo cdf.lo \
pio_posixnonb.lo pio_list_set.lo pio_rpc.lo pio_server.lo \
pio_util.lo resource_handle.lo servicelib.lo stream_cdf.lo \
stream_cgribex.lo stream_ext.lo stream_grb.lo \
stream_gribapi.lo stream_history.lo stream_ieg.lo \
stream_int.lo stream_record.lo stream_srv.lo stream_var.lo \
table.lo taxis.lo timebase.lo tsteps.lo util.lo varscan.lo \
version.lo vlist.lo vlist_att.lo vlist_var.lo zaxis.lo \
stream.lo swap.lo
stream_gribapi.lo stream_history.lo stream_ieg.lo cdi_int.lo \
stream_record.lo stream_srv.lo stream_var.lo table.lo taxis.lo \
timebase.lo tsteps.lo util.lo varscan.lo version.lo vlist.lo \
vlist_att.lo vlist_var.lo zaxis.lo stream.lo swap.lo
libcdi_la_OBJECTS = $(am_libcdi_la_OBJECTS)
@ENABLE_CDI_LIB_FALSE@am_libcdi_la_rpath =
@ENABLE_CDI_LIB_TRUE@am_libcdi_la_rpath = -rpath $(libdir)
......@@ -413,8 +412,8 @@ libcdi_la_SOURCES = \
stream_history.c \
stream_ieg.c \
stream_ieg.h \
stream_int.c \
stream_int.h \
cdi_int.c \
cdi_int.h \
stream_record.c \
stream_srv.c \
stream_srv.h \
......@@ -553,6 +552,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdf_int.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdiFortran.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdi_error.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdi_int.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdi_util.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cgribexlib.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dmemory.Plo@am__quote@
......@@ -589,7 +589,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_gribapi.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_history.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_ieg.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_int.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_record.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_srv.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_var.Plo@am__quote@
......
......@@ -10,7 +10,7 @@
#include "cdf.h"
#include "cdi.h"
#include "stream_int.h"
#include "cdi_int.h"
#include "cdf_int.h"
......
......@@ -8,7 +8,7 @@
#include <string.h>
#include "cdi.h"
#include "stream_int.h"
#include "cdi_int.h"
#include "cdf_int.h"
......
......@@ -12,7 +12,7 @@
#include "dmemory.h"
#include "cdi.h"
#include "stream_int.h"
#include "cdi_int.h"
#include "pio_util.h"
#include "namespace.h"
#include "resource_handle.h"
......
#ifndef _STREAM_INT_H
#define _STREAM_INT_H
#ifndef _CDI_INT_H
#define _CDI_INT_H
#if defined (HAVE_CONFIG_H)
# include "config.h"
......@@ -334,7 +334,7 @@ void uuid2str(const char *uuid, char *uuidstr);
void str2uuid(const char *uuidstr, char *uuid);
#endif /* _STREAM_INT_H */
#endif /* _CDI_INT_H */
/*
* Local Variables:
* c-file-style: "Java"
......
......@@ -93,6 +93,30 @@ void cdiParamToString(int param, char *paramstr, int maxlen)
if ( len > ( maxlen-1) )
fprintf(stderr, "Internal problem (%s): size of input string is too small!\n", __func__);
}
char *cdiUnitNamePtr(int cdi_unit)
{
char *cdiUnits[] = {
/* 0 */ "undefined",
/* 1 */ "Pa",
/* 2 */ "hPa",
/* 3 */ "mm",
/* 4 */ "cm",
/* 5 */ "dm",
/* 6 */ "m",
};
char *name;
int size = (int) (sizeof(cdiUnits)/sizeof(char *));
if ( cdi_unit > 0 && cdi_unit < size )
name = cdiUnits[cdi_unit];
else
name = NULL;
return (name);
}
/*
* Local Variables:
* c-file-style: "Java"
......
......@@ -9,7 +9,7 @@
#include <stdio.h>
#include "cdi.h"
#include "stream_int.h"
#include "cdi_int.h"
#include "gribapi.h"
#include "dmemory.h"
......
......@@ -11,7 +11,7 @@
#include "dmemory.h"
#include "cdi.h"
#include "stream_int.h"
#include "cdi_int.h"
#include "grid.h"
#include "gaussgrid.h"
#include "pio_util.h"
......
......@@ -4,7 +4,7 @@
#include "dmemory.h"
#include "cdi.h"
#include "stream_int.h"
#include "cdi_int.h"
#include "resource_handle.h"
#include "pio_util.h"
#include "resource_handle.h"
......
......@@ -108,7 +108,7 @@ c="dmemory.c \
cdf_int.c \
cdi_error.c \
cdi_util.c \
stream_int.c \
cdi_int.c \
stream.c \
stream_history.c \
stream_cgribex.c \
......@@ -141,7 +141,7 @@ c="dmemory.c \
h="cdi_limits.h taxis.h dtypes.h file.h service.h extra.h \
ieg.h cdi.h timebase.h calendar.h basetime.h datetime.h \
error.c error.h stream_int.h cgribex.h gribapi.h \
error.c error.h cdi_int.h cgribex.h gribapi.h \
stream_cgribex.h stream_gribapi.h stream_grb.h stream_cdf.h \
tablepar.h table.h gaussgrid.h grid.h zaxis.h varscan.h binary.h swap.h \
service.h stream_srv.h stream_ext.h stream_ieg.h cdf_int.h \
......
......@@ -4,7 +4,7 @@
#include "dmemory.h"
#include "cdi.h"
#include "stream_int.h"
#include "cdi_int.h"
#include "pio_util.h"
#include "resource_handle.h"
#include "pio_rpc.h"
......
......@@ -17,7 +17,7 @@
#include "pio_rpc.h"
#include "pio_server.h"
#include "resource_handle.h"
#include "stream_int.h"
#include "cdi_int.h"
#include "vlist.h"
extern resOps streamOps;
......
......@@ -17,7 +17,7 @@
#include "pio_comm.h"
#include "pio_rpc.h"
#include "pio_util.h"
#include "stream_int.h"
#include "cdi_int.h"
#include "resource_handle.h"
#include "vlist_var.h"
......
......@@ -6,7 +6,7 @@
#include "dmemory.h"
#include "cdi.h"
#include "stream_int.h"
#include "cdi_int.h"
#include "cdf.h"
#include "stream_grb.h"
#include "stream_cdf.h"
......
......@@ -15,7 +15,7 @@
#include "cdi.h"
#include "basetime.h"
#include "gaussgrid.h"
#include "stream_int.h"
#include "cdi_int.h"
#include "stream_cdf.h"
#include "cdf_int.h"
#include "varscan.h"
......
......@@ -7,7 +7,7 @@
#include "dmemory.h"
#include "cdi.h"
#include "stream_int.h"
#include "cdi_int.h"
#include "file.h"
#include "varscan.h"
#include "datetime.h"
......@@ -408,7 +408,7 @@ void cgribexAddRecord(stream_t * streamptr, int param, int *isec1, int *isec2, d
if ( datatype > 32 ) datatype = DATATYPE_PACK32;
if ( datatype < 0 ) datatype = DATATYPE_PACK;
varAddRecord(recID, param, gridID, zaxistype, lbounds, level1, level2, 0,
varAddRecord(recID, param, gridID, zaxistype, lbounds, level1, level2, 0, 0,
datatype, &varID, &levelID, tsteptype, numavg, ISEC1_LevelType, NULL, NULL, NULL);
(*record).varID = varID;
......
......@@ -10,7 +10,7 @@
#include "error.h"
#include "file.h"
#include "cdi.h"
#include "stream_int.h"
#include "cdi_int.h"
#include "varscan.h"
#include "datetime.h"
#include "extra.h"
......@@ -275,7 +275,7 @@ void extAddRecord(stream_t *streamptr, int param, int level, int xysize,
*/
leveltype = ZAXIS_GENERIC;
varAddRecord(recID, param, gridID, leveltype, 0, level, 0, 0,
varAddRecord(recID, param, gridID, leveltype, 0, level, 0, 0, 0,
extInqDatatype(prec, number), &varID, &levelID, UNDEFID, 0, 0, NULL, NULL, NULL);
(*record).varID = varID;
......
......@@ -7,7 +7,7 @@
#include "dmemory.h"
#include "cdi.h"
#include "stream_int.h"
#include "cdi_int.h"
#include "stream_cgribex.h"
#include "stream_gribapi.h"
#include "file.h"
......
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