Skip to content

Commit

Permalink
renaming update_relax_zones to be more accurate
Browse files Browse the repository at this point in the history
  • Loading branch information
mbkuhn committed Nov 22, 2024
1 parent 56e6dc3 commit 96d8b3e
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions amr-wind/ocean_waves/OceanWaves.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ void OceanWaves::pre_advance_work()
{
BL_PROFILE("amr-wind::ocean_waves::OceanWaves::pre_advance_work");
if (!m_multiphase_mode) {
m_owm->update_relax_zones(true);
m_owm->update_target_fields(true);
}
}

Expand All @@ -99,7 +99,7 @@ void OceanWaves::post_advance_work()
void OceanWaves::relaxation_zones()
{
BL_PROFILE("amr-wind::ocean_waves::OceanWaves::update_relaxation_zones");
m_owm->update_relax_zones(false);
m_owm->update_target_fields(false);
m_owm->apply_relax_zones();
m_owm->reset_regrid_flag();
}
Expand Down
6 changes: 3 additions & 3 deletions amr-wind/ocean_waves/OceanWavesModel.H
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public:

virtual void init_waves(int, const amrex::Geometry&, bool) = 0;

virtual void update_relax_zones(bool) = 0;
virtual void update_target_fields(bool) = 0;

virtual void apply_relax_zones() = 0;

Expand Down Expand Up @@ -91,9 +91,9 @@ public:
m_out_op.read_io_options(pp);
}

void update_relax_zones(bool for_forcing_term) override
void update_target_fields(bool for_forcing_term) override
{
ops::UpdateRelaxZonesOp<WaveTheoryTrait>()(m_data, for_forcing_term);
ops::UpdateTargetFieldsOp<WaveTheoryTrait>()(m_data, for_forcing_term);
}

void apply_relax_zones() override
Expand Down
2 changes: 1 addition & 1 deletion amr-wind/ocean_waves/OceanWavesOps.H
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ template <typename WaveTheoryTrait, typename = void>
struct InitDataOp;

template <typename WaveTheoryTrait, typename = void>
struct UpdateRelaxZonesOp;
struct UpdateTargetFieldsOp;

template <typename WaveTheoryTrait, typename = void>
struct ApplyRelaxZonesOp;
Expand Down
2 changes: 1 addition & 1 deletion amr-wind/ocean_waves/relaxation_zones/linear_waves_ops.H
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ struct InitDataOp<LinearWaves>
};

template <>
struct UpdateRelaxZonesOp<LinearWaves>
struct UpdateTargetFieldsOp<LinearWaves>
{
void operator()(LinearWaves::DataType& data, bool for_forcing_term)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ struct UseDefaultOp
};

template <typename WaveTheoryTrait>
struct UpdateRelaxZonesOp<
struct UpdateTargetFieldsOp<
WaveTheoryTrait,
typename std::enable_if_t<
std::is_base_of_v<RelaxZonesType, WaveTheoryTrait>>>
Expand Down
2 changes: 1 addition & 1 deletion amr-wind/ocean_waves/relaxation_zones/stokes_waves_ops.H
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ struct InitDataOp<StokesWaves>
};

template <>
struct UpdateRelaxZonesOp<StokesWaves>
struct UpdateTargetFieldsOp<StokesWaves>
{
void operator()(StokesWaves::DataType& data, bool for_forcing_term)
{
Expand Down
2 changes: 1 addition & 1 deletion amr-wind/ocean_waves/relaxation_zones/waves2amr_ops.H
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ struct InitDataOp<W2AWaves>
}; // namespace ocean_waves

template <>
struct UpdateRelaxZonesOp<W2AWaves>
struct UpdateTargetFieldsOp<W2AWaves>
{
// cppcheck-suppress constParameterReference
void operator()(W2AWaves::DataType& data, bool for_forcing_term)
Expand Down

0 comments on commit 96d8b3e

Please sign in to comment.