From 1cc7d867530b464911e89bbbba95954ccceb4553 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Wed, 10 Jan 2018 12:28:06 +0100
Subject: [PATCH] - remove app
---
src/VirtualFluids_GPU/Application/App.cpp | 26 ---------------
src/VirtualFluids_GPU/Application/App.h | 32 -------------------
.../Application/package.include | 0
.../Calculation/ForceCalculations.h | 1 -
src/VirtualFluids_GPU/LBM/Simulation.cpp | 7 ++++
src/VirtualFluids_GPU/LBM/Simulation.h | 8 +++--
targets/apps/HULC/3rdPartyLinking.cmake | 2 ++
targets/apps/HULC/main.cpp | 17 ++++++++--
8 files changed, 28 insertions(+), 65 deletions(-)
delete mode 100644 src/VirtualFluids_GPU/Application/App.cpp
delete mode 100644 src/VirtualFluids_GPU/Application/App.h
delete mode 100644 src/VirtualFluids_GPU/Application/package.include
diff --git a/src/VirtualFluids_GPU/Application/App.cpp b/src/VirtualFluids_GPU/Application/App.cpp
deleted file mode 100644
index 38ac5d546..000000000
--- a/src/VirtualFluids_GPU/Application/App.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "LBM/LB.h"
-#include "App.h"
-#include "Communication/Communicator.h"
-#include "LBM/Simulation.h"
-
-App* App::instanz = 0;
-App* App::getInstanz()
-{
- if( instanz == 0 )
- instanz = new App();
- return instanz;
-}
-void App::run(std::string &cstr)
-{
- try
- {
- Simulation sim;
- sim.init(cstr);
- sim.run();
- }
- catch (std::string e)
- {
- std::cout << e << std::flush;
- //MPI_Abort(MPI_COMM_WORLD, -1);
- }
-}
diff --git a/src/VirtualFluids_GPU/Application/App.h b/src/VirtualFluids_GPU/Application/App.h
deleted file mode 100644
index ee87221fe..000000000
--- a/src/VirtualFluids_GPU/Application/App.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef _APP_H_
-#define _APP_H_
-#include <string>
-
-#include <VirtualFluidsDefinitions.h>
-
-////Gemeinsame Variablen
-//Buffer2D <float> sbuf_t;
-//Buffer2D <float> rbuf_t;
-//Buffer2D <float> sbuf_b;
-//Buffer2D <float> rbuf_b;
-//
-////for MPI
-//Communicator* comm;
-//int numprocs, myid;
-//
-//WriteLog output;
-
-class App
-{
-public:
- VF_PUBLIC static App* getInstanz();
- VF_PUBLIC void run(std::string &cstr);
-protected:
-
-private:
- static App* instanz;
- App(){}
- App(const App&);
-};
-
-#endif
diff --git a/src/VirtualFluids_GPU/Application/package.include b/src/VirtualFluids_GPU/Application/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/VirtualFluids_GPU/Calculation/ForceCalculations.h b/src/VirtualFluids_GPU/Calculation/ForceCalculations.h
index 051330081..078cbddb5 100644
--- a/src/VirtualFluids_GPU/Calculation/ForceCalculations.h
+++ b/src/VirtualFluids_GPU/Calculation/ForceCalculations.h
@@ -2,7 +2,6 @@
#define FORCE_CALCULATIONS_H
#include "Parameter/Parameter.h"
-#include "Utilities/StringUtil.hpp"
#include "basics/utilities/UbSystem.h"
#include <iostream>
diff --git a/src/VirtualFluids_GPU/LBM/Simulation.cpp b/src/VirtualFluids_GPU/LBM/Simulation.cpp
index ee82a1ae0..f3cebe10a 100644
--- a/src/VirtualFluids_GPU/LBM/Simulation.cpp
+++ b/src/VirtualFluids_GPU/LBM/Simulation.cpp
@@ -54,11 +54,14 @@
Simulation::Simulation(void)
{
+
}
Simulation::~Simulation(void)
{
+
}
+
void Simulation::init(std::string &cstr)
{
comm = Communicator::getInstanz();
@@ -318,10 +321,12 @@ void Simulation::init(std::string &cstr)
output << "used Device Memory: " << para->getMemsizeGPU() / 1000000.0 << " MB\n";
//////////////////////////////////////////////////////////////////////////
}
+
void Simulation::bulk()
{
}
+
void Simulation::run()
{
double ftimeE, ftimeS, fnups, durchsatz;
@@ -2632,6 +2637,7 @@ void Simulation::run()
}
//////////////////////////////////////////////////////////////////////////
}
+
void Simulation::porousMedia()
{
double porosity, darcySI, forchheimerSI;
@@ -2722,6 +2728,7 @@ void Simulation::porousMedia()
//////////////////////////////////////////////////////////////////////////
}
+
void Simulation::definePMarea(PorousMedia* pMedia)
{
unsigned int counter = 0;
diff --git a/src/VirtualFluids_GPU/LBM/Simulation.h b/src/VirtualFluids_GPU/LBM/Simulation.h
index b9aff57d0..fcb4973a0 100644
--- a/src/VirtualFluids_GPU/LBM/Simulation.h
+++ b/src/VirtualFluids_GPU/LBM/Simulation.h
@@ -1,8 +1,9 @@
#ifndef _SIMULATION_H_
#define _SIMULATION_H_
+#include <VirtualFluidsDefinitions.h>
+
#include "Output/LogWriter.hpp"
-#include "Communication/Communicator.h"
#include "Utilities/Buffer2D.hpp"
//#include "Input/ConfigFile.h"
#include "Calculation/ForceCalculations.h"
@@ -10,12 +11,13 @@
#include "Parameter/Parameter.h"
#include "Restart/RestartPostprocessor.h"
#include "Restart/RestartObject.h"
-#include "Utilities/StringUtil.hpp"
#include "LBM/LB.h"
//#include "LBM/D3Q27.h"
+class Communicator;
+
-class Simulation
+class VF_PUBLIC Simulation
{
public:
Simulation(void);
diff --git a/targets/apps/HULC/3rdPartyLinking.cmake b/targets/apps/HULC/3rdPartyLinking.cmake
index c8c5c6b37..8b3f2165f 100644
--- a/targets/apps/HULC/3rdPartyLinking.cmake
+++ b/targets/apps/HULC/3rdPartyLinking.cmake
@@ -2,6 +2,8 @@ include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
linkMPI(${targetName})
include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Cuda/Link.cmake)
linkCuda(${targetName})
+include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
+linkBoost(${targetName} "serialization")
if(HULC.BUILD_JSONCPP)
include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/JsonCpp/Link.cmake)
diff --git a/targets/apps/HULC/main.cpp b/targets/apps/HULC/main.cpp
index b9ab13fce..4bc2a1704 100644
--- a/targets/apps/HULC/main.cpp
+++ b/targets/apps/HULC/main.cpp
@@ -9,10 +9,11 @@
#include <string>
#include <iostream>
-#include "VirtualFluids_GPU/Application/App.h"
+#include "LBM/Simulation.h"
using namespace std;
-int main( int argc, char* argv[]){
+int main( int argc, char* argv[])
+{
MPI_Init(&argc, &argv);
string str, str2;
if ( argv != NULL )
@@ -21,7 +22,17 @@ int main( int argc, char* argv[]){
if (argc > 1)
{
str2 = static_cast<string>(argv[1]);
- App::getInstanz()->run(str2);
+ try
+ {
+ Simulation sim;
+ sim.init(str2);
+ sim.run();
+ }
+ catch (std::string e)
+ {
+ std::cout << e << std::flush;
+ //MPI_Abort(MPI_COMM_WORLD, -1);
+ }
}
else
{
--
GitLab