Commit 9dbd7c1c authored by kraus's avatar kraus
Browse files

- remove unused files

- putting own header file first
  o for reason see http://www.cplusplus.com/forum/articles/10627/#msg49679 and
                   http://www.cplusplus.com/forum/articles/10627/#msg49680
parent 814c8c73
#include <fstream>
#include <iostream>
#include "Fields/FM1DDynamic.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include "gsl/gsl_fft_real.h"
#include <fstream>
#include <iostream>
FM1DDynamic::FM1DDynamic(std::string aFilename):
Fieldmap(aFilename) {
......
#include <fstream>
#include <ios>
#include "Fields/FM1DDynamic_fast.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include "gsl/gsl_fft_real.h"
#include <fstream>
#include <ios>
FM1DDynamic_fast::FM1DDynamic_fast(std::string aFilename):
Fieldmap(aFilename) {
......
#include <fstream>
#include <ios>
#include "Fields/FM1DElectroStatic.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include "gsl/gsl_fft_real.h"
#include <fstream>
#include <ios>
FM1DElectroStatic::FM1DElectroStatic(std::string aFilename):
Fieldmap(aFilename) {
......
#include <fstream>
#include <ios>
#include "Fields/FM1DElectroStatic_fast.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include "gsl/gsl_fft_real.h"
#include <fstream>
#include <ios>
FM1DElectroStatic_fast::FM1DElectroStatic_fast(std::string aFilename):
Fieldmap(aFilename) {
......
#include <fstream>
#include <ios>
#include "Fields/FM1DMagnetoStatic.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include "gsl/gsl_fft_real.h"
#include <fstream>
#include <ios>
FM1DMagnetoStatic::FM1DMagnetoStatic(std::string aFilename)
: Fieldmap(aFilename) {
......
#include <fstream>
#include <ios>
#include "Fields/FM1DMagnetoStatic_fast.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include "gsl/gsl_fft_real.h"
#include <fstream>
#include <ios>
FM1DMagnetoStatic_fast::FM1DMagnetoStatic_fast(std::string aFilename):
Fieldmap(aFilename) {
......
#include <fstream>
#include <ios>
#include "Fields/FM1DProfile1.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include <fstream>
#include <ios>
FM1DProfile1::FM1DProfile1(std::string aFilename):
Fieldmap(aFilename),
entranceParameter1_m(0.0),
......
#include <fstream>
#include <ios>
#include "Fields/FM1DProfile2.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include <fstream>
#include <ios>
using namespace std;
using Physics::mu_0;
using Physics::c;
......
#include <fstream>
#include <ios>
#include "Fields/FM2DDynamic.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include <fstream>
#include <ios>
using namespace std;
using Physics::mu_0;
......
#include <fstream>
#include <ios>
#include "Fields/FM2DDynamic_cspline.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include <fstream>
#include <ios>
using namespace std;
using Physics::mu_0;
......
#include <fstream>
#include <ios>
#include "Fields/FM2DElectroStatic.hh"
#include "Fields/Fieldmap.icc"
#include <fstream>
#include <ios>
using namespace std;
FM2DElectroStatic::FM2DElectroStatic(std::string aFilename)
......
#include <fstream>
#include <ios>
#include "Fields/FM2DElectroStatic_cspline.hh"
#include "Fields/Fieldmap.icc"
#include <fstream>
#include <ios>
using namespace std;
FM2DElectroStatic_cspline::FM2DElectroStatic_cspline(std::string aFilename):
......
#include <fstream>
#include <ios>
#include "Fields/FM2DMagnetoStatic.hh"
#include "Fields/Fieldmap.icc"
#include <fstream>
#include <ios>
using namespace std;
FM2DMagnetoStatic::FM2DMagnetoStatic(std::string aFilename):
......
#include <fstream>
#include <ios>
#include "Fields/FM2DMagnetoStatic_cspline.hh"
#include "Fields/Fieldmap.icc"
#include <fstream>
#include <ios>
using namespace std;
FM2DMagnetoStatic_cspline::FM2DMagnetoStatic_cspline(std::string aFilename):
......
#include <fstream>
#include <ios>
#include "Fields/FM3DDynamic.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include <fstream>
#include <ios>
using namespace std;
using Physics::mu_0;
......
#include <fstream>
#include <ios>
#include "Fields/FM3DH5Block.hh"
#include "Fields/Fieldmap.icc"
#include "H5hut.h"
#include "Physics/Physics.h"
#include <fstream>
#include <ios>
extern Inform *gmsg;
using namespace std;
......
#include <fstream>
#include <ios>
#include "Fields/FM3DH5Block_nonescale.hh"
#include "Fields/Fieldmap.icc"
#include "H5hut.h"
#include "Physics/Physics.h"
#include <fstream>
#include <ios>
extern Inform *gmsg;
using namespace std;
......
#include <fstream>
#include <ios>
#include "Fields/FM3DMagnetoStaticH5Block.hh"
#include "Fields/Fieldmap.icc"
#include "H5hut.h"
#include "Physics/Physics.h"
#include <fstream>
#include <ios>
extern Inform *gmsg;
using namespace std;
......
#include <iostream>
#include <fstream>
#include <ios>
#include "Fields/Fieldmap.hh"
#include "Fields/FM3DDynamic.hh"
#include "Fields/FM3DH5Block.hh"
......@@ -29,6 +26,10 @@
#include "Fields/FMDummy.hh"
#include "H5hut.h"
#include <iostream>
#include <fstream>
#include <ios>
#define REGISTER_PARSE_TYPE(X) template <> struct Fieldmap::TypeParseTraits<X> \
{ static const char* name; } ; const char* Fieldmap::TypeParseTraits<X>::name = #X
......
/*
/*
* Copyright (c) 2012, Chris Rogers
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. Neither the name of STFC nor the names of its contributors may be used to
* endorse or promote products derived from this software without specific
* 3. Neither the name of STFC nor the names of its contributors may be used to
* endorse or promote products derived from this software without specific
* prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#include "Fields/SectorMagneticFieldMap.h"
#include "Fields/SectorMagneticFieldMap/Mesh.h"
#include "Fields/SectorMagneticFieldMap/ThreeDGrid.h"
#include "Fields/SectorMagneticFieldMap/Interpolator3dGridTo3d.h"
#include "Utilities/LogicalError.h"
#include <math.h>
#include <algorithm>
......@@ -33,13 +40,6 @@
#include <fstream>
#include <string>
#include "Utilities/LogicalError.h"
#include "Fields/SectorMagneticFieldMap/Mesh.h"
#include "Fields/SectorMagneticFieldMap/ThreeDGrid.h"
#include "Fields/SectorMagneticFieldMap/Interpolator3dGridTo3d.h"
#include "Fields/SectorMagneticFieldMap.h"
// allow a fairly generous phi tolerance - we don't care about phi much and
// calculation can be flaky due to ascii truncation of double and conversions
// from polar to Cartesian
......@@ -251,7 +251,7 @@ const double SectorMagneticFieldMap::IO::floatTolerance_m = 1e-3;
const int SectorMagneticFieldMap::IO::sortOrder_m[3] = {0, 1, 2};
Interpolator3dGridTo3d* SectorMagneticFieldMap::IO::readMap
(std::string file_name, std::vector<double> units,
(std::string file_name, std::vector<double> units,
SectorMagneticFieldMap::symmetry sym) {
try {
INFOMSG("Opening sector field map " << file_name << endl);
......@@ -429,4 +429,3 @@ ThreeDGrid* SectorMagneticFieldMap::IO::generateGrid
double dot_prod(Vector_t vec_1, Vector_t vec_2) {
return vec_1[0]*vec_2[0] + vec_1[1]*vec_2[1] + vec_1[2]*vec_2[2];
}
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