Commit 6f8d2ed3 authored by Oliver Heidmann's avatar Oliver Heidmann
Browse files

renamed cdoOptions.* to cdo_options.* to match conventions, fixed resuling include mismatches

parent 48b28f8e
......@@ -24,7 +24,7 @@
#include <cdi.h>
#include "cdoOptions.h"
#include "cdo_options.h"
#include "cdo_int.h"
#include "parameterConversion.h"
#include "pstream_int.h"
......
......@@ -43,7 +43,7 @@
#include "afterburner.h"
#include "constants.h"
#include "compare.h"
#include "cdoOptions.h"
#include "cdo_options.h"
#ifdef _OPENMP
#include <omp.h>
......
......@@ -28,7 +28,7 @@
*/
#include <cdi.h>
#include "cdoOptions.h"
#include "cdo_options.h"
#include "cdo_int.h"
#include "pstream_int.h"
......
......@@ -26,7 +26,7 @@
*/
#include <cdi.h>
#include "cdoOptions.h"
#include "cdo_options.h"
#include "cdo_int.h"
#include "calendar.h"
......
......@@ -23,7 +23,7 @@
*/
#include <cdi.h>
#include "cdoOptions.h"
#include "cdo_options.h"
#include "cdo_int.h"
#include "pstream_int.h"
......
......@@ -26,7 +26,7 @@
#include "cdo_int.h"
#include "par_io.h"
#include "pstream_int.h"
#include "cdoOptions.h"
#include "cdo_options.h"
extern "C" {
int streamGrbInqDataScanningMode(void);
......
......@@ -25,7 +25,7 @@
#include "cdo_int.h"
#include "pstream_int.h"
#include "cdoOptions.h"
#include "cdo_options.h"
#include "datetime.h"
#define NALLOC_INC 1024
......
......@@ -29,7 +29,7 @@
#include "cdo_math.h"
#include "pstream_int.h"
#include "text.h"
#include "cdoOptions.h"
#include "cdo_options.h"
#include "printinfo.h"
#include "pmlist.h"
......
......@@ -38,7 +38,7 @@
#include "cdo_task.h"
#include "pstream_int.h"
#include "percentiles.h"
#include "cdoOptions.h"
#include "cdo_options.h"
#include "util_files.h"
struct ens_file_t
......
......@@ -27,7 +27,7 @@
#include "cdo_int.h"
#include "parameterConversion.h"
#include "pstream_int.h"
#include "cdoOptions.h"
#include "cdo_options.h"
#include "util_files.h"
// Defines for rank histogram
......
......@@ -28,7 +28,7 @@
#include "pstream_int.h"
#include "grid.h"
#include "grid_point_search.h"
#include "cdoOptions.h"
#include "cdo_options.h"
#include "progress.h"
void
......
......@@ -33,7 +33,7 @@
#include "parameterConversion.h"
#include "statistic.h"
#include "pstream_int.h"
#include "cdoOptions.h"
#include "cdo_options.h"
#include "datetime.h"
#ifdef HAVE_LIBFFTW3
......
......@@ -21,7 +21,7 @@
#include "parameterConversion.h"
#include "pstream_int.h"
#include "statistic.h"
#include "cdoOptions.h"
#include "cdo_options.h"
#define NALLOC_INC 1024
......
......@@ -36,7 +36,7 @@
#include "parameterConversion.h"
#include "pstream_int.h"
#include "grid.h"
#include "cdoOptions.h"
#include "cdo_options.h"
#include "progress.h"
static void
......
......@@ -25,8 +25,8 @@ libcdo_la_SOURCES = \
cdo_season.h \
cdo_season.cc \
cdi_uuid.h \
cdoOptions.h \
cdoOptions.cc \
cdo_options.h \
cdo_options.cc \
cimdOmp.cc \
cimdOmp.h \
cmortable_parser.cc \
......
......@@ -44,7 +44,7 @@
#include "pstream_int.h"
#include "remap.h"
#include "grid.h"
#include "cdoOptions.h"
#include "cdo_options.h"
#include "timer.h"
enum
......
......@@ -32,7 +32,7 @@
#include "util.h"
#include "printinfo.h"
#include "text.h"
#include "cdoOptions.h"
#include "cdo_options.h"
#include "process_int.h"
#include "compare.h"
......
......@@ -30,7 +30,7 @@
#include "grid.h"
#include "constants.h" // planet radius
#include "pmlist.h"
#include "cdoOptions.h"
#include "cdo_options.h"
#include "progress.h"
#include "grid_point_search.h"
......
......@@ -25,7 +25,7 @@
#include "cdo_int.h"
#include "pstream_int.h"
#include "cdoOptions.h"
#include "cdo_options.h"
#define NALLOC_INC 1024
......
......@@ -26,7 +26,7 @@
#include "cdo_int.h"
#include "parameterConversion.h"
#include "pstream_int.h"
#include "cdoOptions.h"
#include "cdo_options.h"
#define NALLOC_INC 1024
......
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