Skip to content

Commit

Permalink
Rename MultiAppFieldTransfer to MultiAppFieldTransferInterface
Browse files Browse the repository at this point in the history
  • Loading branch information
fdkong committed May 17, 2019
1 parent 8ff1be9 commit 11a1993
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 41 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#ifdef LIBMESH_TRILINOS_HAVE_DTK

#include "MultiAppFieldTransferInterface.h"
#include "MultiAppFieldTransfer.h"
#include "DTKInterpolationHelper.h"

// Forward declarations
Expand All @@ -25,7 +25,7 @@ InputParameters validParams<MultiAppDTKInterpolationTransfer>();
/**
* Transfers from spatially varying Interpolations in a MultiApp to the "master" system.
*/
class MultiAppDTKInterpolationTransfer : public MultiAppFieldTransferInterface
class MultiAppDTKInterpolationTransfer : public MultiAppFieldTransfer
{
public:
MultiAppDTKInterpolationTransfer(const InputParameters & parameters);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@
#include "MultiAppTransfer.h"

// Forward declarations
class MultiAppFieldTransferInterface;
class MultiAppFieldTransfer;

template <>
InputParameters validParams<MultiAppFieldTransferInterface>();
InputParameters validParams<MultiAppFieldTransfer>();

/**
* This serves an interface for MultiAppInterpolationTransfer, MultiAppNearestNodeTransfer and so
* on.
*/
class MultiAppFieldTransferInterface : public MultiAppTransfer
class MultiAppFieldTransfer : public MultiAppTransfer
{
public:
MultiAppFieldTransferInterface(const InputParameters & parameters);
MultiAppFieldTransfer(const InputParameters & parameters);

virtual void initialSetup();

Expand Down
4 changes: 2 additions & 2 deletions framework/include/transfers/MultiAppInterpolationTransfer.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#pragma once

// MOOSE includes
#include "MultiAppFieldTransferInterface.h"
#include "MultiAppFieldTransfer.h"

#include "libmesh/mesh_base.h"

Expand All @@ -23,7 +23,7 @@ InputParameters validParams<MultiAppInterpolationTransfer>();
/**
* Copy the value to the target domain from the nearest node in the source domain.
*/
class MultiAppInterpolationTransfer : public MultiAppFieldTransferInterface
class MultiAppInterpolationTransfer : public MultiAppFieldTransfer
{
public:
MultiAppInterpolationTransfer(const InputParameters & parameters);
Expand Down
4 changes: 2 additions & 2 deletions framework/include/transfers/MultiAppMeshFunctionTransfer.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#pragma once

#include "MultiAppFieldTransferInterface.h"
#include "MultiAppFieldTransfer.h"

// Forward declarations
class MultiAppMeshFunctionTransfer;
Expand All @@ -23,7 +23,7 @@ InputParameters validParams<MultiAppMeshFunctionTransfer>();
* the MultiApp is. Copies that value into a postprocessor in the MultiApp.
* The source and destination vectors (of variables) should be ordered consistently.
*/
class MultiAppMeshFunctionTransfer : public MultiAppFieldTransferInterface
class MultiAppMeshFunctionTransfer : public MultiAppFieldTransfer
{
public:
MultiAppMeshFunctionTransfer(const InputParameters & parameters);
Expand Down
4 changes: 2 additions & 2 deletions framework/include/transfers/MultiAppNearestNodeTransfer.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#pragma once

// MOOSE includes
#include "MultiAppFieldTransferInterface.h"
#include "MultiAppFieldTransfer.h"

// Forward declarations
class MultiAppNearestNodeTransfer;
Expand All @@ -25,7 +25,7 @@ InputParameters validParams<MultiAppNearestNodeTransfer>();
/**
* Copy the value to the target domain from the nearest node in the source domain.
*/
class MultiAppNearestNodeTransfer : public MultiAppFieldTransferInterface
class MultiAppNearestNodeTransfer : public MultiAppFieldTransfer
{
public:
MultiAppNearestNodeTransfer(const InputParameters & parameters);
Expand Down
4 changes: 2 additions & 2 deletions framework/include/transfers/MultiAppProjectionTransfer.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#pragma once

#include "MultiAppFieldTransferInterface.h"
#include "MultiAppFieldTransfer.h"

// Forward declarations
namespace libMesh
Expand All @@ -25,7 +25,7 @@ InputParameters validParams<MultiAppProjectionTransfer>();
/**
* Project values from one domain to another
*/
class MultiAppProjectionTransfer : public MultiAppFieldTransferInterface
class MultiAppProjectionTransfer : public MultiAppFieldTransfer
{
public:
MultiAppProjectionTransfer(const InputParameters & parameters);
Expand Down
4 changes: 2 additions & 2 deletions framework/src/transfers/MultiAppDTKInterpolationTransfer.C
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ template <>
InputParameters
validParams<MultiAppDTKInterpolationTransfer>()
{
InputParameters params = validParams<MultiAppFieldTransferInterface>();
InputParameters params = validParams<MultiAppFieldTransfer>();
return params;
}

MultiAppDTKInterpolationTransfer::MultiAppDTKInterpolationTransfer(
const InputParameters & parameters)
: MultiAppFieldTransferInterface(parameters)
: MultiAppFieldTransfer(parameters)
{
if (_to_var_name.size() != 1 && _from_var_name.size() != 1)
mooseError(" Support single variable only ");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
//* https://www.gnu.org/licenses/lgpl-2.1.html

// MOOSE includes
#include "MultiAppFieldTransferInterface.h"
#include "MultiAppFieldTransfer.h"
#include "MooseTypes.h"
#include "FEProblem.h"
#include "MultiApp.h"
Expand All @@ -18,7 +18,7 @@

template <>
InputParameters
validParams<MultiAppFieldTransferInterface>()
validParams<MultiAppFieldTransfer>()
{
InputParameters params = validParams<MultiAppTransfer>();
params.addRequiredParam<std::vector<AuxVariableName>>(
Expand All @@ -36,7 +36,7 @@ validParams<MultiAppFieldTransferInterface>()
return params;
}

MultiAppFieldTransferInterface::MultiAppFieldTransferInterface(const InputParameters & parameters)
MultiAppFieldTransfer::MultiAppFieldTransfer(const InputParameters & parameters)
: MultiAppTransfer(parameters),
_from_var_names(getParam<std::vector<VariableName>>("source_variable")),
_to_var_names(getParam<std::vector<AuxVariableName>>("variable")),
Expand Down Expand Up @@ -92,7 +92,7 @@ MultiAppFieldTransferInterface::MultiAppFieldTransferInterface(const InputParame
}

void
MultiAppFieldTransferInterface::initialSetup()
MultiAppFieldTransfer::initialSetup()
{
if (_direction == TO_MULTIAPP)
for (auto & to_var : _to_var_names)
Expand Down Expand Up @@ -142,7 +142,7 @@ MultiAppFieldTransferInterface::initialSetup()
}

void
MultiAppFieldTransferInterface::postExecute()
MultiAppFieldTransfer::postExecute()
{
if (_preserve_transfer)
{
Expand All @@ -152,7 +152,8 @@ MultiAppFieldTransferInterface::postExecute()
{
FEProblemBase & from_problem = _multi_app->problemBase();
if (_use_nearestpoint_pps)
from_problem.computeUserObjectByName(EXEC_TRANSFER, _from_postprocessors_to_be_preserved[0]);
from_problem.computeUserObjectByName(EXEC_TRANSFER,
_from_postprocessors_to_be_preserved[0]);

for (unsigned int i = 0; i < _multi_app->numGlobalApps(); i++)
if (_multi_app->hasLocalApp(i))
Expand Down Expand Up @@ -204,12 +205,11 @@ MultiAppFieldTransferInterface::postExecute()
}

void
MultiAppFieldTransferInterface::adjustTransferedSolutionNearestPoint(
unsigned int i,
FEProblemBase * from_problem,
PostprocessorName & from_postprocessor,
FEProblemBase & to_problem,
PostprocessorName & to_postprocessor)
MultiAppFieldTransfer::adjustTransferedSolutionNearestPoint(unsigned int i,
FEProblemBase * from_problem,
PostprocessorName & from_postprocessor,
FEProblemBase & to_problem,
PostprocessorName & to_postprocessor)
{
PostprocessorValue from_adjuster = 0;
if (from_problem && _direction == FROM_MULTIAPP)
Expand Down Expand Up @@ -300,10 +300,10 @@ MultiAppFieldTransferInterface::adjustTransferedSolutionNearestPoint(
}

void
MultiAppFieldTransferInterface::adjustTransferedSolution(FEProblemBase * from_problem,
PostprocessorName & from_postprocessor,
FEProblemBase & to_problem,
PostprocessorName & to_postprocessor)
MultiAppFieldTransfer::adjustTransferedSolution(FEProblemBase * from_problem,
PostprocessorName & from_postprocessor,
FEProblemBase & to_problem,
PostprocessorName & to_postprocessor)
{
PostprocessorValue from_adjuster = 0;
if (from_problem)
Expand Down
4 changes: 2 additions & 2 deletions framework/src/transfers/MultiAppInterpolationTransfer.C
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ template <>
InputParameters
validParams<MultiAppInterpolationTransfer>()
{
InputParameters params = validParams<MultiAppFieldTransferInterface>();
InputParameters params = validParams<MultiAppFieldTransfer>();
params.addClassDescription(
"Transfers the value to the target domain from the nearest node in the source domain.");
params.addParam<unsigned int>(
Expand All @@ -48,7 +48,7 @@ validParams<MultiAppInterpolationTransfer>()
}

MultiAppInterpolationTransfer::MultiAppInterpolationTransfer(const InputParameters & parameters)
: MultiAppFieldTransferInterface(parameters),
: MultiAppFieldTransfer(parameters),
_num_points(getParam<unsigned int>("num_points")),
_power(getParam<Real>("power")),
_interp_type(getParam<MooseEnum>("interp_type")),
Expand Down
4 changes: 2 additions & 2 deletions framework/src/transfers/MultiAppMeshFunctionTransfer.C
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ template <>
InputParameters
validParams<MultiAppMeshFunctionTransfer>()
{
InputParameters params = validParams<MultiAppFieldTransferInterface>();
InputParameters params = validParams<MultiAppFieldTransfer>();

params.addParam<bool>(
"error_on_miss",
Expand All @@ -38,7 +38,7 @@ validParams<MultiAppMeshFunctionTransfer>()
}

MultiAppMeshFunctionTransfer::MultiAppMeshFunctionTransfer(const InputParameters & parameters)
: MultiAppFieldTransferInterface(parameters), _error_on_miss(getParam<bool>("error_on_miss"))
: MultiAppFieldTransfer(parameters), _error_on_miss(getParam<bool>("error_on_miss"))
{
if (_to_var_names.size() == _from_var_names.size())
_var_size = _to_var_names.size();
Expand Down
4 changes: 2 additions & 2 deletions framework/src/transfers/MultiAppNearestNodeTransfer.C
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ template <>
InputParameters
validParams<MultiAppNearestNodeTransfer>()
{
InputParameters params = validParams<MultiAppFieldTransferInterface>();
InputParameters params = validParams<MultiAppFieldTransfer>();

params.addParam<BoundaryName>(
"source_boundary",
Expand All @@ -47,7 +47,7 @@ validParams<MultiAppNearestNodeTransfer>()
}

MultiAppNearestNodeTransfer::MultiAppNearestNodeTransfer(const InputParameters & parameters)
: MultiAppFieldTransferInterface(parameters),
: MultiAppFieldTransfer(parameters),
_fixed_meshes(getParam<bool>("fixed_meshes")),
_node_map(declareRestartableData<std::map<dof_id_type, Node *>>("node_map")),
_distance_map(declareRestartableData<std::map<dof_id_type, Real>>("distance_map")),
Expand Down
6 changes: 3 additions & 3 deletions framework/src/transfers/MultiAppProjectionTransfer.C
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ template <>
InputParameters
validParams<MultiAppProjectionTransfer>()
{
InputParameters params = validParams<MultiAppFieldTransferInterface>();
InputParameters params = validParams<MultiAppFieldTransfer>();

MooseEnum proj_type("l2", "l2");
params.addParam<MooseEnum>("proj_type", proj_type, "The type of the projection.");
Expand All @@ -60,7 +60,7 @@ validParams<MultiAppProjectionTransfer>()
}

MultiAppProjectionTransfer::MultiAppProjectionTransfer(const InputParameters & parameters)
: MultiAppFieldTransferInterface(parameters),
: MultiAppFieldTransfer(parameters),
_proj_type(getParam<MooseEnum>("proj_type")),
_compute_matrix(true),
_fixed_meshes(getParam<bool>("fixed_meshes")),
Expand All @@ -73,7 +73,7 @@ MultiAppProjectionTransfer::MultiAppProjectionTransfer(const InputParameters & p
void
MultiAppProjectionTransfer::initialSetup()
{
MultiAppFieldTransferInterface::initialSetup();
MultiAppFieldTransfer::initialSetup();

getAppInfo();

Expand Down

0 comments on commit 11a1993

Please sign in to comment.