Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
VirtualFluids
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
iRMB
VirtualFluids
Commits
d52ccb52
Commit
d52ccb52
authored
5 years ago
by
LEGOLAS\lenz
Browse files
Options
Downloads
Patches
Plain Diff
adds some clarifications in CMake template
parent
f3e10ded
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+16
-13
16 additions, 13 deletions
CMakeLists.txt
targets/apps/LBM/TGV_3D/TGV_3D.cpp
+22
-6
22 additions, 6 deletions
targets/apps/LBM/TGV_3D/TGV_3D.cpp
with
38 additions
and
19 deletions
CMakeLists.txt
+
16
−
13
View file @
d52ccb52
...
...
@@ -45,7 +45,7 @@ include(${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/general/FileUtilities.cmake)
### PROJECT SETTINGS ###
#############################################################
project
(
VirtualFluidsG
puCodes
)
project
(
VirtualFluidsG
PU
)
set
(
CMAKE_RUNTIME_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
/bin
)
set
(
CMAKE_INCLUDE_CURRENT_DIR ON
)
...
...
@@ -76,13 +76,14 @@ ENDIF(MSVC)
#############################################################
### OPTIONS ###
#############################################################
option
(
BUILD_SHARED_LIBS
"Build shared libraries"
ON
)
option
(
HULC.BUILD_VF_GPU
"Build VirtualFluids GPU"
ON
)
option
(
HULC.BUILD_VF_GKS
"Build VirtualFluids GKS"
OFF
)
option
(
HULC.BUILD_JSONCPP
"Builds json cpp "
ON
)
option
(
HULC.BUILD_NUMERIC_TESTS
"Build numeric tests"
ON
)
option
(
BUILD_SHARED_LIBS
"Build shared libraries"
ON
)
option
(
VF.BUILD_VF_GPU
"Build VirtualFluids GPU"
ON
)
option
(
VF.BUILD_VF_GKS
"Build VirtualFluids GKS"
OFF
)
option
(
VF.BUILD_VF_TRAFFIC
"Build VirtualFluids Traffic"
OFF
)
option
(
VF.BUILD_JSONCPP
"Builds json cpp "
OFF
)
option
(
VF.BUILD_NUMERIC_TESTS
"Build numeric tests"
OFF
)
option
(
VF_DOUBLE_ACCURACY
"Build shared libraries"
OFF
)
option
(
VF
.BUILD
_DOUBLE_ACCURACY
"Use double accuracy"
OFF
)
#############################################################
...
...
@@ -124,7 +125,7 @@ add_subdirectory(targets/libs/GridGenerator)
### Virtual Fluids GPU ###
#############################################################
IF
(
HULC
.BUILD_VF_GPU
)
IF
(
VF
.BUILD_VF_GPU
)
add_subdirectory
(
targets/libs/VirtualFluids_GPU
)
#add_subdirectory(targets/apps/LBM/lbmTest)
...
...
@@ -143,7 +144,7 @@ ENDIF()
### Virtual Fluids GKS ###
#############################################################
IF
(
HULC
.BUILD_VF_GKS
)
IF
(
VF
.BUILD_VF_GKS
)
add_subdirectory
(
targets/libs/GksMeshAdapter
)
add_subdirectory
(
targets/libs/GksVtkAdapter
)
...
...
@@ -192,7 +193,7 @@ ENDIF()
#############################################################
### JSONCPP ###
#############################################################
IF
(
NOT
HULC
.BUILD_JSONCPP
)
IF
(
NOT
VF
.BUILD_JSONCPP
)
MESSAGE
(
STATUS
"Build Input Project without JsonCpp."
)
ELSE
()
add_subdirectory
(
3rdParty/jsoncpp
)
...
...
@@ -203,7 +204,7 @@ ENDIF()
### Numeric Tests ###
#############################################################
if
(
HULC
.BUILD_NUMERIC_TESTS
)
if
(
VF
.BUILD_NUMERIC_TESTS
)
add_subdirectory
(
3rdParty/fftw/fftw-3.3.7
)
add_subdirectory
(
3rdParty/googletest
)
add_subdirectory
(
targets/tests/NumericalTests
)
...
...
@@ -214,6 +215,8 @@ endif()
### Annas Traffic Sim ###
#############################################################
add_subdirectory
(
targets/libs/Traffic
)
if
(
VF.BUILD_VF_TRAFFIC
)
add_subdirectory
(
targets/libs/Traffic
)
add_subdirectory
(
targets/apps/LBM/TrafficTest
)
\ No newline at end of file
add_subdirectory
(
targets/apps/LBM/TrafficTest
)
endif
()
\ No newline at end of file
This diff is collapsed.
Click to expand it.
targets/apps/LBM/TGV_3D/TGV_3D.cpp
+
22
−
6
View file @
d52ccb52
...
...
@@ -97,7 +97,7 @@ std::string kernel( "CumulantK17Comp" );
std
::
string
path
(
"F:/Work/Computations/out/TaylorGreen3DNew/"
);
//LEGOLAS
//std::string path("E:/DrivenCavity/results/"); //TESLA03
std
::
string
simulationName
(
"T
aylorGreen
3D"
);
std
::
string
simulationName
(
"T
GV_
3D"
);
//////////////////////////////////////////////////////////////////////////
void
multipleLevel
(
const
std
::
string
&
configPath
)
...
...
@@ -176,14 +176,30 @@ void multipleLevel(const std::string& configPath)
// para->setOutputPrefix(_prefix.str());
// para->setFName(_path.str() + "/" + _prefix.str());
std
::
stringstream
_path
;
//////////////////////////////////////////////////////////////////////////
{
std
::
stringstream
_path
;
_path
<<
path
;
_path
<<
kernel
;
_path
<<
path
;
_path
<<
kernel
;
if
(
useLimiter
)
_path
<<
"_Limiter"
;
if
(
useLimiter
)
_path
<<
"_Limiter"
;
path
=
_path
.
str
();
path
=
_path
.
str
();
}
//////////////////////////////////////////////////////////////////////////
{
std
::
stringstream
_simulationName
;
_simulationName
<<
simulationName
;
_simulationName
<<
"_nx_"
<<
nx
;
_simulationName
<<
"_dtPerL_"
<<
dtPerL
<<
"_"
;
simulationName
=
_simulationName
.
str
();
}
//////////////////////////////////////////////////////////////////////////
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment