From 81cffe8c2c354bf1df2830b4ef5e2492f499f355 Mon Sep 17 00:00:00 2001 From: Sebastian Aland <sebastian.aland@yahoo.com> Date: Mon, 7 Jan 2013 08:51:04 +0000 Subject: [PATCH] minor changes on extensions/demo/NavierStokesCahnHilliard --- extensions/demo/NavierStokesCahnHilliard_PC/run | 8 +++++--- extensions/demo/NavierStokesCahnHilliard_PC/src/nsch.cc | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/extensions/demo/NavierStokesCahnHilliard_PC/run b/extensions/demo/NavierStokesCahnHilliard_PC/run index 415d3d47..3a1c54a4 100644 --- a/extensions/demo/NavierStokesCahnHilliard_PC/run +++ b/extensions/demo/NavierStokesCahnHilliard_PC/run @@ -1,7 +1,7 @@ # This demo implements the Navier-Stokes-Cahn-Hilliard Benchmark from # S. Aland, A. Voigt. Benchmark computations of diffuse-interface models for two-dimensional bubble dynamics. Int. J. Num. Meth. Fluids (2012) -output="output2_sequentiell" +output="output" initfile="init/nsch.dat.2d" mkdir $output cd $output @@ -11,7 +11,9 @@ cp ../$initfile . mpiexec -n 2 ../nsch ../$initfile -ns_ksp_atol 1e-9 -ns_ksp_rtol 0 -ch_ksp_atol 1e-9 -ch_ksp_rtol 0 -laplace_pc_type hypre -laplace_pc_hypre_boomeramg_relax_type_coarse symmetric-SOR/Jacobi -# sequentiell (solver noch auf umfpack stellen) -> #../drivenCavity ../$initfile +# sequentiell (solver noch auf umfpack stellen) -> #../nsch ../$initfile + + +###### zum parallel debugging ###### mpiexec -n 2 valgrind --tool=memcheck -q --num-callers=20 --log-file=valgrind.log.%p ../drivenCavity ../$initfile -malloc off -start_in_debugger -###### -ksp_type richardson -pc_type lu -pc_factor_mat_solver_package mumps diff --git a/extensions/demo/NavierStokesCahnHilliard_PC/src/nsch.cc b/extensions/demo/NavierStokesCahnHilliard_PC/src/nsch.cc index 1fa38782..b8ea50f2 100644 --- a/extensions/demo/NavierStokesCahnHilliard_PC/src/nsch.cc +++ b/extensions/demo/NavierStokesCahnHilliard_PC/src/nsch.cc @@ -164,7 +164,7 @@ int main(int argc, char** argv) CahnHilliardNavierStokes_<CahnHilliardPC,MyNavierStokes_PC> mainProb("main", &chProb, &nsProb); #else CahnHilliard_ chProb("ch"); - MyNavierStokes_PC nsProb("ns"); + MyNavierStokes nsProb("ns"); CahnHilliardNavierStokes_<CahnHilliard_,MyNavierStokes> mainProb("main", &chProb, &nsProb); #endif -- GitLab