Fix merge conflict

src/Makefile.am

@@ -184,6 +184,8 @@ libcdo_la_SOURCES = after_dvtrans.cc      \
 				mpim_grid/gridreference.h \
 				mpim_grid/mpim_grid.cc    \
 				mpim_grid/mpim_grid.h     \
+				mpim_grid/grid_options.cc    \
+				mpim_grid/grid_options.h     \
 				mpmo.cc                   \
 				mpmo.h                    \
 				mpmo_color.cc             \

src/cdo.cc

@@ -174,12 +174,12 @@ get_env_vars()
       ->add_help("The largest size (in bytes) core file that may be created.");
 
   CLIOptions::envvar("CDO_DOWNLOAD_PATH")
-      ->add_effect([&](const std::string &downloadPath) { cdo::DownloadPath = downloadPath; })
+      ->add_effect([&](const std::string &downloadPath) { DownloadPath = downloadPath; })
       ->describe_argument("path")
       ->add_help("Path where CDO can store downloads.");
 
   CLIOptions::envvar("CDO_ICON_GRIDS")
-      ->add_effect([&](const std::string &iconGrid) { cdo::IconGrids = iconGrid; })
+      ->add_effect([&](const std::string &iconGrid) { IconGrids = iconGrid; })
       ->describe_argument("path")
       ->add_help("Root directory of the installed ICON grids (e.g. /pool/data/ICON).");
 

src/cdo_options.cc

@@ -27,8 +27,6 @@ namespace cdo
 const char *progname;
 const char *Version = "Climate Data Operators version " VERSION " (https://mpimet.mpg.de/cdo)";
 std::string FileSuffix;
-std::string DownloadPath;
-std::string IconGrids;
 bool stdinIsTerminal = false;
 bool stdoutIsTerminal = false;
 bool stderrIsTerminal = false;

src/cdo_options.h

@@ -3,6 +3,7 @@
 
 #include <vector>
 #include <string>
+#include "mpim_grid/grid_options.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h" /* _FILE_OFFSET_BITS influence off_t */
@@ -16,8 +17,6 @@ namespace cdo
 extern const char *progname;
 extern const char *Version;
 extern std::string FileSuffix;
-extern std::string DownloadPath;
-extern std::string IconGrids;
 extern bool stdinIsTerminal;
 extern bool stdoutIsTerminal;
 extern bool stderrIsTerminal;

src/mpim_grid/grid_options.cc

+#include <string>
+std::string DownloadPath;
+std::string IconGrids;

src/mpim_grid/grid_options.h

+#ifndef GRID_OPTIONS
+#define GRID_OPTIONS
+#include <string>
+extern std::string IconGrids;
+extern std::string DownloadPath;
+#endif

src/mpim_grid/gridreference.cc

@@ -22,11 +22,11 @@
 #include <cdi.h>
 
 #include "cdi_uuid.h"
+#include "cdi_lockedIO.h"
+#include "grid_options.h"
 #include "gridreference.h"
 #include "cdo_output.h"
 #include <mpim_grid.h>
-#include "cdi_lockedIO.h"
-#include "cdo_options.h"
 
 // callback function for curl for writing the network retrieved grid file
 #ifdef HAVE_LIBCURL
@@ -266,9 +266,9 @@ referenceToGrid(int gridID1)
       char griddir[8192] = { 0 };
       char gridfilepath[8192] = { 0 };
 
-      if (!cdo::IconGrids.empty() && griduri[0])
+      if (!IconGrids.empty() && griduri[0])
         {
-          if (search_directory(cdo::IconGrids.c_str())) cdo_abort("CDO_ICON_GRIDS not found: %s!", cdo::IconGrids);
+          if (search_directory(IconGrids.c_str())) cdo_abort("CDO_ICON_GRIDS not found: %s!", IconGrids);
           auto wpath = griduri;
           if (strncmp(griduri, "http://", 7) == 0)
             wpath += 7;
@@ -279,7 +279,7 @@ referenceToGrid(int gridID1)
               auto gridpath = strchr(wpath, '/');
               if (gridpath)
                 {
-                  strcpy(griddir, cdo::IconGrids.c_str());
+                  strcpy(griddir, IconGrids.c_str());
                   strcpy(gridfilepath, griddir);
                   strcat(gridfilepath, gridpath);
                   status = search_file(griddir, gridfilepath);
@@ -290,9 +290,9 @@ referenceToGrid(int gridID1)
 
       if (gridfilepath[0] == 0)
         {
-          if (!cdo::DownloadPath.empty())
+          if (!DownloadPath.empty())
             {
-              strcpy(griddir, cdo::DownloadPath.c_str());
+              strcpy(griddir, DownloadPath.c_str());
               strcat(griddir, "/");
 
               status = search_directory(griddir);

src/process.cc

@@ -148,18 +148,12 @@ Process::add_pipe_in_stream()
 void
 Process::add_parent(const std::shared_ptr<Process> &parentProcess)
 {
-  parentProcesses.push_back(parentProcess);
   m_posInParent = parentProcess->inputStreams.size() - 1;
-  add_pipe_out_stream();
-}
-
-void
-Process::add_pipe_out_stream()
-{
-  outputStreams.push_back(parentProcesses[0]->inputStreams[m_posInParent]);
+  outputStreams.push_back(parentProcess->inputStreams[m_posInParent]);
   m_streamCnt++;
 }
 
+
 void *
 execute(void *process)
 {

src/process.h

@@ -42,7 +42,6 @@ public:
   const CdoModule &m_module;
   int m_posInParent;
   std::vector<std::shared_ptr<Process>> childProcesses;
-  std::vector<std::shared_ptr<Process>> parentProcesses;
   std::vector<CdoStreamID> inputStreams;
   std::vector<CdoStreamID> outputStreams;
 
@@ -63,7 +62,7 @@ public:
 
   /* Member Functions  */
   Process(int p_ID, const std::string &p_operatorName, const std::vector<std::string> &p_arguments, const CdoModule &p_module);
-  virtual ~Process() {}
+  virtual ~Process() {Debug(PROCESS,"destruction of %s",operatorName);}
 
   pthread_t start_thread();
   virtual void init() = 0;