From 96d8b3ee5134a5596df3f40afc9097b04feff9b7 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Fri, 22 Nov 2024 12:01:22 -0700 Subject: [PATCH] renaming update_relax_zones to be more accurate --- amr-wind/ocean_waves/OceanWaves.cpp | 4 ++-- amr-wind/ocean_waves/OceanWavesModel.H | 6 +++--- amr-wind/ocean_waves/OceanWavesOps.H | 2 +- amr-wind/ocean_waves/relaxation_zones/linear_waves_ops.H | 2 +- .../ocean_waves/relaxation_zones/relaxation_zones_ops.H | 2 +- amr-wind/ocean_waves/relaxation_zones/stokes_waves_ops.H | 2 +- amr-wind/ocean_waves/relaxation_zones/waves2amr_ops.H | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/amr-wind/ocean_waves/OceanWaves.cpp b/amr-wind/ocean_waves/OceanWaves.cpp index 45e176c9e8..45268531e1 100644 --- a/amr-wind/ocean_waves/OceanWaves.cpp +++ b/amr-wind/ocean_waves/OceanWaves.cpp @@ -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); } } @@ -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(); } diff --git a/amr-wind/ocean_waves/OceanWavesModel.H b/amr-wind/ocean_waves/OceanWavesModel.H index 45e5c4dead..c55be252bc 100644 --- a/amr-wind/ocean_waves/OceanWavesModel.H +++ b/amr-wind/ocean_waves/OceanWavesModel.H @@ -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; @@ -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()(m_data, for_forcing_term); + ops::UpdateTargetFieldsOp()(m_data, for_forcing_term); } void apply_relax_zones() override diff --git a/amr-wind/ocean_waves/OceanWavesOps.H b/amr-wind/ocean_waves/OceanWavesOps.H index bb48cc8d3f..0c1a1760c5 100644 --- a/amr-wind/ocean_waves/OceanWavesOps.H +++ b/amr-wind/ocean_waves/OceanWavesOps.H @@ -32,7 +32,7 @@ template struct InitDataOp; template -struct UpdateRelaxZonesOp; +struct UpdateTargetFieldsOp; template struct ApplyRelaxZonesOp; diff --git a/amr-wind/ocean_waves/relaxation_zones/linear_waves_ops.H b/amr-wind/ocean_waves/relaxation_zones/linear_waves_ops.H index a8883368a1..171b42bf5e 100644 --- a/amr-wind/ocean_waves/relaxation_zones/linear_waves_ops.H +++ b/amr-wind/ocean_waves/relaxation_zones/linear_waves_ops.H @@ -125,7 +125,7 @@ struct InitDataOp }; template <> -struct UpdateRelaxZonesOp +struct UpdateTargetFieldsOp { void operator()(LinearWaves::DataType& data, bool for_forcing_term) { diff --git a/amr-wind/ocean_waves/relaxation_zones/relaxation_zones_ops.H b/amr-wind/ocean_waves/relaxation_zones/relaxation_zones_ops.H index e015c61057..a97e200031 100644 --- a/amr-wind/ocean_waves/relaxation_zones/relaxation_zones_ops.H +++ b/amr-wind/ocean_waves/relaxation_zones/relaxation_zones_ops.H @@ -51,7 +51,7 @@ struct UseDefaultOp }; template -struct UpdateRelaxZonesOp< +struct UpdateTargetFieldsOp< WaveTheoryTrait, typename std::enable_if_t< std::is_base_of_v>> diff --git a/amr-wind/ocean_waves/relaxation_zones/stokes_waves_ops.H b/amr-wind/ocean_waves/relaxation_zones/stokes_waves_ops.H index 2dd918834b..a4dd208571 100644 --- a/amr-wind/ocean_waves/relaxation_zones/stokes_waves_ops.H +++ b/amr-wind/ocean_waves/relaxation_zones/stokes_waves_ops.H @@ -149,7 +149,7 @@ struct InitDataOp }; template <> -struct UpdateRelaxZonesOp +struct UpdateTargetFieldsOp { void operator()(StokesWaves::DataType& data, bool for_forcing_term) { diff --git a/amr-wind/ocean_waves/relaxation_zones/waves2amr_ops.H b/amr-wind/ocean_waves/relaxation_zones/waves2amr_ops.H index 656028ce19..4fc396e58a 100644 --- a/amr-wind/ocean_waves/relaxation_zones/waves2amr_ops.H +++ b/amr-wind/ocean_waves/relaxation_zones/waves2amr_ops.H @@ -507,7 +507,7 @@ struct InitDataOp }; // namespace ocean_waves template <> -struct UpdateRelaxZonesOp +struct UpdateTargetFieldsOp { // cppcheck-suppress constParameterReference void operator()(W2AWaves::DataType& data, bool for_forcing_term)