Commit ae42d93b authored by Ron Rahaman's avatar Ron Rahaman

Merge branch 'update-moon-to-new-moose' into 'develop'

Update moon to new moose

See merge request !15
parents 99a77eb6 dfdc9c5d
......@@ -18,13 +18,22 @@ include $(FRAMEWORK_DIR)/build.mk
include $(FRAMEWORK_DIR)/moose.mk
################################## MODULES ####################################
SOLID_MECHANICS := yes
CONTACT := yes
HEAT_CONDUCTION := yes
WATER_STEAM_EOS := yes
MISC := yes
PHASE_FIELD := yes
XFEM := yes
CHEMICAL_REACTIONS := no
CONTACT := no
FLUID_PROPERTIES := no
HEAT_CONDUCTION := no
MISC := no
NAVIER_STOKES := no
PHASE_FIELD := no
RDG := no
RICHARDS := no
SOLID_MECHANICS := no
STOCHASTIC_TOOLS := no
TENSOR_MECHANICS := no
WATER_STEAM_EOS := no
XFEM := no
POROUS_FLOW := no
include $(MOOSE_DIR)/modules/modules.mk
###############################################################################
......
#include "MoonApp.h"
#include "Moose.h"
#include "AppFactory.h"
#include "ModulesApp.h"
#include "MooseSyntax.h"
#include "CoupledGradAux.h"
#include "LegendrePolynomial.h"
#include "FourierPolynomial.h"
......@@ -9,13 +11,6 @@
#include "NekSideIntegralVariableUserObject.h"
// Modules
#include "ContactApp.h"
#include "HeatConductionApp.h"
#include "MiscApp.h"
#include "SolidMechanicsApp.h"
#include "TensorMechanicsApp.h"
#include "PhaseFieldApp.h"
#include "XFEMApp.h"
// Moon
#include "MoonRevision.h"
......@@ -39,23 +34,11 @@ MoonApp::MoonApp(InputParameters parameters) :
MooseApp(parameters)
{
Moose::registerObjects(_factory);
ContactApp::registerObjects(_factory);
HeatConductionApp::registerObjects(_factory);
MiscApp::registerObjects(_factory);
SolidMechanicsApp::registerObjects(_factory);
TensorMechanicsApp::registerObjects(_factory);
PhaseFieldApp::registerObjects(_factory);
XFEMApp::registerObjects(_factory);
ModulesApp::registerObjects(_factory);
MoonApp::registerObjects(_factory);
Moose::associateSyntax(_syntax, _action_factory);
SolidMechanicsApp::associateSyntax(_syntax, _action_factory);
TensorMechanicsApp::associateSyntax(_syntax, _action_factory);
PhaseFieldApp::associateSyntax(_syntax, _action_factory);
ContactApp::associateSyntax(_syntax, _action_factory);
HeatConductionApp::associateSyntax(_syntax, _action_factory);
MiscApp::associateSyntax(_syntax, _action_factory);
XFEMApp::associateSyntax(_syntax, _action_factory);
ModulesApp::associateSyntax(_syntax, _action_factory);
MoonApp::associateSyntax(_syntax, _action_factory);
}
......@@ -64,7 +47,12 @@ MoonApp::~MoonApp()
}
// External entry point for dynamic application loading
extern "C" void MoonApp__registerApps() { MoonApp::registerApps(); }
extern "C" void
MoonApp__registerApps()
{
MoonApp::registerApps();
}
void
MoonApp::registerApps()
{
......@@ -72,7 +60,11 @@ MoonApp::registerApps()
}
// External entry point for dynamic object registration
extern "C" void MoonApp__registerObjects(Factory & factory) { MoonApp::registerObjects(factory); }
extern "C" void
MoonApp__registerObjects(Factory & factory)
{
MoonApp::registerObjects(factory);
}
void
MoonApp::registerObjects(Factory & factory)
{
......@@ -92,7 +84,11 @@ MoonApp::registerObjects(Factory & factory)
}
// External entry point for dynamic syntax association
extern "C" void MoonApp__associateSyntax(Syntax & syntax, ActionFactory & action_factory) { MoonApp::associateSyntax(syntax, action_factory); }
extern "C" void
MoonApp__associateSyntax(Syntax & syntax, ActionFactory & action_factory)
{
MoonApp::associateSyntax(syntax, action_factory);
}
void
MoonApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
{
......
#include "MultiAppPolynomialToNek.h"
#include "NekInterface.h"
// MOOSE includes
#include "MooseTypes.h"
#include "FEProblem.h"
#include "MultiApp.h"
#include "MooseVariableScalar.h"
#include "SystemBase.h"
// libMesh includes
#include "libmesh/meshfree_interpolation.h"
#include "libmesh/system.h"
#include "NekInterface.h"
// Define the input parameters
template<>
......@@ -39,7 +41,7 @@ MultiAppPolynomialToNek::execute()
// MasterApp -> SubApp
case TO_MULTIAPP:
{
FEProblem & from_problem = _multi_app->problem();
FEProblemBase & from_problem = _multi_app->problemBase();
std::vector<MooseVariableScalar *> source_variables(_source_variable_names.size());
for (auto i = beginIndex(_source_variable_names); i < _source_variable_names.size(); ++i)
......@@ -81,7 +83,7 @@ MultiAppPolynomialToNek::execute()
std::vector<MooseVariableScalar *> to_variables(_to_aux_names.size());
for (auto i = beginIndex(_to_aux_names); i < _to_aux_names.size(); ++i)
{
to_variables[i] = &_multi_app->problem().getScalarVariable(_tid, _to_aux_names[i]);
to_variables[i] = &_multi_app->problemBase().getScalarVariable(_tid, _to_aux_names[i]);
to_variables[i]->reinit();
}
......
......@@ -13,6 +13,8 @@
/****************************************************************/
#include "NekSideIntegralVariableUserObject.h"
#include "MooseVariableScalar.h"
#include "SystemBase.h"
template<>
InputParameters validParams<NekSideIntegralVariableUserObject>()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment