From ed5b53230ae2b982becabca0bceb627e63b29110 Mon Sep 17 00:00:00 2001 From: absingh <absingh@mpi-cbg.de> Date: Tue, 31 Mar 2020 14:59:37 +0200 Subject: [PATCH] changes --- src/DCPSE_op/DCPSE_op.hpp | 4 ++-- src/DCPSE_op/DCPSE_op_test2.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/DCPSE_op/DCPSE_op.hpp b/src/DCPSE_op/DCPSE_op.hpp index abe53792..9ca49ba1 100644 --- a/src/DCPSE_op/DCPSE_op.hpp +++ b/src/DCPSE_op/DCPSE_op.hpp @@ -576,9 +576,9 @@ public: auto k = dcp[i].getIndexNN(key,j); - cols[p_map. template getProp<0>(k)*Sys_eqs::nvar + comp] += coeff_dc * coeff / dcp[i].getEpsilonPrefactor(key); + cols[p_map. template getProp<0>(k)*Sys_eqs::nvar + comp] += o1.value(k)[i]*coeff_dc * coeff / dcp[i].getEpsilonPrefactor(key); - cols[p_map. template getProp<0>(key)*Sys_eqs::nvar + comp] += dcp[i].getSign() * coeff_dc * coeff / dcp[i].getEpsilonPrefactor(key); + cols[p_map. template getProp<0>(key)*Sys_eqs::nvar + comp] += o1.value(key)[i]*dcp[i].getSign() * coeff_dc * coeff / dcp[i].getEpsilonPrefactor(key); } } } diff --git a/src/DCPSE_op/DCPSE_op_test2.cpp b/src/DCPSE_op/DCPSE_op_test2.cpp index 029d1316..dd5e6c0a 100644 --- a/src/DCPSE_op/DCPSE_op_test2.cpp +++ b/src/DCPSE_op/DCPSE_op_test2.cpp @@ -196,7 +196,7 @@ BOOST_AUTO_TEST_SUITE(dcpse_op_suite_tests2) auto Stokes2 = Adv(V[1],V_star[1])-nu*Lap(V_star[1]); Solver.impose(Stokes1,bulk,RHS[0],vx); Solver.impose(Stokes2,bulk,RHS[1],vy); - Solver.impose(V_star[0], up_p,1,vx); + Solver.impose(V_star[0], up_p,1.0,vx); Solver.impose(V_star[1], up_p,0,vy); Solver.impose(V_star[0], r_p, 0,vx); Solver.impose(V_star[1], r_p, 0,vy); -- GitLab