Merge pull request #516 from lukasmerten/bugfix

MacOS install issue

Author: rafaelab

.github/workflows/testing_OSX.yml

@@ -19,8 +19,8 @@ jobs:
        uses: actions/checkout@v4 
      - name: Preinstall 
        run: | 
-         brew install hdf5 fftw cfitsio muparser libomp swig
-         pip install numpy==1.26
+         brew install hdf5 fftw cfitsio muparser libomp swig python3
+         pip install numpy==1.26.4 cmake
      - name: Set up the build
        env:
          CXX: ${{ matrix.config.cxx }}

include/crpropa/ModuleList.h

@@ -1,13 +1,19 @@
 #ifndef CRPROPA_MODULE_LIST_H
 #define CRPROPA_MODULE_LIST_H
 
+#include <algorithm>
+#include <csignal>
+#include <iostream>
+#include <vector>
+#include <exception>
+#include <sstream>
+#include <list>
+
 #include "crpropa/Candidate.h"
 #include "crpropa/Module.h"
 #include "crpropa/Source.h"
 #include "crpropa/module/Output.h"
 
-#include <list>
-#include <sstream>
 
 namespace crpropa {
 

src/ModuleList.cpp.in

@@ -1,17 +1,13 @@
 #include "crpropa/ModuleList.h"
 #include "crpropa/ProgressBar.h"
 
-#if _OPENMP
-#include <omp.h>
-#define OMP_SCHEDULE @OMP_SCHEDULE@
-#endif
-
-#include <algorithm>
-#include <csignal>
-#include <bits/stdc++.h> 
 #ifndef sighandler_t
 typedef void (*sighandler_t)(int);
 #endif
+#ifdef _OPENMP
+#include <omp.h>
+#define OMP_SCHEDULE @OMP_SCHEDULE@
+#endif
 
 using namespace std;