Commit 3a6634a4 authored by Lukas Riedel's avatar Lukas Riedel

using default parameters for LS construction for debugging purposes. UG does not work

parent b570b50f
......@@ -68,7 +68,7 @@ void Simulation<Traits>::operator_setup ()
lscc = std::make_unique<LSCC>();
//Dune::PDELab::constraints(*lsgfs,*lscc,false);
//ls = std::make_unique<LS>(*gfs);
ls = std::make_unique<LS>(*igo,*cc,*lsgfs,*lscc,200,0);
ls = std::make_unique<LS>(*igo,*cc,*lsgfs,*lscc);
//ls = std::make_unique<LS>(5000,0);
pdesolver = std::make_unique<PDESOLVER>(*igo,*ls);
pdesolver->setParameters(inifile.sub("NewtonParameters"));
......
......@@ -26,11 +26,11 @@ using SimplexAdaptive = Dune::Dorie::BaseTraits<Dune::UGGrid,
template<int dim, int order>
using Cube = Dune::Dorie::BaseTraits<Dune::Dorie::YaspGrid,
Dune::GeometryType::BasicType::cube,dim,order,true,false>;
/*
template<int dim, int order>
using CubeAdaptive = Dune::Dorie::BaseTraits<Dune::UGGrid,
Dune::GeometryType::BasicType::cube,dim,order,true,true>;
*/
int main(int argc, char** argv)
{
try{
......
......@@ -63,16 +63,17 @@ std::shared_ptr<GridType> build_grid_gmsh (const Dune::ParameterTree& inifile, c
}
auto grid = std::make_shared<GridType>();
Dune::GridFactory<GridType> factory;
Dune::GridFactory<GridType> factory(grid.get());
if(helper.rank() == 0){
std::vector<int> boundary_index_map;
std::vector<int> element_index_map;
Dune::GmshReader<GridType>::read(factory,meshfilename,boundary_index_map,element_index_map,verbose>2?true:false,false);
}
grid.get() = factory.createGrid();
grid->globalRefine(level);
factory.createGrid();
grid->loadBalance();
grid->globalRefine(level);
if(verbose>0 && helper.rank()==0){
if (verbose>2) std::cout << "--- GMSH READER OUTPUT END ---" << std::endl;
......
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