mirror of
https://github.com/PhasicFlow/phasicFlow.git
synced 2025-07-08 03:07:03 +00:00
global damping is added to the code
This commit is contained in:
@ -36,7 +36,8 @@ bool intAllActive(
|
||||
realx3PointField_D& dy,
|
||||
realx3PointField_D& dy1,
|
||||
realx3PointField_D& dy2,
|
||||
realx3PointField_D& dy3)
|
||||
realx3PointField_D& dy3,
|
||||
real damping = 1.0)
|
||||
{
|
||||
|
||||
auto d_dy = dy.deviceView();
|
||||
@ -50,12 +51,12 @@ bool intAllActive(
|
||||
"AdamsBashforth3::correct",
|
||||
rpIntegration (activeRng.start(), activeRng.end()),
|
||||
LAMBDA_HD(uint32 i){
|
||||
d_y[i] += dt*(
|
||||
d_y[i] = damping *(d_y[i] + dt*(
|
||||
static_cast<real>(55.0 / 24.0) * d_dy[i]
|
||||
- static_cast<real>(59.0 / 24.0) * d_dy1[i]
|
||||
+ static_cast<real>(37.0 / 24.0) * d_dy2[i]
|
||||
- static_cast<real>( 9.0 / 24.0) * d_dy3[i]
|
||||
);
|
||||
));
|
||||
d_dy3[i] = d_dy2[i];
|
||||
d_dy2[i] = d_dy1[i];
|
||||
d_dy1[i] = d_dy[i];
|
||||
@ -72,7 +73,8 @@ bool intScattered
|
||||
realx3PointField_D& dy,
|
||||
realx3PointField_D& dy1,
|
||||
realx3PointField_D& dy2,
|
||||
realx3PointField_D& dy3
|
||||
realx3PointField_D& dy3,
|
||||
real damping = 1.0
|
||||
)
|
||||
{
|
||||
|
||||
@ -90,12 +92,12 @@ bool intScattered
|
||||
LAMBDA_HD(uint32 i){
|
||||
if( activeP(i))
|
||||
{
|
||||
d_y[i] += dt*(
|
||||
d_y[i] = damping* ( d_y[i] + dt*(
|
||||
static_cast<real>(55.0 / 24.0) * d_dy[i]
|
||||
- static_cast<real>(59.0 / 24.0) * d_dy1[i]
|
||||
+ static_cast<real>(37.0 / 24.0) * d_dy2[i]
|
||||
- static_cast<real>( 9.0 / 24.0) * d_dy3[i]
|
||||
);
|
||||
));
|
||||
d_dy3[i] = d_dy2[i];
|
||||
d_dy2[i] = d_dy1[i];
|
||||
d_dy1[i] = d_dy[i];
|
||||
@ -147,18 +149,19 @@ bool pFlow::AdamsBashforth4::correct
|
||||
(
|
||||
real dt,
|
||||
realx3PointField_D& y,
|
||||
realx3PointField_D& dy
|
||||
realx3PointField_D& dy,
|
||||
real damping
|
||||
)
|
||||
{
|
||||
|
||||
bool success = false;
|
||||
if(y.isAllActive())
|
||||
{
|
||||
success = intAllActive(dt, y.field(), dy, dy1(), dy2(), dy3());
|
||||
success = intAllActive(dt, y.field(), dy, dy1(), dy2(), dy3(), damping);
|
||||
}
|
||||
else
|
||||
{
|
||||
success = intScattered(dt, y.field(), dy, dy1(), dy2(), dy3());
|
||||
success = intScattered(dt, y.field(), dy, dy1(), dy2(), dy3(), damping);
|
||||
}
|
||||
|
||||
success = success && boundaryList().correct(dt, y, dy);
|
||||
|
@ -96,7 +96,8 @@ public:
|
||||
bool correct(
|
||||
real dt,
|
||||
realx3PointField_D& y,
|
||||
realx3PointField_D& dy) override;
|
||||
realx3PointField_D& dy,
|
||||
real damping = 1.0) override;
|
||||
|
||||
bool correctPStruct(
|
||||
real dt,
|
||||
|
Reference in New Issue
Block a user