Commit edecc6b5 authored by Ron Rahaman's avatar Ron Rahaman

Merge branch 'add-heat-conduct-module' into develop

Conflicts:
	examples/integration_example/Makefile
	src/base/MoonApp.C
parents 5432d749 601b2291
......@@ -18,13 +18,21 @@ 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 := yes
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
###############################################################################
......
<html><body>You are being <a href="https://xgitlab.cels.anl.gov/users/sign_in">redirected</a>.</body></html>
\ No newline at end of file
#include "MoonApp.h"
#include "Moose.h"
#include "AppFactory.h"
#include "ModulesApp.h"
#include "MooseSyntax.h"
#include "CoupledGradAux.h"
#include "LegendrePolynomial.h"
#include "FourierPolynomial.h"
#include "FourierLegendreReconstruction.h"
#include "NekSideIntegralVariableUserObject.h"
// Modules
#include "HeatConductionApp.h"
// Moon
#include "MoonRevision.h"
#include "NekExecutioner.h"
#include "NekTimeStepper.h"
#include "MultiAppPolynomialToNek.h"
template<>
InputParameters validParams<MoonApp>()
{
InputParameters params = validParams<MooseApp>();
params.set<bool>("use_legacy_uo_initialization") = false;
params.set<bool>("use_legacy_uo_aux_computation") = false;
params.set<bool>("use_legacy_output_syntax") = false;
return params;
}
MoonApp::MoonApp(InputParameters parameters) :
MooseApp(parameters)
{
Moose::registerObjects(_factory);
ModulesApp::registerObjects(_factory);
HeatConductionApp::registerObjects(_factory);
MoonApp::registerObjects(_factory);
Moose::associateSyntax(_syntax, _action_factory);
ModulesApp::associateSyntax(_syntax, _action_factory);
HeatConductionApp::associateSyntax(_syntax, _action_factory);
MoonApp::associateSyntax(_syntax, _action_factory);
}
MoonApp::~MoonApp()
{
}
// External entry point for dynamic application loading
extern "C" void
MoonApp__registerApps()
{
MoonApp::registerApps();
}
void
MoonApp::registerApps()
{
registerApp(MoonApp);
}
// External entry point for dynamic object registration
extern "C" void
MoonApp__registerObjects(Factory & factory)
{
MoonApp::registerObjects(factory);
}
void
MoonApp::registerObjects(Factory & factory)
{
registerAuxKernel(CoupledGradAux);
registerFunction(LegendrePolynomial);
registerFunction(FourierPolynomial);
registerFunction(FourierLegendreReconstruction);
registerUserObject(NekSideIntegralVariableUserObject);
registerExecutioner(NekExecutioner);
registerTimeStepper(NekTimeStepper);
registerTransfer(MultiAppPolynomialToNek);
}
// External entry point for dynamic syntax association
extern "C" void
MoonApp__associateSyntax(Syntax & syntax, ActionFactory & action_factory)
{
MoonApp::associateSyntax(syntax, action_factory);
}
void
MoonApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
{
}
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