Commit 29dee9db authored by berenger-bramas's avatar berenger-bramas

Remove typename in non template classes and methods.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/scalfmm/scalfmm/trunk@386 2616d619-271b-44dc-8df4-d4a8f33a7222
parent b3e01f75
......@@ -96,10 +96,10 @@ int main(int argc, char ** argv){
{ // get sum forces&potential
FReal potential = 0;
F3DPosition forces;
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
typename ContainerClass::ConstBasicIterator iter(*octreeIterator.getCurrentListTargets());
ContainerClass::ConstBasicIterator iter(*octreeIterator.getCurrentListTargets());
while( iter.hasNotFinished() ){
potential += iter.data().getPotential() * iter.data().getPhysicalValue();
forces += iter.data().getForces();
......
......@@ -80,10 +80,10 @@ void ValidateFMMAlgoProc(OctreeClass* const badTree,
std::cout << "Check Result\n";
{
const int OctreeHeight = valideTree->getHeight();
typename OctreeClass::Iterator octreeIterator(badTree);
OctreeClass::Iterator octreeIterator(badTree);
octreeIterator.gotoBottomLeft();
typename OctreeClass::Iterator octreeIteratorValide(valideTree);
OctreeClass::Iterator octreeIteratorValide(valideTree);
octreeIteratorValide.gotoBottomLeft();
for(int level = OctreeHeight - 1 ; level >= 1 ; --level){
......@@ -116,10 +116,10 @@ void ValidateFMMAlgoProc(OctreeClass* const badTree,
}
{
// Check that each particle has been summed with all other
typename OctreeClass::Iterator octreeIterator(badTree);
OctreeClass::Iterator octreeIterator(badTree);
octreeIterator.gotoBottomLeft();
typename OctreeClass::Iterator octreeIteratorValide(valideTree);
OctreeClass::Iterator octreeIteratorValide(valideTree);
octreeIteratorValide.gotoBottomLeft();
while(octreeIteratorValide.getCurrentGlobalIndex() != octreeIterator.getCurrentGlobalIndex()){
......@@ -252,7 +252,7 @@ int main(int argc, char ** argv){
FReal potential = 0;
F3DPosition forces;
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
typename ContainerClass::ConstBasicIterator iter(*octreeIterator.getCurrentListTargets());
......@@ -300,7 +300,7 @@ int main(int argc, char ** argv){
FReal potentialValide = 0;
F3DPosition forcesValide;
typename OctreeClass::Iterator octreeIteratorValide(&treeValide);
OctreeClass::Iterator octreeIteratorValide(&treeValide);
octreeIteratorValide.gotoBottomLeft();
do{
......
......@@ -98,7 +98,7 @@ int main(int argc, char ** argv){
{ // get sum forces&potential
FReal potential = 0;
F3DPosition forces;
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
typename ContainerClass::ConstBasicIterator iter(*octreeIterator.getCurrentListTargets());
......
......@@ -210,7 +210,7 @@ int main(int argc, char ** argv){
{ // get sum forces&potential
FReal potential = 0;
F3DPosition forces;
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
typename ContainerClass::ConstBasicIterator iter(*octreeIterator.getCurrentListTargets());
......
......@@ -142,7 +142,7 @@ int main(int argc, char ** argv){
// -----------------------------------------------------
{
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
typename ContainerClass::ConstBasicIterator iter(*octreeIterator.getCurrentListTargets());
......
......@@ -119,7 +119,7 @@ int main(int argc, char ** argv){
for(int idx = 0; idx < 100 ; ++idx){
algo.execute();
{ // update velocity and position
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
typename ContainerClass::BasicIterator iter(*octreeIterator.getCurrentListTargets());
......
......@@ -103,7 +103,7 @@ int main(int argc, char ** argv){
{ // get sum forces&potential
FReal potential = 0;
F3DPosition forces;
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
typename ContainerClass::ConstBasicIterator iter(*octreeIterator.getCurrentListTargets());
......
......@@ -96,7 +96,7 @@ int main(int argc, char ** argv){
{ // get sum forces&potential
FReal potential = 0;
F3DPosition forces;
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
FVector<ParticleClass>::ConstBasicIterator iter(*octreeIterator.getCurrentListTargets());
......
......@@ -138,7 +138,7 @@ int main(int argc, char ** argv){
std::cout << "Start checking ..." << std::endl;
{
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
typename OctreeClassTyped::Iterator octreeIteratorTyped(&treeTyped);
......
......@@ -126,7 +126,7 @@ int main(int argc, char ** argv){
{ // Check that each particle has been summed with all other
long long int counterNbPart = 0;
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
// on each leaf we should have the same number of particles
......@@ -147,7 +147,7 @@ int main(int argc, char ** argv){
{ // Ceck if there is number of NbPart summed at level 1
long long particlesPerBox = NbPartPerBoxes;
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
for(int idxLevel = NbLevels - 1 ; idxLevel >= 1 ; --idxLevel ){
do{
......@@ -187,7 +187,7 @@ int main(int argc, char ** argv){
{
long long int particlesPerBox = NbPartPerBoxes * FMath::pow(8,NbLevels-2);
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
for(int idxLevel = 1 ; idxLevel < NbLevels ; ++idxLevel ){
counterL2L = particlesPerBox * 189 + counterL2L;
do{
......@@ -206,7 +206,7 @@ int main(int argc, char ** argv){
}
}
{ // Check that each particle has been summed with all other
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
typename ContainerClass::BasicIterator iter(*octreeIterator.getCurrentListTargets());
......
......@@ -153,7 +153,7 @@ int main(int argc, char ** argv){
//////////////////////////////////////////////////////////////////////////////////
{ // Check that each particle has been summed with all other
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
if( octreeIterator.getCurrentListTargets()->getSize() != NbPartPerBoxes){
......@@ -165,7 +165,7 @@ int main(int argc, char ** argv){
{ // Check that each particle has been summed with all other
long long int counterNbPart = 0;
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
// on each leaf we should have the same number of particles
......@@ -187,7 +187,7 @@ int main(int argc, char ** argv){
{ // Ceck if there is number of NbPart summed at level 1
long long particlesPerBox = NbPartPerBoxes;
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
for(int idxLevel = NbLevels - 1 ; idxLevel >= 1 ; --idxLevel ){
if(algo.hasWorkAtLevel(idxLevel)){
......@@ -233,7 +233,7 @@ int main(int argc, char ** argv){
{
long long int particlesPerBox = NbPartPerBoxes * FMath::pow(8,NbLevels-2);
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
for(int idxLevel = 1 ; idxLevel < NbLevels ; ++idxLevel ){
counterL2L = particlesPerBox * 189 + counterL2L;
......@@ -259,7 +259,7 @@ int main(int argc, char ** argv){
}
}
{ // Check that each particle has been summed with all other
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
typename ContainerClass::BasicIterator iter(*octreeIterator.getCurrentListTargets());
......
......@@ -175,7 +175,7 @@ int main(int argc, char ** argv){
std::cout << "Which particles are in wich leafs ..." << std::endl;
counter.tic();
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
typename ContainerClass::ConstBasicIterator iter(*octreeIterator.getCurrentListTargets());
......
......@@ -151,7 +151,7 @@ int main(int argc, char ** argv){
// -----------------------------------------------------
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
idx = 0;
do{
......
......@@ -90,7 +90,7 @@ int main(int argc, char ** argv){
counter.tic();
{ // Check that each particle has been summed with all other
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
typename ContainerClass::BasicIterator iter(*octreeIterator.getCurrentListTargets());
......@@ -131,7 +131,7 @@ int main(int argc, char ** argv){
{ // Check that each particle has been put into the right leaf
long counterPart = 0;
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
typename ContainerClass::BasicIterator iter(*octreeIterator.getCurrentListTargets());
......@@ -159,8 +159,8 @@ int main(int argc, char ** argv){
}
{ // Check that each particle has been summed with all other
typename OctreeClass::Iterator octreeIterator(&tree);
typename OctreeClass::Iterator avoidGotoLeftIterator(octreeIterator);
OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator avoidGotoLeftIterator(octreeIterator);
const int heightMinusOne = NbLevels - 1;
for(int idxLevel = 1 ; idxLevel < heightMinusOne ; ++idxLevel ){
......
......@@ -94,7 +94,7 @@ int main(int argc, char ** argv){
counter.tic();
{ // Check that each particle has been summed with all other
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
......@@ -136,7 +136,7 @@ int main(int argc, char ** argv){
{ // Check that each particle has been put into the right leaf
long counterPart = 0;
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
MortonIndex interval[2] = {0,0};
......@@ -181,8 +181,8 @@ int main(int argc, char ** argv){
}
{ // Check that each particle has been summed with all other
typename OctreeClass::Iterator octreeIterator(&tree);
typename OctreeClass::Iterator avoidGotoLeftIterator(octreeIterator);
OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator avoidGotoLeftIterator(octreeIterator);
const int heightMinusOne = NbLevels - 1;
for(int idxLevel = 1 ; idxLevel < heightMinusOne ; ++idxLevel ){
......
......@@ -93,7 +93,7 @@ int main(int argc, char ** argv){
FReal averageParticles = 0;
{
int nbLeafs = 0;
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
averageParticles += FReal(octreeIterator.getCurrentListTargets()->getSize());
......@@ -108,7 +108,7 @@ int main(int argc, char ** argv){
FReal varianceParticles = 0;
{
int nbLeafs = 0;
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
varianceParticles += (averageParticles - FReal(octreeIterator.getCurrentListTargets()->getSize())) - (averageParticles - FReal(octreeIterator.getCurrentListTargets()->getSize()));
......@@ -122,7 +122,7 @@ int main(int argc, char ** argv){
{
FReal averageReduction = 0;
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
int previousCells = 0;
......@@ -147,7 +147,7 @@ int main(int argc, char ** argv){
{
FReal averageNeighbors = 0;
int nbLeafs = 0;
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
......@@ -160,7 +160,7 @@ int main(int argc, char ** argv){
}
{
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
int fullNbCells = 0;
......
......@@ -122,8 +122,8 @@ class TestFmb : public FUTester<TestFmb> {
// Compare the two simulations
Print("Check the particles...");
{ // Check that each particle has been summed with all other
typename OctreeClass::Iterator testOctreeIterator(&testTree);
typename OctreeClass::Iterator goodOctreeIterator(&goodTree);
OctreeClass::Iterator testOctreeIterator(&testTree);
OctreeClass::Iterator goodOctreeIterator(&goodTree);
testOctreeIterator.gotoBottomLeft();
goodOctreeIterator.gotoBottomLeft();
......@@ -165,8 +165,8 @@ class TestFmb : public FUTester<TestFmb> {
}
Print("Check the leaves...");
{ // Ceck if there is number of NbPart summed at level 1
typename OctreeClass::Iterator testOctreeIterator(&testTree);
typename OctreeClass::Iterator goodOctreeIterator(&goodTree);
OctreeClass::Iterator testOctreeIterator(&testTree);
OctreeClass::Iterator goodOctreeIterator(&goodTree);
testOctreeIterator.gotoBottomLeft();
goodOctreeIterator.gotoBottomLeft();
......
......@@ -107,7 +107,7 @@ class TestFmbDirect : public FUTester<TestFmbDirect> {
FReal potentialDiff = 0;
FReal fx = 0, fy = 0, fz = 0;
{ // Check that each particle has been summed with all other
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
......
......@@ -142,7 +142,7 @@ class TestFmbDirectPeriodic : public FUTester<TestFmbDirectPeriodic> {
FReal potentialDiff = 0;
FReal fx = 0, fy = 0, fz = 0;
{ // Check that each particle has been summed with all other
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
......@@ -309,7 +309,7 @@ class TestFmbDirectPeriodic : public FUTester<TestFmbDirectPeriodic> {
{ // Check that each particle has been summed with all other
ParticleClass*const partBox = 0;//&particles[boxStartIdx];
typename OctreeClass::Iterator octreeIterator(&tree);
OctreeClass::Iterator octreeIterator(&tree);
octreeIterator.gotoBottomLeft();
do{
......
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