include cleanup, removed process manager from process_int and moved it into cdo.cc

src/Afterburner.cc

@@ -33,6 +33,7 @@
 #include <cdi.h>
 
 #include "cdo_int.h"
+#include "cdo_defaultValues.h"
 
 #define streamOpenWrite cdoOpenWrite
 #define streamDefVlist cdoDefVlist

src/CMOR_lite.cc

@@ -31,6 +31,7 @@
 #include "pmlist.h"
 #include "convert_units.h"
 #include "cdo_cdiWrapper.h"
+#include "cdi_lockedIO.h"
 
 int stringToParam(const char *paramstr);
 

src/Collgrid.cc

@@ -27,6 +27,7 @@
 #include <mpim_grid.h>
 #include "util_files.h"
 #include "cdo_options.h"
+#include "cdi_lockedIO.h"
 
 static int globalGridType = CDI_UNDEFID;
 

src/Echam5ini.cc

@@ -29,6 +29,7 @@
 #include "griddes.h"
 #include "commandline.h"
 #include "cdo_cdiWrapper.h"
+#include "cdo_defaultValues.h"
 
 #ifdef HAVE_LIBNETCDF
 #include "netcdf.h"

src/Exprf.cc

@@ -45,6 +45,7 @@
 #include "expr.h"
 #include "datetime.h"
 #include "cdo_zaxis.h"
+#include "cdi_lockedIO.h"
 
 void grid_cell_area(int gridID, double *array);
 int getSurfaceID(int vlistID);

src/Importcmsaf.cc

@@ -32,6 +32,7 @@
 #include "dmemory.h"
 #include "process_int.h"
 #include "cdo_cdiWrapper.h"
+#include "cdo_defaultValues.h"
 #include <mpim_grid.h>
 
 #define MAX_DSETS 1024

src/Input.cc

@@ -32,6 +32,7 @@
 #include "griddes.h"
 #include "cdo_zaxis.h"
 #include "grid_read_pingo.h"
+#include "cdo_defaultValues.h"
 
 static size_t
 input_iarray(size_t nval, int *array)

src/Magplot.cc

@@ -26,7 +26,7 @@
 
 #ifdef HAVE_LIBMAGICS
 
-#include "magics_api.h"
+#include <magics_api.h>
 #include "magics_template_parser.h"
 #include "results_template_parser.h"
 #include "StringUtilities.h"

src/Magvector.cc

@@ -28,7 +28,7 @@
 
 #ifdef HAVE_LIBMAGICS
 
-#include "magics_api.h"
+#include <magics_api.h>
 #include "magics_template_parser.h"
 #include "results_template_parser.h"
 #include "StringUtilities.h"

src/Mrotuv.cc

@@ -22,13 +22,14 @@
 */
 
 #include <cdi.h>
+#include <mpim_grid.h>
 
 #include "cdo_int.h"
 #include "util_vector.h"
 #include "cdo_options.h"
 #include "process_int.h"
+#include "cdi_lockedIO.h"
 
-#include <mpim_grid.h>
 
 void
 rotate_uv(double *u_i, double *v_j, int ix, int iy, double *lon, double *lat, double *u_lon, double *v_lat)

src/Pack.cc

@@ -32,6 +32,7 @@
 #include "process_int.h"
 #include "cdo_vlist.h"
 #include "datetime.h"
+#include "cdo_defaultValues.h"
 
 #define NALLOC_INC 1024
 

src/Select.cc

@@ -34,6 +34,7 @@
 #include "sellist.h"
 #include "printinfo.h"
 #include "progress.h"
+#include "cdi_lockedIO.h"
 
 double datestrToDouble(const char *datestr, int opt);
 

src/Selmulti.cc

@@ -22,6 +22,7 @@
 #include "cdo_zaxis.h"
 #include "readline.h"
 #include "listarray.h"
+#include "cdi_lockedIO.h"
 
 // NOTE: All operators in this module works only on GRIB edition 1 files!
 

src/Seloperator.cc

@@ -21,6 +21,7 @@
 #include "process_int.h"
 #include "cdo_zaxis.h"
 #include "param_conversion.h"
+#include "cdi_lockedIO.h"
 
 void *
 Seloperator(void *process)

src/Selvar.cc

@@ -43,6 +43,7 @@
 
 #include "listarray.h"
 #include "util_wildcards.h"
+#include "cdi_lockedIO.h"
 
 void *
 Selvar(void *process)

src/Setpartab.cc

@@ -35,6 +35,7 @@
 #include "util_files.h"
 #include "parse_literals.h"
 #include "cdo_cdiWrapper.h"
+#include "cdi_lockedIO.h"
 
 int stringToParam(const char *paramstr);
 

src/Split.cc

@@ -35,6 +35,7 @@
 #include "cdo_history.h"
 #include "util_files.h"
 #include "cdo_zaxis.h"
+#include "cdi_lockedIO.h"
 
 static void
 gen_filename(char *filename, bool swap_obase, const char *obase, const char *suffix)

src/Splitrec.cc

@@ -28,6 +28,7 @@
 #include "process_int.h"
 
 #include "util_files.h"
+#include "cdi_lockedIO.h"
 
 void *
 Splitrec(void *process)

src/Varrms.cc

@@ -25,6 +25,7 @@
 #include "cdo_int.h"
 #include "process_int.h"
 #include <mpim_grid.h>
+#include "cdi_lockedIO.h"
 
 static void
 varrms(const std::vector<double> w, const FieldVector &field1, const FieldVector &field2, Field &field3)

src/Vertstat.cc

@@ -41,6 +41,7 @@
 #include "cdo_zaxis.h"
 #include "param_conversion.h"
 #include "pmlist.h"
+#include "cdi_lockedIO.h"
 
 #define IS_SURFACE_LEVEL(zaxisID) (zaxisInqType(zaxisID) == ZAXIS_SURFACE && zaxisInqSize(zaxisID) == 1)