From 065e34497219c613d36e5464578cc58dc4f9b656 Mon Sep 17 00:00:00 2001 From: Soeren Peters <peters@irmb.tu-bs.de> Date: Mon, 21 Sep 2020 10:26:59 +0200 Subject: [PATCH] Remove commments. --- src/basics/Core/DataTypes.h | 1 - src/basics/Core/RealConstants.h | 2 +- src/basics/Core/Timer/Timer.h | 1 - src/basics/Core/Timer/TimerImp.h | 1 - .../BoundaryConditions/BCArray3D.cpp | 3 ++- .../BoundaryConditions/BCFunction.h | 2 +- src/cpu/VirtualFluidsCore/CMakeLists.txt | 12 +----------- 7 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/basics/Core/DataTypes.h b/src/basics/Core/DataTypes.h index b65f3344c..67a17fa76 100644 --- a/src/basics/Core/DataTypes.h +++ b/src/basics/Core/DataTypes.h @@ -3,7 +3,6 @@ #include <string> -#include "VirtualFluidsDefinitions.h" #ifdef VF_DOUBLE_ACCURACY typedef double real; diff --git a/src/basics/Core/RealConstants.h b/src/basics/Core/RealConstants.h index a555d7ee2..b63ff444f 100644 --- a/src/basics/Core/RealConstants.h +++ b/src/basics/Core/RealConstants.h @@ -1,7 +1,7 @@ #ifndef REAL_CONSTANT_H #define REAL_CONSTANT_H -#include "VirtualFluidsDefinitions.h" + #ifdef VF_DOUBLE_ACCURACY #define c1o2 0.5 diff --git a/src/basics/Core/Timer/Timer.h b/src/basics/Core/Timer/Timer.h index 53c79e761..9607cc5f9 100644 --- a/src/basics/Core/Timer/Timer.h +++ b/src/basics/Core/Timer/Timer.h @@ -1,7 +1,6 @@ #ifndef TIMER_H #define TIMER_H -//#include "VirtualFluidsDefinitions.h" #include "basics_export.h" #include "DataTypes.h" diff --git a/src/basics/Core/Timer/TimerImp.h b/src/basics/Core/Timer/TimerImp.h index d45691079..20a119680 100644 --- a/src/basics/Core/Timer/TimerImp.h +++ b/src/basics/Core/Timer/TimerImp.h @@ -5,7 +5,6 @@ #include <chrono> -//#include "VirtualFluidsDefinitions.h" #include "DataTypes.h" diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.cpp index de72e4e1e..76094ba5b 100644 --- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.cpp +++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.cpp @@ -232,4 +232,5 @@ void BCArray3D::deleteBC(std::size_t x1, std::size_t x2, std::size_t x3) //"delete" element bcvector[index] = SPtr<BoundaryConditions>(); - } \ No newline at end of file + } + \ No newline at end of file diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.h index af9a63031..96102f82a 100644 --- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.h +++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.h @@ -71,7 +71,7 @@ public: void setFunction(const std::string& functionstring) { this->function.SetExpr(functionstring); } void setFunction(const double& constVelocity) { std::stringstream dummy; dummy<<constVelocity; function.SetExpr(dummy.str()); } void setStartTime(const double& starttime) {this->starttime = starttime; } - void setEndTime(const double& starttime) {this->endtime = endtime; } + void setEndTime(const double& endtime) {this->endtime = endtime; } mu::Parser& getFunction() { return function; } const mu::Parser& getFunction() const { return function; } diff --git a/src/cpu/VirtualFluidsCore/CMakeLists.txt b/src/cpu/VirtualFluidsCore/CMakeLists.txt index c17c6fba3..cc25a66d6 100644 --- a/src/cpu/VirtualFluidsCore/CMakeLists.txt +++ b/src/cpu/VirtualFluidsCore/CMakeLists.txt @@ -1,16 +1,6 @@ -IF(${USE_GCC}) - SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} rt) - SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} gomp) -ENDIF() -IF(${USE_INTEL}) - SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} irc) - SET(CAB_ADDITIONAL_LINK_FLAGS ${CAB_ADDITIONAL_LINK_FLAGS} parallel) -ENDIF() - - -vf_add_library(BUILDTYPE static DEPENDS basics muparser ${CAB_ADDITIONAL_LINK_LIBRARIES}) +vf_add_library(BUILDTYPE static DEPENDS basics muparser) vf_get_library_name(library_name) -- GitLab