Commit 35f7a956 authored by gsell's avatar gsell

cleanup: #ifdef HAVE_SAAMG_SOLVER removed, some headers and fooders fixed

parent 28a21511
// ------------------------------------------------------------------------
// $Version: 1.2.1 $
// ------------------------------------------------------------------------
// Copyright & License: See Copyright.readme in src directory
// ------------------------------------------------------------------------
//
// Class ArbitraryDomain
// Interface to iterative solver and boundary geometry
// for space charge calculation
//
// ------------------------------------------------------------------------
// $Author: kaman $
// $Date: 2014 $
// ------------------------------------------------------------------------
// Copyright (c) 2008-2020
// Paul Scherrer Institut, Villigen PSI, Switzerland
// All rights reserved.
//
// OPAL is licensed under GNU GPL version 3.
//
//#define DEBUG_INTERSECT_RAY_BOUNDARY
#include "Solvers/ArbitraryDomain.h"
......
//
// Class ArbitraryDomain
// Interface to iterative solver and boundary geometry
// for space charge calculation
//
// Copyright (c) 2008-2020
// Paul Scherrer Institut, Villigen PSI, Switzerland
// All rights reserved.
//
// OPAL is licensed under GNU GPL version 3.
//
#ifndef ARBITRARY_DOMAIN_H
#define ARBITRARY_DOMAIN_H
#ifdef HAVE_SAAMG_SOLVER
#include <mpi.h>
#include <hdf5.h>
#include "H5hut.h"
......@@ -137,5 +147,12 @@ private:
inline void rotateZAxisWithQuaternion(Vector_t &v, Quaternion_t const quaternion);
};
#endif //#ifdef HAVE_SAAMG_SOLVER
#endif //#ifdef ARBITRARY_DOMAIN
#endif
// vi: set et ts=4 sw=4 sts=4:
// Local Variables:
// mode:c
// c-basic-offset: 4
// indent-tabs-mode: nil
// require-final-newline: nil
// End:
#ifdef HAVE_SAAMG_SOLVER
//
// Class BoxCornerDomain
// :FIXME: add brief description
//
// Copyright (c) 2008-2020
// Paul Scherrer Institut, Villigen PSI, Switzerland
// All rights reserved.
//
// OPAL is licensed under GNU GPL version 3.
//
#include "Solvers/BoxCornerDomain.h"
#include <map>
......@@ -589,5 +599,10 @@ void BoxCornerDomain::quadraticInterpolation(int x, int y, int z, double &W, dou
}
}
#endif //#ifdef HAVE_SAAMG_SOLVER
\ No newline at end of file
// vi: set et ts=4 sw=4 sts=4:
// Local Variables:
// mode:c
// c-basic-offset: 4
// indent-tabs-mode: nil
// require-final-newline: nil
// End:
//
// Class BoxCornerDomain
// :FIXME: add brief description
//
// Copyright (c) 2008-2020
// Paul Scherrer Institut, Villigen PSI, Switzerland
// All rights reserved.
//
// OPAL is licensed under GNU GPL version 3.
//
#ifndef BOXCORNER_DOMAIN_H
#define BOXCORNER_DOMAIN_H
#ifdef HAVE_SAAMG_SOLVER
//#include <vector>
#include <map>
//#include <multimap>
#include <string>
#include <cmath>
#include <iostream> // Neeeded for stream I/O
#include <fstream> // Needed for file I/O
//#include <iomanip> // Needed for I/O manipulators
//#include "Ippl.h"
#include "IrregularDomain.h"
......@@ -227,5 +232,12 @@ private:
};
#endif //#ifdef HAVE_SAAMG_SOLVER
#endif //#ifdef BOXCORNER_DOMAIN_H
\ No newline at end of file
#endif
// vi: set et ts=4 sw=4 sts=4:
// Local Variables:
// mode:c
// c-basic-offset: 4
// indent-tabs-mode: nil
// require-final-newline: nil
// End:
//
// class IrregularDomain
// defines a common abstract interface for different types of boundaries
//
// Copyright (c) 2008-2020
// Paul Scherrer Institut, Villigen PSI, Switzerland
// All rights reserved.
//
// OPAL is licensed under GNU GPL version 3.
//
#ifndef IRREGULAR_DOMAIN_H
#define IRREGULAR_DOMAIN_H
#ifdef HAVE_SAAMG_SOLVER
#include <vector>
#include <string>
......@@ -14,7 +24,7 @@ enum {
QUADRATIC
};
/// this class defines a common abstract interface for different types of boundaries
class IrregularDomain {
public:
......@@ -121,5 +131,12 @@ protected:
Quaternion_t globalToLocalQuaternion_m;
};
#endif //#ifdef HAVE_SAAMG_SOLVER
#endif //#ifndef IRREGULAR_DOMAIN_H
\ No newline at end of file
#endif
// vi: set et ts=4 sw=4 sts=4:
// Local Variables:
// mode:c
// c-basic-offset: 4
// indent-tabs-mode: nil
// require-final-newline: nil
// End:
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