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

Moved gradsdeslib.cc to lib/gradsdes/gradsdes.c.

parent 074766db
# Process this file with automake to produce Makefile.in
SUBDIRS = libcdi src/lib/ncl src/lib/yac src contrib test/data test
SUBDIRS = libcdi src/lib/ncl src/lib/yac src/lib/gradsdes src contrib test/data test
if MAINTAINER_MODE
SUBDIRS += test/bandit_tests
endif
......
......@@ -287,7 +287,7 @@ AC_CONFIG_FILES([test/Afterburner.test test/Detrend.test test/Arithc.test test/A
AC_CONFIG_FILES([test/Gradsdes.test test/Collgrid.test test/threads.test test/tsformat.test test/wildcard.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Setmiss.test test/Smooth.test test/MapReduce.test test/Ninfo.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Filter.test ],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([Makefile src/lib/ncl/Makefile src/lib/yac/Makefile src/Makefile contrib/Makefile test/Makefile test/data/Makefile test/bandit_tests/Makefile cdo.spec cdo.settings])
AC_CONFIG_FILES([Makefile src/lib/ncl/Makefile src/lib/yac/Makefile src/lib/gradsdes/Makefile src/Makefile contrib/Makefile test/Makefile test/data/Makefile test/bandit_tests/Makefile cdo.spec cdo.settings])
AC_OUTPUT
# ----------------------------------------------------------------------
......
......@@ -21,7 +21,11 @@
#include "cdo_int.h"
#include "printinfo.h"
#include "gradsdeslib.h"
extern "C"
{
#include "lib/gradsdes/gradsdes.h"
}
static void
get_dim_vals(dsets_t *pfi, double *vals, int dimlen, int dim)
......
......@@ -26,7 +26,7 @@ libcdo_la_SOURCES = \
cdo_season.h \
cdo_season.cc \
cdi_uuid.h \
cdi_lockedIO.h\
cdi_lockedIO.h \
cdi_lockedIO.cc \
cdo_options.h \
cdo_options.cc \
......@@ -86,8 +86,6 @@ libcdo_la_SOURCES = \
functs.h \
getMemorySize.c \
getRSS.c \
gradsdeslib.cc \
gradsdeslib.h \
mpim_grid/mpim_grid.cc \
mpim_grid/mpim_grid.h \
mpim_grid/grid_convert.h \
......
## Process this file with automake to produce Makefile.in
#
noinst_LTLIBRARIES = libgradsdes.la
libgradsdes_la_SOURCES = gradsdes.c gradsdes.h
/*
This file is part of CDO. CDO is a collection of Operators to
manipulate and analyse Climate model Data.
Copyright (C) 2003-2019 Uwe Schulzweida, <uwe.schulzweida AT mpimet.mpg.de>
See COPYING file for copying and redistribution conditions.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
*/
#ifndef _GRADSDESLIB_H
#define _GRADSDESLIB_H
#ifndef GRADSDES_H
#define GRADSDES_H
#define gaint int
#define gadouble double
......@@ -33,7 +17,7 @@
#define EPSILON 1e5
#include <cstdio>
#include <stdio.h>
/* Date/time structure */
struct dt
......@@ -185,4 +169,4 @@ char *intprs(char *ch, int *val);
void gabswp(void *r, gaint cnt);
void gabswp2(void *r, gaint cnt);
#endif /* _GRADSDESLIB_H */
#endif /* GRADSDES_H */
......@@ -44,7 +44,7 @@ userFileOverwrite(const char *restrict filename)
readline(stdin, line, 1024);
char *pline = line;
while (isspace((int) *pline)) pline++;
int len = (int) strlen(pline);
const int len = (int) strlen(pline);
if (len == 3)
{
if (pline[0] == 'y' && pline[1] == 'e' && pline[2] == 's')
......
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