diff --git a/nonlinelast.cc b/nonlinelast.cc index 5387bae4156f8625edd956ee87dce7ba785a54f8..d0ea39bfd7f6ad792bf097fe712117b40f5ff40b 100644 --- a/nonlinelast.cc +++ b/nonlinelast.cc @@ -106,8 +106,6 @@ int main (int argc, char *argv[]) try } // Uniform refine grid - // ///////////////////// - grid->setRefinementType(GridType::COPY); for (int i=0; i<minLevel; i++) grid->globalRefine(1); @@ -120,7 +118,6 @@ int main (int argc, char *argv[]) try //setup the monotone multigrid step // ///////////////////////////////////// - MonotoneMGStep<MatrixType,VectorType> mmgStep; mmgStep.setMGType(parameterSet.get("mu",1), parameterSet.get("preSmoothingSteps",3), @@ -134,7 +131,6 @@ int main (int argc, char *argv[]) try // Create a base solver #ifdef HAVE_IPOPT - QuadraticIPOptSolver<MatrixType,VectorType> baseSolver(parameterSet.get<field_type>("baseTolerance"), 100, NumProc::QUIET); #endif @@ -153,7 +149,7 @@ int main (int argc, char *argv[]) try // ///////////////////////////////// // Setup the nonlinear material // //////////////////////////////// - // + typedef P1NodalBasis<GridType::LeafGridView> P1Basis; P1Basis p1Basis(grid->leafGridView()); typedef NeoHookeanMaterial<P1Basis> MaterialType; @@ -255,7 +251,7 @@ int main (int argc, char *argv[]) try isNan = false; - auto disp = std::make_shared<BasisGridFunction>(p1Basis,deformedX); + auto disp = std::make_shared<BasisGridFunction>(p1Basis, deformedX); field_type eng = material.energy(disp); std::cout<<"Energy "<<eng<<std::endl; isNan |= std::isnan(eng); @@ -325,7 +321,6 @@ int main (int argc, char *argv[]) try FractionalMarkingStrategy<GridType>::mark(refinementIndicator, *grid, parameterSet.get<field_type>("refinementFraction")); - GridFunctionAdaptor<P1Basis> adaptor(p1Basis,true,true); grid->preAdapt(); @@ -362,6 +357,3 @@ int main (int argc, char *argv[]) try std::cout << e << std::endl; } - - -