Commit 68a5347f authored by David Partyka's avatar David Partyka
Browse files

COMP: Attempt to fix LFS issues on AIX.

Include vtkConfigure before including any other standard headers.
parent 28bd67ab
......@@ -42,6 +42,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/
#include "Partition.h"
#include "ChainingMesh.h"
#include <iostream>
#include <fstream>
#include <sstream>
......@@ -51,9 +54,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <algorithm>
#include <math.h>
#include "Partition.h"
#include "ChainingMesh.h"
using namespace std;
/////////////////////////////////////////////////////////////////////////
......
......@@ -42,14 +42,14 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/
#include "CosmoHaloFinder.h"
#include <iostream>
#include <fstream>
#include <cmath>
#include <cstdlib>
#include <algorithm>
#include "CosmoHaloFinder.h"
#ifndef USE_VTK_COSMO
#ifdef DEBUG
#include <sys/time.h>
......
......@@ -106,14 +106,14 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef CosmoHaloFinder_h
#define CosmoHaloFinder_h
#include <string>
#ifdef USE_VTK_COSMO
#include "CosmoDefinition.h"
#else
#include "Definition.h"
#endif
#include <string>
#define numDataDims 3
#define dataX 0
#define dataY 1
......
......@@ -42,6 +42,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/
#include "Partition.h"
#include "CosmoHaloFinderP.h"
#include <iostream>
#include <fstream>
#include <sstream>
......@@ -49,9 +52,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <set>
#include <math.h>
#include "Partition.h"
#include "CosmoHaloFinderP.h"
using namespace std;
/////////////////////////////////////////////////////////////////////////
......
......@@ -42,13 +42,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/
#include <iostream>
#include <fstream>
#include <sstream>
#include <iomanip>
#include <set>
#include <math.h>
#include "Partition.h"
#include "FOFHaloProperties.h"
#include "HaloCenterFinder.h"
......@@ -56,6 +49,13 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "Timings.h"
#endif
#include <iostream>
#include <fstream>
#include <sstream>
#include <iomanip>
#include <set>
#include <math.h>
using namespace std;
/////////////////////////////////////////////////////////////////////////
......
......@@ -42,6 +42,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/
#include "Partition.h"
#include "HaloCenterFinder.h"
#include <iostream>
#include <fstream>
#include <sstream>
......@@ -49,9 +52,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <set>
#include <math.h>
#include "Partition.h"
#include "HaloCenterFinder.h"
using namespace std;
/////////////////////////////////////////////////////////////////////////
......
......@@ -42,6 +42,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/
#include "Message.h"
#include "Partition.h"
#ifdef USE_SERIAL_COSMO
#include <string.h>
#endif
......@@ -50,9 +53,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
using namespace std;
#include "Message.h"
#include "Partition.h"
////////////////////////////////////////////////////////////////////////////
//
// Create a Message for sending or receiving from MPI
......
......@@ -42,6 +42,16 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/
#include "Partition.h"
#include "ParticleDistribute.h"
#ifdef USE_VTK_COSMO
#include "vtkStdString.h"
#include "vtkSetGet.h"
#endif
#include <iostream>
#include <fstream>
#include <sstream>
......@@ -55,14 +65,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <dirent.h>
#endif
#include "Partition.h"
#include "ParticleDistribute.h"
#ifdef USE_VTK_COSMO
#include "vtkStdString.h"
#include "vtkSetGet.h"
#endif
using namespace std;
/////////////////////////////////////////////////////////////////////////
......
......@@ -42,6 +42,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/
#include "Partition.h"
#include "ParticleExchange.h"
#include <iostream>
#include <fstream>
#include <sstream>
......@@ -49,9 +52,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <sys/types.h>
#include "Partition.h"
#include "ParticleExchange.h"
using namespace std;
/////////////////////////////////////////////////////////////////////////
......
......@@ -42,10 +42,10 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/
#include <iostream>
#include "Partition.h"
#include <iostream>
/////////////////////////////////////////////////////////////////////////
//
// Static class to control MPI and the partitioning of processors in
......
......@@ -42,6 +42,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/
#include "Partition.h"
#include "SODHalo.h"
#include <iostream>
#include <fstream>
#include <sstream>
......@@ -55,9 +58,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define M_PI 3.14159265358979323846
#endif
#include "Partition.h"
#include "SODHalo.h"
using namespace std;
/////////////////////////////////////////////////////////////////////////
......
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