From e6f7c8191a703198b0b797bfd627b6c89e7bf341 Mon Sep 17 00:00:00 2001
From: Sebastian Eibl <sebastian.eibl@fau.de>
Date: Fri, 12 Feb 2021 10:02:04 +0100
Subject: [PATCH] changed folder name from VBondModel to cnt
---
.../kernel/{VBondModel => cnt}/ViscousDamping.h | 4 ++--
src/mesa_pd/kernel/{VBondModel => cnt}/WallContact.h | 4 ++--
tests/mesa_pd/CMakeLists.txt | 12 ++++++------
.../{VBondModel => cnt}/ViscousDamping.test.cpp | 4 ++--
.../kernel/{VBondModel => cnt}/WallContact.test.cpp | 4 ++--
5 files changed, 14 insertions(+), 14 deletions(-)
rename src/mesa_pd/kernel/{VBondModel => cnt}/ViscousDamping.h (98%)
rename src/mesa_pd/kernel/{VBondModel => cnt}/WallContact.h (98%)
rename tests/mesa_pd/kernel/{VBondModel => cnt}/ViscousDamping.test.cpp (96%)
rename tests/mesa_pd/kernel/{VBondModel => cnt}/WallContact.test.cpp (97%)
diff --git a/src/mesa_pd/kernel/VBondModel/ViscousDamping.h b/src/mesa_pd/kernel/cnt/ViscousDamping.h
similarity index 98%
rename from src/mesa_pd/kernel/VBondModel/ViscousDamping.h
rename to src/mesa_pd/kernel/cnt/ViscousDamping.h
index 9f9fe2c69..5165c0c8d 100644
--- a/src/mesa_pd/kernel/VBondModel/ViscousDamping.h
+++ b/src/mesa_pd/kernel/cnt/ViscousDamping.h
@@ -34,7 +34,7 @@
namespace walberla {
namespace mesa_pd {
namespace kernel {
-namespace VBondModel {
+namespace cnt {
class ViscousDamping
{
@@ -71,7 +71,7 @@ inline void ViscousDamping::operator()(const size_t p_idx1,
}
-} //namespace VBondModel
+} //namespace cnt
} //namespace kernel
} //namespace mesa_pd
} //namespace walberla
\ No newline at end of file
diff --git a/src/mesa_pd/kernel/VBondModel/WallContact.h b/src/mesa_pd/kernel/cnt/WallContact.h
similarity index 98%
rename from src/mesa_pd/kernel/VBondModel/WallContact.h
rename to src/mesa_pd/kernel/cnt/WallContact.h
index 24d153ca5..5c221025a 100644
--- a/src/mesa_pd/kernel/VBondModel/WallContact.h
+++ b/src/mesa_pd/kernel/cnt/WallContact.h
@@ -34,7 +34,7 @@
namespace walberla {
namespace mesa_pd {
namespace kernel {
-namespace VBondModel {
+namespace cnt {
/**
* Repulsive wall interaction kernel.
@@ -107,7 +107,7 @@ inline void WallContact::operator()(const size_t p_idx,
addForceAtomic( p_idx, ac, Vec3(0_r, 0_r, F_) );
}
-} //namespace VBondModel
+} //namespace cnt
} //namespace kernel
} //namespace mesa_pd
} //namespace walberla
\ No newline at end of file
diff --git a/tests/mesa_pd/CMakeLists.txt b/tests/mesa_pd/CMakeLists.txt
index d84af9fb2..983cbca6e 100644
--- a/tests/mesa_pd/CMakeLists.txt
+++ b/tests/mesa_pd/CMakeLists.txt
@@ -93,6 +93,12 @@ waLBerla_execute_test( NAME MESA_PD_Kernel_CNT_VBondContact )
waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_VBondContactIntegration FILES kernel/cnt/VBondContactIntegration.test.cpp DEPENDS core )
waLBerla_execute_test( NAME MESA_PD_Kernel_CNT_VBondContactIntegration )
+waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_ViscousDamping FILES kernel/cnt/ViscousDamping.test.cpp DEPENDS core )
+waLBerla_execute_test( NAME MESA_PD_Kernel_CNT_ViscousDamping )
+
+waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_WallContact FILES kernel/cnt/WallContact.test.cpp DEPENDS core )
+waLBerla_execute_test( NAME MESA_PD_Kernel_CNT_WallContact )
+
waLBerla_compile_test( NAME MESA_PD_Kernel_CoefficientOfRestitutionSD FILES kernel/CoefficientOfRestitutionSD.cpp DEPENDS core )
waLBerla_execute_test( NAME MESA_PD_Kernel_CoefficientOfRestitutionSDEuler COMMAND $<TARGET_FILE:MESA_PD_Kernel_CoefficientOfRestitutionSD> )
waLBerla_execute_test( NAME MESA_PD_Kernel_CoefficientOfRestitutionSDVelocityVerlet COMMAND $<TARGET_FILE:MESA_PD_Kernel_CoefficientOfRestitutionSD> --useVV )
@@ -173,12 +179,6 @@ waLBerla_execute_test( NAME MESA_PD_Kernel_SyncNextNeighborsBlockForest PROCES
waLBerla_compile_test( NAME MESA_PD_Kernel_TemperatureIntegration FILES kernel/TemperatureIntegration.cpp DEPENDS core )
waLBerla_execute_test( NAME MESA_PD_Kernel_TemperatureIntegration )
-waLBerla_compile_test( NAME MESA_PD_Kernel_VBondModel_ViscousDamping FILES kernel/VBondModel/ViscousDamping.test.cpp DEPENDS core )
-waLBerla_execute_test( NAME MESA_PD_Kernel_VBondModel_ViscousDamping )
-
-waLBerla_compile_test( NAME MESA_PD_Kernel_VBondModel_WallContact FILES kernel/VBondModel/WallContact.test.cpp DEPENDS core )
-waLBerla_execute_test( NAME MESA_PD_Kernel_VBondModel_WallContact )
-
waLBerla_compile_test( NAME MESA_PD_Kernel_VelocityVerlet FILES kernel/VelocityVerlet.cpp DEPENDS core )
waLBerla_execute_test( NAME MESA_PD_Kernel_VelocityVerlet )
diff --git a/tests/mesa_pd/kernel/VBondModel/ViscousDamping.test.cpp b/tests/mesa_pd/kernel/cnt/ViscousDamping.test.cpp
similarity index 96%
rename from tests/mesa_pd/kernel/VBondModel/ViscousDamping.test.cpp
rename to tests/mesa_pd/kernel/cnt/ViscousDamping.test.cpp
index 8f54645ff..593ddecac 100644
--- a/tests/mesa_pd/kernel/VBondModel/ViscousDamping.test.cpp
+++ b/tests/mesa_pd/kernel/cnt/ViscousDamping.test.cpp
@@ -23,7 +23,7 @@
#include <mesa_pd/data/ParticleAccessor.h>
#include <mesa_pd/data/ParticleStorage.h>
-#include <mesa_pd/kernel/VBondModel/ViscousDamping.h>
+#include <mesa_pd/kernel/cnt/ViscousDamping.h>
#include <core/Environment.h>
#include <core/logging/Logging.h>
@@ -54,7 +54,7 @@ int main( int argc, char ** argv )
data::ParticleAccessor ac(ps);
//init kernels
- kernel::VBondModel::ViscousDamping damping(0.2_r,0.5_r);
+ kernel::cnt::ViscousDamping damping(0.2_r,0.5_r);
WALBERLA_CHECK_FLOAT_EQUAL(damping.getForceDampingFactor(),
0.2_r);
WALBERLA_CHECK_FLOAT_EQUAL(damping.getTorqueDampingFactor(),
diff --git a/tests/mesa_pd/kernel/VBondModel/WallContact.test.cpp b/tests/mesa_pd/kernel/cnt/WallContact.test.cpp
similarity index 97%
rename from tests/mesa_pd/kernel/VBondModel/WallContact.test.cpp
rename to tests/mesa_pd/kernel/cnt/WallContact.test.cpp
index f923ee41d..50165fd4f 100644
--- a/tests/mesa_pd/kernel/VBondModel/WallContact.test.cpp
+++ b/tests/mesa_pd/kernel/cnt/WallContact.test.cpp
@@ -23,7 +23,7 @@
#include <mesa_pd/data/ParticleAccessor.h>
#include <mesa_pd/data/ParticleStorage.h>
-#include <mesa_pd/kernel/VBondModel/WallContact.h>
+#include <mesa_pd/kernel/cnt/WallContact.h>
#include <core/Environment.h>
#include <core/logging/Logging.h>
@@ -50,7 +50,7 @@ int main( int argc, char ** argv )
p.setPosition(0, Vec3(0,0,0));
//init kernels
- kernel::VBondModel::WallContact wallContact(0_r);
+ kernel::cnt::WallContact wallContact(0_r);
auto calcForce = [&](const real_t zPos)
{
--
GitLab