Skip to content
Snippets Groups Projects
Commit 4e09c9d0 authored by Oliver Sander's avatar Oliver Sander Committed by sander
Browse files

Fix more compiler warnings

[[Imported from SVN: r9616]]
parent ae53c40c
No related branches found
No related tags found
No related merge requests found
......@@ -179,7 +179,7 @@ void solve (const shared_ptr<GridType>& grid,
// Solve!
// /////////////////////////////////////////////////////
solver.setInitialSolution(x);
solver.setInitialIterate(x);
solver.solve();
x = solver.getSol();
......@@ -265,8 +265,8 @@ int main (int argc, char *argv[]) try
OperatorAssembler<FEBasis,FEBasis> operatorAssembler(referenceBasis, referenceBasis);
LaplaceAssembler<GridType, FEBasis::LocalFiniteElement, FEBasis::LocalFiniteElement> laplaceLocalAssembler(2*(order-1));
MassAssembler<GridType, FEBasis::LocalFiniteElement, FEBasis::LocalFiniteElement> massMatrixLocalAssembler(2*order);
LaplaceAssembler<GridType, FEBasis::LocalFiniteElement, FEBasis::LocalFiniteElement> laplaceLocalAssembler;
MassAssembler<GridType, FEBasis::LocalFiniteElement, FEBasis::LocalFiniteElement> massMatrixLocalAssembler;
typedef Dune::BCRSMatrix<Dune::FieldMatrix<double,1,1> > ScalarMatrixType;
ScalarMatrixType laplace, massMatrix;
......
......@@ -259,7 +259,7 @@ int main (int argc, char *argv[]) try
std::cout << "Energy: " << assembler.computeEnergy(x) << std::endl;
//exit(0);
solver.setInitialSolution(x);
solver.setInitialIterate(x);
solver.solve();
x = solver.getSol();
......
......@@ -74,7 +74,7 @@ int main (int argc, char *argv[]) try
// Initial solution
// //////////////////////////
for (int i=0; i<x.size(); i++) {
for (size_t i=0; i<x.size(); i++) {
x[i].r[0] = 0;
x[i].r[1] = 0;
x[i].r[2] = double(i)/(x.size()-1);
......@@ -158,7 +158,7 @@ int main (int argc, char *argv[]) try
std::cout << "Energy: " << rodAssembler.computeEnergy(x) << std::endl;
rodSolver.setInitialSolution(x);
rodSolver.setInitialIterate(x);
rodSolver.solve();
x = rodSolver.getSol();
......@@ -217,7 +217,7 @@ int main (int argc, char *argv[]) try
FILE* fp = fopen(iSolFilename, "rb");
if (!fp)
DUNE_THROW(IOError, "Couldn't open intermediate solution '" << iSolFilename << "'");
for (int j=0; j<intermediateSolution.size(); j++) {
for (size_t j=0; j<intermediateSolution.size(); j++) {
fread(&intermediateSolution[j].r, sizeof(double), 3, fp);
fread(&intermediateSolution[j].q, sizeof(double), 4, fp);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment