diff --git a/src/paper_thinstrip_mixed/chns.ini b/src/paper_thinstrip_mixed/chns.ini index 79e3111d6b973a6750a21dc76ac3cfd907af7369..1d14a993120d0753f0053d22175ac302280ad3ff 100644 --- a/src/paper_thinstrip_mixed/chns.ini +++ b/src/paper_thinstrip_mixed/chns.ini @@ -17,7 +17,7 @@ filename = grids/rectangle_periodic_coarse.msh #YScalingFactor = 0.5 YScaling = 1 YResolution = 200 -XResolution = 100 +XResolution = 400 [output] filename = comparison_hyperbolic @@ -33,8 +33,8 @@ Sigma3=1 [Time] tMax = 1 -dt = 0.001 -dtMax = 0.001 +dt = 0.0001 +dtMax = 0.0001 dtMin = 0.000015 saveintervall = 0.005 #dtIncreaseFactor=1.2 diff --git a/src/paper_thinstrip_mixed/driver_mixed.hh b/src/paper_thinstrip_mixed/driver_mixed.hh index 57fb59ae8d79f6fabc00f9a17f0600c6ab8674cd..69c830d28659839523879c0ec1b1757f41214fd4 100644 --- a/src/paper_thinstrip_mixed/driver_mixed.hh +++ b/src/paper_thinstrip_mixed/driver_mixed.hh @@ -121,8 +121,8 @@ public: nsGo = std::make_unique<NS_GO>(gfs.ns,gfs.nsCC,gfs.ns,gfs.nsCC,*nsLop,mbe); chGo = std::make_unique<CH_GO>(gfs.ch,gfs.chCC,gfs.ch,gfs.chCC,*chLop,mbe); // Linear solver - chLs = std::make_unique<CH_LS>(*chGo,500,100,3,1); - nsLs = std::make_unique<NS_LS>(*nsGo,1000,200,3,1); + chLs = std::make_unique<CH_LS>(*chGo,500,100,3,0); + nsLs = std::make_unique<NS_LS>(*nsGo,1000,200,3,0); // Nonlinear solver nsNewton = std::make_unique<NS_Newton>(*nsGo,nsV,*nsLs); @@ -131,8 +131,8 @@ public: chNewton = std::make_unique<CH_Newton>(*chGo,chV,*chLs); chNewton->setParameters(param.chNewtonTree); - printVector(chV,10,"chV"); - printVector(nsV,10,"nsV"); + //printVector(chV,10,"chV"); + //printVector(nsV,10,"nsV"); updatePhiC(); updatePhiSolid(); @@ -174,7 +174,7 @@ public: Dune::FieldVector<double,1> integral; Dune::PDELab::integrateGridFunction(productFunction,integral,2); kf = integral[0]; - std::cout << "Kf = " << kf << std::endl; + //std::cout << "Kf = " << kf << std::endl; } void updatePhiC() diff --git a/src/paper_thinstrip_mixed/tmixed_upscaledc.hh b/src/paper_thinstrip_mixed/tmixed_upscaledc.hh index 0dc9ddac24e86f07bb01d89c030ff24871448cae..83aa75a676b72c1e6b21af5ac3dfee6ed4aa85f6 100644 --- a/src/paper_thinstrip_mixed/tmixed_upscaledc.hh +++ b/src/paper_thinstrip_mixed/tmixed_upscaledc.hh @@ -146,7 +146,7 @@ template<typename Param, typename PAdaptor, typename CGFS, typename CContainer, // contribution to residual on inside and outside elements auto dudn = (outsideC-insideC)/distance; - RF peclet = 5; + RF peclet = 5; //TODO THIS HAS TO BE FIXED IN OPTIONS!!!!!!!!!! auto DiffusionCoeff = 1/peclet * 0.5*(pAdapt.evalPhiC(inside_global) + pAdapt.evalPhiC(outside_global)); r_i.accumulate(lfsv_i,0,-dudn*DiffusionCoeff + flux); r_o.accumulate(lfsv_o,0, dudn*DiffusionCoeff - flux);