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
5fd57428
Commit
5fd57428
authored
1 year ago
by
Anna Wellmann
Browse files
Options
Downloads
Patches
Plain Diff
Remove unused parameter and add const
parent
f75b7c67
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!296
Refactor Actuator Farm
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/gpu/core/PreCollisionInteractor/Actuator/ActuatorFarm.cu
+2
-2
2 additions, 2 deletions
src/gpu/core/PreCollisionInteractor/Actuator/ActuatorFarm.cu
src/gpu/core/PreCollisionInteractor/Actuator/ActuatorFarm.h
+4
-5
4 additions, 5 deletions
src/gpu/core/PreCollisionInteractor/Actuator/ActuatorFarm.h
with
6 additions
and
7 deletions
src/gpu/core/PreCollisionInteractor/Actuator/ActuatorFarm.cu
+
2
−
2
View file @
5fd57428
...
...
@@ -325,7 +325,7 @@ void ActuatorFarm::initBladeForces(CudaMemoryManager* cudaManager)
cudaManager
->
cudaCopyBladeForcesHtoD
(
this
);
}
void
ActuatorFarm
::
initBladeIndices
(
Parameter
*
para
,
CudaMemoryManager
*
cudaManager
)
void
ActuatorFarm
::
initBladeIndices
(
CudaMemoryManager
*
cudaManager
)
{
cudaManager
->
cudaAllocBladeIndices
(
this
);
...
...
@@ -440,7 +440,7 @@ std::string ActuatorFarm::getFilename(Parameter* para, uint t) const
return
para
->
getOutputPath
()
+
this
->
outputName
+
"_t_"
+
std
::
to_string
(
t
);
}
void
ActuatorFarm
::
write
(
const
std
::
string
&
filename
)
void
ActuatorFarm
::
write
(
const
std
::
string
&
filename
)
const
{
std
::
vector
<
std
::
string
>
dataNames
=
{
"bladeVelocitiesX"
,
...
...
This diff is collapsed.
Click to expand it.
src/gpu/core/PreCollisionInteractor/Actuator/ActuatorFarm.h
+
4
−
5
View file @
5fd57428
...
...
@@ -2,15 +2,14 @@
#define ActuatorFarm_H
#include
"PreCollisionInteractor/PreCollisionInteractor.h"
#include
"
basics/
constants/NumericConstant
s.h
"
#include
"
basics/
DataType
s.h
"
#include
<
basics/
DataType
s.h
>
#include
<
basics/
constants/NumericConstant
s.h
>
#include
<stdexcept>
class
Parameter
;
class
GridProvider
;
using
namespace
vf
::
basics
::
constant
;
class
ActuatorFarm
:
public
PreCollisionInteractor
{
public:
...
...
@@ -63,7 +62,7 @@ public:
this
->
tOut
=
tOut
;
}
void
write
(
const
std
::
string
&
filename
);
void
write
(
const
std
::
string
&
filename
)
const
;
real
getDensity
()
const
{
return
this
->
density
;
};
real
getDeltaT
()
const
{
return
this
->
deltaT
;
};
...
...
@@ -143,7 +142,7 @@ private:
void
initBladeCoords
(
CudaMemoryManager
*
cudaManager
);
void
initBladeVelocities
(
CudaMemoryManager
*
cudaManager
);
void
initBladeForces
(
CudaMemoryManager
*
cudaManager
);
void
initBladeIndices
(
Parameter
*
para
,
CudaMemoryManager
*
cudaManager
);
void
initBladeIndices
(
CudaMemoryManager
*
cudaManager
);
std
::
string
getFilename
(
Parameter
*
para
,
uint
t
)
const
;
void
swapDeviceArrays
();
...
...
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