From 88561033eec82568505c1a26ca3e4c3cb54ef616 Mon Sep 17 00:00:00 2001
From: absingh <absingh@mpi-cbg.de>
Date: Wed, 22 Apr 2020 11:48:53 +0200
Subject: [PATCH] Eqns struct update
---
src/DCPSE_op/DCPSE_op_test.cpp | 3 +--
src/DCPSE_op/DCPSE_op_test2.cpp | 6 ++----
src/DCPSE_op/DCPSE_op_test3d.cpp | 2 +-
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/DCPSE_op/DCPSE_op_test.cpp b/src/DCPSE_op/DCPSE_op_test.cpp
index e4c66f74..b56332d5 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 c53812a3..0e17a51d 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 a7af222e..5f755e6e 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;
--
GitLab