Skip to content

Commit

Permalink
to test
Browse files Browse the repository at this point in the history
  • Loading branch information
@Xiangyu-Hu
Xiangyu-Hu committed Sep 16, 2024
1 parent 29a4c04 commit 738d907
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 85 deletions.
78 changes: 17 additions & 61 deletions tests/extra_source_and_tests/extra_src/shared/pressure_boundary/bidirectional_buffer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,9 @@ namespace SPH
{
namespace fluid_dynamics
{
struct NonPrescribedPressure
{
template <class BoundaryConditionType>
NonPrescribedPressure(BoundaryConditionType &boundary_condition) {}

Real operator()(Real p, Real current_time)
{
return p;
}
};

template <typename TargetPressure, class ExecutionPolicy = ParallelPolicy>
template <typename InjectionPressure, class ExecutionPolicy = ParallelPolicy>
class BidirectionalBuffer
{
protected:
TargetPressure target_pressure_;

class TagBufferParticles : public BaseLocalDynamics<BodyPartByCell>
{
Expand Down Expand Up @@ -80,12 +67,12 @@ class BidirectionalBuffer
int *buffer_particle_indicator_;
};

class Injection : public BaseLocalDynamics<BodyPartByCell>
class InjectionAndDelettion : public BaseLocalDynamics<BodyPartByCell>
{
public:
Injection(BodyAlignedBoxByCell &aligned_box_part, ParticleBuffer<Base> &particle_buffer,
TargetPressure &target_pressure)
InjectionAndDelettion(BodyAlignedBoxByCell &aligned_box_part, ParticleBuffer<Base> &particle_buffer)
: BaseLocalDynamics<BodyPartByCell>(aligned_box_part),
target_pressure_(*this),
part_id_(aligned_box_part.getPartID()),
particle_buffer_(particle_buffer),
aligned_box_(aligned_box_part.getAlignedBoxShape()),
Expand All @@ -95,22 +82,22 @@ class BidirectionalBuffer
p_(particles_->getVariableDataByName<Real>("Pressure")),
previous_surface_indicator_(particles_->getVariableDataByName<int>("PreviousSurfaceIndicator")),
buffer_particle_indicator_(particles_->getVariableDataByName<int>("BufferParticleIndicator")),
physical_time_(sph_system_.getSystemVariableDataByName<Real>("PhysicalTime")),
target_pressure_(target_pressure)
physical_time_(sph_system_.getSystemVariableDataByName<Real>("PhysicalTime"))
{
particle_buffer_.checkParticlesReserved();
};
virtual ~Injection(){};
virtual ~InjectionAndDelettion(){};

void update(size_t index_i, Real dt = 0.0)
{
if (!aligned_box_.checkInBounds(pos_[index_i]))
{
mutex_switch.lock();
if (aligned_box_.checkUpperBound(pos_[index_i]) &&
buffer_particle_indicator_[index_i] == part_id_ &&
index_i < particles_->TotalRealParticles())
{
mutex_switch.lock();

particle_buffer_.checkEnoughBuffer(*particles_);
size_t new_particle_index = particles_->createRealParticleFrom(index_i);
buffer_particle_indicator_[new_particle_index] = 0;
Expand All @@ -121,42 +108,8 @@ class BidirectionalBuffer
p_[index_i] = target_pressure_(p_[index_i], *physical_time_);
rho_[index_i] = p_[index_i] / pow(sound_speed, 2.0) + fluid_.ReferenceDensity();
previous_surface_indicator_[index_i] = 1;
mutex_switch.unlock();
}
}
}

protected:
int part_id_;
std::mutex mutex_switch;
ParticleBuffer<Base> &particle_buffer_;
AlignedBoxShape &aligned_box_;
Fluid &fluid_;
Vecd *pos_;
Real *rho_, *p_;
int *previous_surface_indicator_, *buffer_particle_indicator_;
Real *physical_time_;

private:
TargetPressure &target_pressure_;
};

class Deletion : public BaseLocalDynamics<BodyPartByCell>
{
public:
Deletion(BodyAlignedBoxByCell &aligned_box_part)
: BaseLocalDynamics<BodyPartByCell>(aligned_box_part),
part_id_(aligned_box_part.getPartID()),
aligned_box_(aligned_box_part.getAlignedBoxShape()),
pos_(particles_->getVariableDataByName<Vecd>("Position")),
buffer_particle_indicator_(particles_->getVariableDataByName<int>("BufferParticleIndicator")){};
virtual ~Deletion(){};

void update(size_t index_i, Real dt = 0.0)
{
if (!aligned_box_.checkInBounds(pos_[index_i]))
{
mutex_switch.lock();
while (aligned_box_.checkLowerBound(pos_[index_i]) &&
buffer_particle_indicator_[index_i] == part_id_ &&
index_i < particles_->TotalRealParticles())
Expand All @@ -169,23 +122,26 @@ class BidirectionalBuffer
}

protected:
InjectionPressure target_pressure_;
int part_id_;
std::mutex mutex_switch;
ParticleBuffer<Base> &particle_buffer_;
AlignedBoxShape &aligned_box_;
Fluid &fluid_;
Vecd *pos_;
int *buffer_particle_indicator_;
Real *rho_, *p_;
int *previous_surface_indicator_, *buffer_particle_indicator_;
Real *physical_time_;
};

public:
BidirectionalBuffer(BodyAlignedBoxByCell &aligned_box_part, ParticleBuffer<Base> &particle_buffer)
: target_pressure_(*this), tag_buffer_particles(aligned_box_part),
injection(aligned_box_part, particle_buffer, target_pressure_),
deletion(aligned_box_part){};
: tag_buffer_particles(aligned_box_part),
injection_deletion(aligned_box_part, particle_buffer){};
virtual ~BidirectionalBuffer(){};

SimpleDynamics<TagBufferParticles, ExecutionPolicy> tag_buffer_particles;
SimpleDynamics<Injection, ExecutionPolicy> injection;
SimpleDynamics<Deletion, ExecutionPolicy> deletion;
SimpleDynamics<InjectionAndDelettion, ExecutionPolicy> injection_deletion;
};
} // namespace fluid_dynamics
} // namespace SPH
Expand Down
10 changes: 3 additions & 7 deletions tests/extra_source_and_tests/test_2d_T_pipe_VIPO_shell/T_pipe_VIPO_shell.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,13 +470,9 @@ int main(int ac, char *av[])

time_instance = TickCount::now();

left_bidirection_buffer.injection.exec();
right_up_bidirection_buffer.injection.exec();
right_down_bidirection_buffer.injection.exec();

left_bidirection_buffer.deletion.exec();
right_up_bidirection_buffer.deletion.exec();
right_down_bidirection_buffer.deletion.exec();
left_bidirection_buffer.injection_deletion.exec();
right_up_bidirection_buffer.injection_deletion.exec();
right_down_bidirection_buffer.injection_deletion.exec();

if (number_of_iterations % 100 == 0 && number_of_iterations != 1)
{
Expand Down
8 changes: 2 additions & 6 deletions tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/mixed_poiseuille_flow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,12 +299,8 @@ int main(int ac, char *av[])

time_instance = TickCount::now();

// first do injection for all buffers
left_bidirection_buffer.injection.exec();
right_bidirection_buffer.injection.exec();
// then do deletion for all buffers
left_bidirection_buffer.deletion.exec();
right_bidirection_buffer.deletion.exec();
left_bidirection_buffer.injection_deletion.exec();
right_bidirection_buffer.injection_deletion.exec();

if (number_of_iterations % 100 == 0 && number_of_iterations != 1)
{
Expand Down
10 changes: 3 additions & 7 deletions tests/extra_source_and_tests/test_2d_modified_T_flow/modified_T_flow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,13 +321,9 @@ int main(int ac, char *av[])

time_instance = TickCount::now();

left_bidirection_buffer.injection.exec();
up_bidirection_buffer.injection.exec();
down_bidirection_buffer.injection.exec();

left_bidirection_buffer.deletion.exec();
up_bidirection_buffer.deletion.exec();
down_bidirection_buffer.deletion.exec();
left_bidirection_buffer.injection_deletion.exec();
up_bidirection_buffer.injection_deletion.exec();
down_bidirection_buffer.injection_deletion.exec();

if (number_of_iterations % 100 == 0 && number_of_iterations != 1)
{
Expand Down
6 changes: 2 additions & 4 deletions tests/extra_source_and_tests/test_2d_pulsatile_poiseuille_flow/pulsatile_poiseuille_flow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,10 +278,8 @@ int main(int ac, char *av[])

time_instance = TickCount::now();

left_bidirection_buffer.injection.exec();
right_bidirection_buffer.injection.exec();
left_bidirection_buffer.deletion.exec();
right_bidirection_buffer.deletion.exec();
left_bidirection_buffer.injection_deletion.exec();
right_bidirection_buffer.injection_deletion.exec();

water_block.updateCellLinkedList();
water_block_complex.updateConfiguration();
Expand Down

0 comments on commit 738d907

Please sign in to comment.