Commit 221d8d6e authored by PIACIBELLO Cyrille's avatar PIACIBELLO Cyrille
parents de7ce95f 8f41770a
......@@ -111,12 +111,14 @@ int main(int argc, char ** argv){
FParameterDefinitions::NbParticles,FParameterDefinitions::OutputVisuFile,LocalOptionEllipsoid);
typedef double FReal;
FReal extraRadius = 0.000 ;
FReal extraRadius = 0.000 ;
const FSize NbPoints = FParameters::getValue(argc,argv,FParameterDefinitions::NbParticles.options, FSize(20000));
const std::string genericFileName(FParameters::getStr(argc,argv,FParameterDefinitions::InputFile.options, "unifPointDist"));
FReal BoxWith = 0.0;
const std::string genericFileName(FParameters::getStr(argc,argv,FParameterDefinitions::OutputFile.options, "unifPointDist"));
FReal BoxWith = 0.0;
FPoint<FReal> Centre(0.0, 0.0,0.0);
//
// Allocation
......
......@@ -384,7 +384,7 @@ private:
//////////////////////////////////////////////////////////
// truncated singular value decomposition of matrix
const unsigned int info = FBlas::gesvd(nnodes, nnodes, U, S, VT, nnodes, LWORK, WORK);
long long info = FBlas::gesvd(nnodes, nnodes, U, S, VT, nnodes, LWORK, WORK);
if (info!=0) throw std::runtime_error("SVD did not converge with " + std::to_string(info));
const unsigned int rank = this->getRank(S, Epsilon);
......
......@@ -106,8 +106,8 @@ template<>
struct FChebRootsCore<2>{
template <class FReal>
static std::array<FReal,2> Build(){
return { -0.707106781186548,
0.707106781186547};
return { { -0.707106781186548,
0.707106781186547} };
}
};
......@@ -116,9 +116,9 @@ template<>
struct FChebRootsCore<3>{
template <class FReal>
static std::array<FReal,3> Build(){
return {-8.66025403784439e-01,
return { {-8.66025403784439e-01,
0.0,
8.66025403784438e-01};
8.66025403784438e-01} };
}
};
......@@ -127,10 +127,10 @@ template<>
struct FChebRootsCore<4>{
template <class FReal>
static std::array<FReal,4> Build(){
return {-0.923879532511287,
return { {-0.923879532511287,
-0.382683432365090,
0.382683432365090,
0.923879532511287};
0.923879532511287} };
}
};
......@@ -139,11 +139,11 @@ template<>
struct FChebRootsCore<5>{
template <class FReal>
static std::array<FReal,5> Build(){
return {-9.51056516295154e-01,
return { {-9.51056516295154e-01,
-5.87785252292473e-01,
0.0,
5.87785252292473e-01,
9.51056516295154e-01};
9.51056516295154e-01} };
}
};
......@@ -152,12 +152,12 @@ template<>
struct FChebRootsCore<6>{
template <class FReal>
static std::array<FReal,6> Build(){
return {-0.965925826289068,
return { {-0.965925826289068,
-0.707106781186548,
-0.258819045102521,
0.258819045102521,
0.707106781186547,
0.965925826289068};
0.965925826289068} };
}
};
......@@ -166,13 +166,13 @@ template<>
struct FChebRootsCore<7>{
template <class FReal>
static std::array<FReal,7> Build(){
return {-9.74927912181824e-01,
return {{-9.74927912181824e-01,
-7.81831482468030e-01,
-4.33883739117558e-01,
0.0,
4.33883739117558e-01,
7.81831482468030e-01,
9.74927912181824e-01};
9.74927912181824e-01}};
}
};
......@@ -181,14 +181,14 @@ template<>
struct FChebRootsCore<8>{
template <class FReal>
static std::array<FReal,8> Build(){
return {-0.980785280403230,
return { {-0.980785280403230,
-0.831469612302545,
-0.555570233019602,
-0.195090322016128,
0.195090322016128,
0.555570233019602,
0.831469612302545,
0.980785280403230};
0.980785280403230} };
}
};
......@@ -197,7 +197,7 @@ template<>
struct FChebRootsCore<9>{
template <class FReal>
static std::array<FReal,9> Build(){
return {-9.84807753012208e-01,
return { {-9.84807753012208e-01,
-8.66025403784439e-01,
-6.42787609686539e-01,
-3.42020143325669e-01,
......@@ -205,7 +205,7 @@ struct FChebRootsCore<9>{
3.42020143325669e-01,
6.42787609686539e-01,
8.66025403784438e-01,
9.84807753012208e-01};
9.84807753012208e-01} };
}
};
......@@ -214,7 +214,7 @@ template<>
struct FChebRootsCore<10>{
template <class FReal>
static std::array<FReal,10> Build(){
return {-0.987688340595138,
return { {-0.987688340595138,
-0.891006524188368,
-0.707106781186548,
-0.453990499739547,
......@@ -223,7 +223,7 @@ struct FChebRootsCore<10>{
0.453990499739547,
0.707106781186547,
0.891006524188368,
0.987688340595138};
0.987688340595138} };
}
};
......@@ -232,7 +232,7 @@ template<>
struct FChebRootsCore<11>{
template <class FReal>
static std::array<FReal,11> Build(){
return {-9.89821441880933e-01,
return { {-9.89821441880933e-01,
-9.09631995354518e-01,
-7.55749574354258e-01,
-5.40640817455598e-01,
......@@ -242,7 +242,7 @@ struct FChebRootsCore<11>{
5.40640817455597e-01,
7.55749574354258e-01,
9.09631995354518e-01,
9.89821441880933e-01};
9.89821441880933e-01} };
}
};
......@@ -251,7 +251,7 @@ template<>
struct FChebRootsCore<12>{
template <class FReal>
static std::array<FReal,12> Build(){
return {-0.991444861373810,
return { {-0.991444861373810,
-0.923879532511287,
-0.793353340291235,
-0.608761429008721,
......@@ -262,7 +262,7 @@ struct FChebRootsCore<12>{
0.608761429008721,
0.793353340291235,
0.923879532511287,
0.991444861373810};
0.991444861373810} };
}
};
......@@ -272,7 +272,7 @@ template<>
struct FChebRootsCore<13>{
template <class FReal>
static std::array<FReal,13> Build(){
return {-9.92708874098054e-01,
return { {-9.92708874098054e-01,
-9.35016242685415e-01,
-8.22983865893656e-01,
-6.63122658240795e-01,
......@@ -284,7 +284,7 @@ struct FChebRootsCore<13>{
6.63122658240795e-01,
8.22983865893656e-01,
9.35016242685415e-01,
9.92708874098054e-01};
9.92708874098054e-01} };
}
};
......@@ -293,7 +293,7 @@ template<>
struct FChebRootsCore<14>{
template <class FReal>
static std::array<FReal,14> Build(){
return {
return { {
-0.99371220989324258353,
-0.94388333030836756290,
-0.84672419922828416835,
......@@ -307,7 +307,7 @@ struct FChebRootsCore<14>{
0.70710678118654752440,
0.84672419922828416835,
0.94388333030836756290,
0.99371220989324258353};
0.99371220989324258353} };
}
};
......
......@@ -146,7 +146,7 @@ template<>
struct FUnifRootsCore<2>{
template <class FReal>
static std::array<FReal,2> Build(){
return { -1., 1.};
return { { -1., 1.} };
}
};
......@@ -155,7 +155,7 @@ template<>
struct FUnifRootsCore<3>{
template <class FReal>
static std::array<FReal,3> Build(){
return {-1., 0.0, 1.};
return { {-1., 0.0, 1.} };
}
};
......@@ -164,7 +164,7 @@ template<>
struct FUnifRootsCore<4>{
template <class FReal>
static std::array<FReal,4> Build(){
return {-1., -0.333333333333333, 0.333333333333333, 1.};
return { {-1., -0.333333333333333, 0.333333333333333, 1.} };
}
};
......@@ -173,7 +173,7 @@ template<>
struct FUnifRootsCore<5>{
template <class FReal>
static std::array<FReal,5> Build(){
return {-1., -0.5, 0., 0.5, 1.};
return { {-1., -0.5, 0., 0.5, 1.} };
}
};
......@@ -182,7 +182,7 @@ template<>
struct FUnifRootsCore<6>{
template <class FReal>
static std::array<FReal,6> Build(){
return {-1., -0.6, -0.2, 0.2, 0.6, 1.};
return { {-1., -0.6, -0.2, 0.2, 0.6, 1.} };
}
};
......@@ -191,8 +191,8 @@ template<>
struct FUnifRootsCore<7>{
template <class FReal>
static std::array<FReal,7> Build(){
return {-1., -0.666666666666666, -0.333333333333333, 0.,
0.333333333333333, 0.666666666666666, 1.};
return { {-1., -0.666666666666666, -0.333333333333333, 0.,
0.333333333333333, 0.666666666666666, 1.} };
}
};
......@@ -201,14 +201,14 @@ template<>
struct FUnifRootsCore<8>{
template <class FReal>
static std::array<FReal,8> Build(){
return {-1.,
return { {-1.,
-0.714285714285714,
-0.428571428571429,
-0.142857142857143,
0.142857142857143,
0.428571428571429,
0.714285714285714,
1.};
1.} };
}
};
......@@ -217,7 +217,7 @@ template<>
struct FUnifRootsCore<9>{
template <class FReal>
static std::array<FReal,9> Build(){
return {-1.,
return { {-1.,
-0.75,
-0.5,
-0.25,
......@@ -225,7 +225,7 @@ struct FUnifRootsCore<9>{
0.25,
0.5,
0.75,
1.};
1.} };
}
};
......@@ -234,7 +234,7 @@ template<>
struct FUnifRootsCore<10>{
template <class FReal>
static std::array<FReal,10> Build(){
return {-1.,
return { {-1.,
-0.777777777777777,
-0.555555555555555,
-0.333333333333333,
......@@ -243,7 +243,7 @@ struct FUnifRootsCore<10>{
0.333333333333333,
0.555555555555555,
0.777777777777777,
1.};
1.} };
}
};
......@@ -252,7 +252,7 @@ template<>
struct FUnifRootsCore<11>{
template <class FReal>
static std::array<FReal,11> Build(){
return {-1.,
return { {-1.,
-0.8,
-0.6,
-0.4,
......@@ -262,7 +262,7 @@ struct FUnifRootsCore<11>{
0.4,
0.6,
0.8,
1.};
1.} };
}
};
......@@ -271,7 +271,7 @@ template<>
struct FUnifRootsCore<12>{
template <class FReal>
static std::array<FReal,12> Build(){
return {-1.,
return { {-1.,
-0.818181818181818,
-0.636363636363636,
-0.454545454545455,
......@@ -282,7 +282,7 @@ struct FUnifRootsCore<12>{
0.454545454545455,
0.636363636363636,
0.818181818181818,
1.};
1.} };
}
};
......@@ -292,7 +292,7 @@ template<>
struct FUnifRootsCore<13>{
template <class FReal>
static std::array<FReal,13> Build(){
return {-1.,
return { {-1.,
-0.833333333333333,
-0.666666666666666,
-0.5,
......@@ -304,7 +304,7 @@ struct FUnifRootsCore<13>{
0.5,
0.666666666666666,
0.833333333333333,
1.};
1.} };
}
};
......@@ -313,7 +313,7 @@ template<>
struct FUnifRootsCore<14>{
template <class FReal>
static std::array<FReal,14> Build(){
return {-1.,
return { {-1.,
-0.846153846153846,
-0.692307692307692,
-0.538461538461538,
......@@ -326,7 +326,7 @@ struct FUnifRootsCore<14>{
0.538461538461538,
0.692307692307692,
0.846153846153846,
1.};
1.} };
}
};
......@@ -336,7 +336,7 @@ template<>
struct FUnifRootsCore<15>{
template <class FReal>
static std::array<FReal,15> Build(){
return {-1.0,
return { {-1.0,
-0.857142857142857,
-0.714285714285714,
-0.571428571428571,
......@@ -350,7 +350,7 @@ struct FUnifRootsCore<15>{
0.571428571428571,
0.714285714285714,
0.857142857142857,
1.0};
1.0} };
}
};
......@@ -360,7 +360,7 @@ template<>
struct FUnifRootsCore<16>{
template <class FReal>
static std::array<FReal,16> Build(){
return {-1.0,
return { {-1.0,
-0.8947368421052632,
-0.7894736842105263,
-0.6842105263157895,
......@@ -379,7 +379,7 @@ struct FUnifRootsCore<16>{
0.6842105263157895,
0.7894736842105263,
0.8947368421052632,
1.0};
1.0} };
}
};
......
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