diff --git a/src/DCPSE_op/DCPSE_op_test.cpp b/src/DCPSE_op/DCPSE_op_test.cpp index e4c66f742c1a980baeca935ef4ad1dea22fdfa73..b56332d5c6ab975e750fdd09241684f83cc20a33 100644 --- a/src/DCPSE_op/DCPSE_op_test.cpp +++ b/src/DCPSE_op/DCPSE_op_test.cpp @@ -17,8 +17,7 @@ #include "DCPSE_Solver.hpp" #include "Operators/Vector/vector_dist_operators.hpp" #include "Vector/vector_dist_subset.hpp" -#include "EqnsStructPetsc.hpp" -//#include "EqnsStructEigen.hpp" +#include "EqnsStruct.hpp" const bool equations3d1::boundary[] = {NON_PERIODIC, NON_PERIODIC}; const bool equations3d3::boundary[] = {NON_PERIODIC, NON_PERIODIC}; const bool equations2d1::boundary[] = {NON_PERIODIC, NON_PERIODIC}; diff --git a/src/DCPSE_op/DCPSE_op_test2.cpp b/src/DCPSE_op/DCPSE_op_test2.cpp index c53812a3ff52ddf1b96803256c13cd0a91ca8390..0e17a51d18c5b1d98c7cc4834f8f085a664bff6f 100644 --- a/src/DCPSE_op/DCPSE_op_test2.cpp +++ b/src/DCPSE_op/DCPSE_op_test2.cpp @@ -18,8 +18,6 @@ #include "Operators/Vector/vector_dist_operators.hpp" #include "Vector/vector_dist_subset.hpp" #include "EqnsStruct.hpp" -//#include "EqnsStructEigen.hpp" - //int vector_dist_expression_op<void,void,VECT_COPY_N_TO_N>::i = 0; //int vector_dist_expression_op<void,void,VECT_COPY_1_TO_N>::i = 0; @@ -182,7 +180,7 @@ BOOST_AUTO_TEST_SUITE(dcpse_op_suite_tests2) tt.start(); Solver.solve_with_solver(solverPetsc,V_star[0],V_star[1]); tt.stop(); - std::cout << "Stokes Solved in " <<tt.getwct()<< std::endl; + std::cout << "Stokes Solved in " <<tt.getwct()<< " seconds."<< std::endl; Particles.ghost_get<2>(); RHS=-Div(V_star); DCPSE_scheme<equations2d1E,decltype(Particles)> SolverH( Particles,options_solver::LAGRANGE_MULTIPLIER); @@ -199,7 +197,7 @@ BOOST_AUTO_TEST_SUITE(dcpse_op_suite_tests2) tt.stop(); Particles.ghost_get<5>(); - std::cout << "Helmholtz Solved in " << tt.getwct() << std::endl; + std::cout << "Helmholtz Solved in " << tt.getwct()<< " seconds." << std::endl; V=V_star+Grad(H); for(int j=0;j<up_p.size();j++) diff --git a/src/DCPSE_op/DCPSE_op_test3d.cpp b/src/DCPSE_op/DCPSE_op_test3d.cpp index a7af222efdd0fac42aec4cf2360d607880d285d4..5f755e6e784dd2231a2b8a3110c5d0f33a50ae1d 100644 --- a/src/DCPSE_op/DCPSE_op_test3d.cpp +++ b/src/DCPSE_op/DCPSE_op_test3d.cpp @@ -17,7 +17,7 @@ #include "DCPSE_Solver.hpp" #include "Operators/Vector/vector_dist_operators.hpp" #include "Vector/vector_dist_subset.hpp" -#include "EqnsStructPetsc.hpp" +#include "EqnsStruct.hpp" //template<typename T> //struct Debug;