Commit 663ebb24 authored by Christoph Grueninger's avatar Christoph Grueninger
Browse files

Remove superfluous semicolons, get rid of outdated GCC version guards.

Remove a wrong comment.
(reviewed by bernd)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14036 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 158bcb27
......@@ -468,7 +468,7 @@ private:
// definition of the static class member simname_,
// which is necessary because it is of type string.
template <class TypeTag>
std::string MultiDomainProblem<TypeTag>::simname_="simCoupled"; //initialized with default "sim"
std::string MultiDomainProblem<TypeTag>::simname_ = "simCoupled";
} // namespace Dumux
......
......@@ -236,7 +236,7 @@ public:
{
if (!this->timeManager().willBeFinished())
this->timeManager().startNextEpisode(500);
};
}
/*!
* \brief The problem name.
......@@ -266,7 +266,7 @@ public:
Scalar temperatureAtPos(const GlobalPosition &globalPos) const
{
return temperature_;
};
}
//! Returns the reference pressure for evaluation of constitutive relations
/*!
......
......@@ -41,10 +41,6 @@ gnuplot> plot "spline.csv" using 1:2 w l ti "Curve", \
#include <dune/common/fvector.hh>
#define GCC_VERSION (__GNUC__ * 10000 \
+ __GNUC_MINOR__ * 100 \
+ __GNUC_PATCHLEVEL__)
template <class Spline>
void testCommon(const Spline &sp,
const double *x,
......@@ -149,7 +145,6 @@ void testAll()
};
#if GCC_VERSION >= 40500
std::initializer_list<const std::pair<double, double> > pointsInitList =
{
{x[0], y[0]},
......@@ -158,7 +153,6 @@ void testAll()
{x[3], y[3]},
{x[4], y[4]},
};
#endif
std::vector<double> xVec;
std::vector<double> yVec;
......@@ -174,9 +168,9 @@ void testAll()
/////////
// full spline
{ Dumux::Spline<double, 2> sp(x[0], x[1], y[0], y[1], m0, m1); sp.set(x[0],x[1],y[0],y[1],m0, m1); testFull(sp, x, y, m0, m1); };
{ Dumux::Spline<double, 2> sp(x, y, m0, m1); sp.setXYArrays(2, x, y, m0, m1); testFull(sp, x, y, m0, m1); };
{ Dumux::Spline<double, 2> sp(points, m0, m1); sp.setArrayOfPoints(2, points, m0, m1); testFull(sp, x, y, m0, m1); };
{ Dumux::Spline<double, 2> sp(x[0], x[1], y[0], y[1], m0, m1); sp.set(x[0],x[1],y[0],y[1],m0, m1); testFull(sp, x, y, m0, m1); }
{ Dumux::Spline<double, 2> sp(x, y, m0, m1); sp.setXYArrays(2, x, y, m0, m1); testFull(sp, x, y, m0, m1); }
{ Dumux::Spline<double, 2> sp(points, m0, m1); sp.setArrayOfPoints(2, points, m0, m1); testFull(sp, x, y, m0, m1); }
/////////
......@@ -184,41 +178,33 @@ void testAll()
/////////
// full spline
{ Dumux::Spline<double, 5> sp(x, y, m0, m1); sp.setXYArrays(5, x, y, m0, m1); testFull(sp, x, y, m0, m1); };
{ Dumux::Spline<double, 5> sp; sp.setArrayOfPoints(5, points, m0, m1); testFull(sp, x, y, m0, m1); };
{ Dumux::Spline<double, 5> sp; sp.setContainerOfPoints(pointVec,m0, m1); testFull(sp, x, y, m0, m1); };
#if GCC_VERSION >= 40500
{ Dumux::Spline<double, 5> sp; sp.setContainerOfTuples(pointsInitList, m0, m1); testFull(sp, x, y, m0, m1); };
#endif
{ Dumux::Spline<double, 5> sp(x, y, m0, m1); sp.setXYArrays(5, x, y, m0, m1); testFull(sp, x, y, m0, m1); }
{ Dumux::Spline<double, 5> sp; sp.setArrayOfPoints(5, points, m0, m1); testFull(sp, x, y, m0, m1); }
{ Dumux::Spline<double, 5> sp; sp.setContainerOfPoints(pointVec,m0, m1); testFull(sp, x, y, m0, m1); }
{ Dumux::Spline<double, 5> sp; sp.setContainerOfTuples(pointsInitList, m0, m1); testFull(sp, x, y, m0, m1); }
// natural spline
{ Dumux::Spline<double, 5> sp(x, y); sp.setXYArrays(5, x, y); testNatural(sp, x, y); };
{ Dumux::Spline<double, 5> sp; sp.setContainerOfPoints(pointVec); testNatural(sp, x, y); };
#if GCC_VERSION >= 40500
{ Dumux::Spline<double, 5> sp; sp.setContainerOfTuples(pointsInitList); testNatural(sp, x, y); };
#endif
{ Dumux::Spline<double, 5> sp(x, y); sp.setXYArrays(5, x, y); testNatural(sp, x, y); }
{ Dumux::Spline<double, 5> sp; sp.setContainerOfPoints(pointVec); testNatural(sp, x, y); }
{ Dumux::Spline<double, 5> sp; sp.setContainerOfTuples(pointsInitList); testNatural(sp, x, y); }
/////////
// test variable length splines
/////////
// full spline
{ Dumux::Spline<double, -1> sp(5, x, y, m0, m1); sp.setXYArrays(5,x,y,m0, m1); testFull(sp, x, y, m0, m1); };
{ Dumux::Spline<double, -1> sp(xVec, yVec, m0, m1); sp.setXYContainers(xVec,yVec,m0, m1); testFull(sp, x, y, m0, m1); };
{ Dumux::Spline<double, -1> sp; sp.setArrayOfPoints(5,points,m0, m1); testFull(sp, x, y, m0, m1); };
{ Dumux::Spline<double, -1> sp; sp.setContainerOfPoints(pointVec,m0, m1); testFull(sp, x, y, m0, m1); };
#if GCC_VERSION >= 40500
{ Dumux::Spline<double, -1> sp; sp.setContainerOfTuples(pointsInitList,m0, m1); testFull(sp, x, y, m0, m1); };
#endif
{ Dumux::Spline<double, -1> sp(5, x, y, m0, m1); sp.setXYArrays(5,x,y,m0, m1); testFull(sp, x, y, m0, m1); }
{ Dumux::Spline<double, -1> sp(xVec, yVec, m0, m1); sp.setXYContainers(xVec,yVec,m0, m1); testFull(sp, x, y, m0, m1); }
{ Dumux::Spline<double, -1> sp; sp.setArrayOfPoints(5,points,m0, m1); testFull(sp, x, y, m0, m1); }
{ Dumux::Spline<double, -1> sp; sp.setContainerOfPoints(pointVec,m0, m1); testFull(sp, x, y, m0, m1); }
{ Dumux::Spline<double, -1> sp; sp.setContainerOfTuples(pointsInitList,m0, m1); testFull(sp, x, y, m0, m1); }
// natural spline
{ Dumux::Spline<double, -1> sp(5, x, y); sp.setXYArrays(5,x,y); testNatural(sp, x, y); };
{ Dumux::Spline<double, -1> sp(xVec, yVec); sp.setXYContainers(xVec,yVec); testNatural(sp, x, y); };
{ Dumux::Spline<double, -1> sp; sp.setArrayOfPoints(5,points); testNatural(sp, x, y); };
{ Dumux::Spline<double, -1> sp; sp.setContainerOfPoints(pointVec); testNatural(sp, x, y); };
#if GCC_VERSION >= 40500
{ Dumux::Spline<double, -1> sp; sp.setContainerOfTuples(pointsInitList); testNatural(sp, x, y); };
#endif
{ Dumux::Spline<double, -1> sp(5, x, y); sp.setXYArrays(5,x,y); testNatural(sp, x, y); }
{ Dumux::Spline<double, -1> sp(xVec, yVec); sp.setXYContainers(xVec,yVec); testNatural(sp, x, y); }
{ Dumux::Spline<double, -1> sp; sp.setArrayOfPoints(5,points); testNatural(sp, x, y); }
{ Dumux::Spline<double, -1> sp; sp.setContainerOfPoints(pointVec); testNatural(sp, x, y); }
{ Dumux::Spline<double, -1> sp; sp.setContainerOfTuples(pointsInitList); testNatural(sp, x, y); }
}
void plot()
......
......@@ -383,19 +383,19 @@ void checkFluidSystem()
paramCache.updateAll(fs);
} catch (...)
{
};
}
try
{
paramCache.updateAll(fs, /*except=*/PC::None);
} catch (...)
{
};
}
try
{
paramCache.updateAll(fs, /*except=*/PC::Temperature | PC::Pressure | PC::Composition);
} catch (...)
{
};
}
try
{
paramCache.updateAllPressures(fs);
......@@ -411,43 +411,43 @@ void checkFluidSystem()
paramCache.updatePhase(fs, phaseIdx);
} catch (...)
{
};
}
try
{
paramCache.updatePhase(fs, phaseIdx, /*except=*/PC::None);
} catch (...)
{
};
}
try
{
paramCache.updatePhase(fs, phaseIdx, /*except=*/PC::Temperature | PC::Pressure | PC::Composition);
} catch (...)
{
};
}
try
{
paramCache.updateTemperature(fs, phaseIdx);
} catch (...)
{
};
}
try
{
paramCache.updatePressure(fs, phaseIdx);
} catch (...)
{
};
}
try
{
paramCache.updateComposition(fs, phaseIdx);
} catch (...)
{
};
}
try
{
paramCache.updateSingleMoleFraction(fs, phaseIdx, /*compIdx=*/0);
} catch (...)
{
};
}
}
// some value to make sure the return values of the fluid system
......@@ -468,7 +468,7 @@ void checkFluidSystem()
} catch (Dune::Exception e)
{
std::cout << "\ndensity calculation throws exception:\n" << e.what();
};
}
fs.allowPressure(true);
fs.allowDensity(true);
......@@ -477,25 +477,25 @@ void checkFluidSystem()
val = FluidSystem::viscosity(fs, paramCache, phaseIdx);
} catch (...)
{
};
}
try
{
val = FluidSystem::enthalpy(fs, paramCache, phaseIdx);
} catch (...)
{
};
}
try
{
val = FluidSystem::heatCapacity(fs, paramCache, phaseIdx);
} catch (...)
{
};
}
try
{
val = FluidSystem::thermalConductivity(fs, paramCache, phaseIdx);
} catch (...)
{
};
}
for (int compIdx = 0; compIdx < numComponents; ++compIdx)
{
......@@ -505,14 +505,14 @@ void checkFluidSystem()
val = FluidSystem::fugacityCoefficient(fs, paramCache, phaseIdx, compIdx);
} catch (...)
{
};
}
fs.allowComposition(true);
try
{
val = FluidSystem::diffusionCoefficient(fs, paramCache, phaseIdx, compIdx);
} catch (...)
{
};
}
for (int comp2Idx = 0; comp2Idx < numComponents; ++comp2Idx)
{
try
......@@ -520,7 +520,7 @@ void checkFluidSystem()
val = FluidSystem::binaryDiffusionCoefficient(fs, paramCache, phaseIdx, compIdx, comp2Idx);
} catch (...)
{
};
}
}
}
}
......
Supports Markdown
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