Commit 297aab46 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

changed grib-api to grib_api

parent 27b75e96
......@@ -24,6 +24,8 @@ case "${HOSTNAME}" in
--with-hdf5=/opt/local \
--with-szlib=$HOME/local \
--with-proj=/opt/local \
--with-jasper=/opt/local \
--with-grib_api=$HOME/local/gribapi-1.9.5 \
CC=gcc CFLAGS="-g -pipe -D_REENTRANT -Wall -W -Wfloat-equal -pedantic -O2 -fopenmp"
;;
# ia64-xxx-linux
......
......@@ -1459,7 +1459,7 @@ Optional Packages:
--with-jasper=<directory>
Specify location of JASPER library. You must specify
its location if GRIB_API was built with JASPER.
--with-grib-api=<yes|no|directory>
--with-grib_api=<yes|no|directory>
library for grib2 compression; if a directory is
given, it will be used as a value for
--with-jasper-root
......
......@@ -168,7 +168,7 @@ AC_ARG_WITH([jasper],
# ----------------------------------------------------------------------
# Compile application with GRIB_API library (for GRIB2 support)
AC_ARG_WITH([grib_api],
[AS_HELP_STRING([--with-grib-api=<yes|no|directory>],
[AS_HELP_STRING([--with-grib_api=<yes|no|directory>],
[library for grib2 compression; if a directory is given, it will be used as a value for --with-jasper-root])],
[AS_CASE(["$with_grib_api"],
[no],[AC_MSG_CHECKING([for GRIB_API library])
......
......@@ -461,18 +461,20 @@ void setStreamNames(int argc, char *argv[])
while ( globArgc < argc )
{
// printf("arg %d %d %s\n", argc, globArgc, argv[globArgc]);
if ( argv[globArgc][0] == '-' )
{
globArgcStart = globArgc;
globArgc = getGlobArgc(argc, argv, globArgc);
// printf("globArgc %d\n", globArgc);
len = 0;
for ( i = globArgcStart; i < globArgc; i++ ) len += strlen(argv[i]) + 1;
streamname = (char *) malloc(len);
memcpy(streamname, argv[globArgcStart], len);
for ( i = 1; i < (int) len-1; i++ ) if ( streamname[i] == '\0' ) streamname[i] = ' ';
Process[processID].streamNames[Process[processID].streamCnt++] = streamname;
// printf("streamname1: %s\n", streamname);
}
else
{
......@@ -480,6 +482,7 @@ void setStreamNames(int argc, char *argv[])
streamname = (char *) malloc(len);
strcpy(streamname, argv[globArgc]);
Process[processID].streamNames[Process[processID].streamCnt++] = streamname;
// printf("streamname2: %s\n", streamname);
globArgc++;
}
}
......@@ -505,7 +508,7 @@ void checkStreamCnt(void)
}
if ( streamInCnt == -1 && streamOutCnt == -1 )
Errorc("I/O stream counts unlimited no allowed");
Errorc("I/O stream counts unlimited no allowed!");
if ( streamInCnt == -1 )
{
......
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