Commit ca8ede1b authored by April Novak's avatar April Novak

Removed all modules from MOON Makefile and made corresponding changes in...

Removed all modules from MOON Makefile and made corresponding changes in MoonApp file. Added in the ModulesApp::registerObjects call that is now present in all AnimalApp files by default with newest version of MOOSE.
parent 169622f9
...@@ -18,13 +18,22 @@ include $(FRAMEWORK_DIR)/build.mk ...@@ -18,13 +18,22 @@ include $(FRAMEWORK_DIR)/build.mk
include $(FRAMEWORK_DIR)/moose.mk include $(FRAMEWORK_DIR)/moose.mk
################################## MODULES #################################### ################################## MODULES ####################################
SOLID_MECHANICS := yes CHEMICAL_REACTIONS := no
CONTACT := yes CONTACT := no
HEAT_CONDUCTION := yes FLUID_PROPERTIES := no
WATER_STEAM_EOS := yes HEAT_CONDUCTION := no
MISC := yes MISC := no
PHASE_FIELD := yes NAVIER_STOKES := no
XFEM := yes 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 $(MOOSE_DIR)/modules/modules.mk
############################################################################### ###############################################################################
......
#include "MoonApp.h" #include "MoonApp.h"
#include "Moose.h" #include "Moose.h"
#include "AppFactory.h" #include "AppFactory.h"
#include "ModulesApp.h"
#include "MooseSyntax.h" #include "MooseSyntax.h"
#include "CoupledGradAux.h" #include "CoupledGradAux.h"
#include "LegendrePolynomial.h" #include "LegendrePolynomial.h"
#include "FourierPolynomial.h" #include "FourierPolynomial.h"
...@@ -9,13 +11,6 @@ ...@@ -9,13 +11,6 @@
#include "NekSideIntegralVariableUserObject.h" #include "NekSideIntegralVariableUserObject.h"
// Modules // Modules
#include "ContactApp.h"
#include "HeatConductionApp.h"
#include "MiscApp.h"
#include "SolidMechanicsApp.h"
#include "TensorMechanicsApp.h"
#include "PhaseFieldApp.h"
#include "XFEMApp.h"
// Moon // Moon
#include "MoonRevision.h" #include "MoonRevision.h"
...@@ -39,23 +34,11 @@ MoonApp::MoonApp(InputParameters parameters) : ...@@ -39,23 +34,11 @@ MoonApp::MoonApp(InputParameters parameters) :
MooseApp(parameters) MooseApp(parameters)
{ {
Moose::registerObjects(_factory); Moose::registerObjects(_factory);
ContactApp::registerObjects(_factory); ModulesApp::registerObjects(_factory);
HeatConductionApp::registerObjects(_factory);
MiscApp::registerObjects(_factory);
SolidMechanicsApp::registerObjects(_factory);
TensorMechanicsApp::registerObjects(_factory);
PhaseFieldApp::registerObjects(_factory);
XFEMApp::registerObjects(_factory);
MoonApp::registerObjects(_factory); MoonApp::registerObjects(_factory);
Moose::associateSyntax(_syntax, _action_factory); Moose::associateSyntax(_syntax, _action_factory);
SolidMechanicsApp::associateSyntax(_syntax, _action_factory); ModulesApp::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);
MoonApp::associateSyntax(_syntax, _action_factory); MoonApp::associateSyntax(_syntax, _action_factory);
} }
...@@ -64,7 +47,12 @@ MoonApp::~MoonApp() ...@@ -64,7 +47,12 @@ MoonApp::~MoonApp()
} }
// External entry point for dynamic application loading // External entry point for dynamic application loading
extern "C" void MoonApp__registerApps() { MoonApp::registerApps(); } extern "C" void
MoonApp__registerApps()
{
MoonApp::registerApps();
}
void void
MoonApp::registerApps() MoonApp::registerApps()
{ {
...@@ -72,7 +60,11 @@ MoonApp::registerApps() ...@@ -72,7 +60,11 @@ MoonApp::registerApps()
} }
// External entry point for dynamic object registration // 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 void
MoonApp::registerObjects(Factory & factory) MoonApp::registerObjects(Factory & factory)
{ {
...@@ -92,7 +84,11 @@ MoonApp::registerObjects(Factory & factory) ...@@ -92,7 +84,11 @@ MoonApp::registerObjects(Factory & factory)
} }
// External entry point for dynamic syntax association // 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 void
MoonApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/) 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