Skip to content

Commit

Permalink
update doc, rename
Browse files Browse the repository at this point in the history
Co-authored-by: Marcel Koch <[email protected]>
  • Loading branch information
yhmtsai and MarcelKoch committed May 22, 2024
1 parent 03f8a46 commit a815e1f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
22 changes: 11 additions & 11 deletions core/solver/multigrid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@


#include <complex>
#include <core/config/config.hpp>


#include <ginkgo/core/base/exception.hpp>
Expand All @@ -29,7 +30,6 @@

#include "core/base/dispatch_helper.hpp"
#include "core/components/fill_array_kernels.hpp"
#include "core/config/config.hpp"
#include "core/config/config_helper.hpp"
#include "core/distributed/helpers.hpp"
#include "core/solver/ir_kernels.hpp"
Expand Down Expand Up @@ -579,28 +579,28 @@ typename Multigrid::parameters_type Multigrid::parse(

if (auto& obj = config.get("criteria")) {
factory.with_criteria(
gko::config::get_factory_vector<const stop::CriterionFactory>(
config::parse_or_get_factory_vector<const stop::CriterionFactory>(
obj, context, td_for_child));
}
if (auto& obj = config.get("mg_level")) {
factory.with_mg_level(
gko::config::get_factory_vector<const gko::LinOpFactory>(
config::parse_or_get_factory_vector<const gko::LinOpFactory>(
obj, context, td_for_child));
}
if (auto& obj = config.get("pre_smoother")) {
factory.with_pre_smoother(
gko::config::get_factory_vector<const LinOpFactory>(obj, context,
td_for_child));
config::parse_or_get_factory_vector<const LinOpFactory>(
obj, context, td_for_child));
}
if (auto& obj = config.get("post_smoother")) {
factory.with_post_smoother(
gko::config::get_factory_vector<const LinOpFactory>(obj, context,
td_for_child));
config::parse_or_get_factory_vector<const LinOpFactory>(
obj, context, td_for_child));
}
if (auto& obj = config.get("mid_smoother")) {
factory.with_mid_smoother(
gko::config::get_factory_vector<const LinOpFactory>(obj, context,
td_for_child));
config::parse_or_get_factory_vector<const LinOpFactory>(
obj, context, td_for_child));
}
if (auto& obj = config.get("post_uses_pre")) {
factory.with_post_uses_pre(gko::config::get_value<bool>(obj));
Expand All @@ -627,8 +627,8 @@ typename Multigrid::parameters_type Multigrid::parse(
}
if (auto& obj = config.get("coarsest_solver")) {
factory.with_coarsest_solver(
gko::config::get_factory_vector<const LinOpFactory>(obj, context,
td_for_child));
config::parse_or_get_factory_vector<const LinOpFactory>(
obj, context, td_for_child));
}
if (auto& obj = config.get("cycle")) {
auto str = obj.get_string();
Expand Down
2 changes: 1 addition & 1 deletion include/ginkgo/core/multigrid/pgm.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class Pgm : public EnableLinOp<Pgm<ValueType, IndexType>>,

/**
* Create the parameters from the property_tree.
* Because this is directly tied to the specific type. The value/index type
* Because this is directly tied to the specific type, the value/index type
* settings within config are ignored and type_descriptor is only used
* for children objects.
*
Expand Down
2 changes: 1 addition & 1 deletion include/ginkgo/core/solver/multigrid.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ class Multigrid : public EnableLinOp<Multigrid>,

/**
* Create the parameters from the property_tree.
* Because this is directly tied to the specific type. The value/index type
* Because this is directly tied to the specific type, the value/index type
* settings within config are ignored and type_descriptor is only used
* for children objects.
*
Expand Down

0 comments on commit a815e1f

Please sign in to comment.