Skip to content

Commit

Permalink
Add BISON to install
Browse files Browse the repository at this point in the history
  • Loading branch information
aprilnovak committed Mar 16, 2023
1 parent e493ce5 commit d523fad
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# * OPENMC_DIR : Top-level OpenMC dir (default: $(CONTRIB_DIR)/openmc)
# * DAGMC_DIR : Top-level DagMC dir (default: $(CONTRIB_DIR)/DAGMC)
# * MOAB_DIR : Top-level Moab dir (default: $(CONTRIB_DIR)/moab)
# * BISON_DIR : Top-level Bison dir (default: $(CONTRIB_DIR)/bison)
# * SAM_DIR : Top-level SAM dir (default: $(CONTRIB_DIR)/SAM)
# * SOCKEYE_DIR : Top-level Sockeye dir (default: $(CONTRIB_DIR)/sockeye)
# * SODIUM_DIR : Top-level sodium dir (default: $(CONTRIB_DIR)/sodium)
Expand Down Expand Up @@ -55,6 +56,7 @@ PETSC_DIR ?= $(MOOSE_SUBMODULE)/petsc
PETSC_ARCH ?= arch-moose
LIBMESH_DIR ?= $(MOOSE_SUBMODULE)/libmesh/installed/
CONTRIB_INSTALL_DIR ?= $(CARDINAL_DIR)/install
BISON_DIR ?= $(CONTRIB_DIR)/bison
SAM_DIR ?= $(CONTRIB_DIR)/SAM
SOCKEYE_DIR ?= $(CONTRIB_DIR)/sockeye
SODIUM_DIR ?= $(CONTRIB_DIR)/sodium
Expand Down Expand Up @@ -219,6 +221,14 @@ include $(FRAMEWORK_DIR)/moose.mk

include $(MOOSE_DIR)/modules/modules.mk

# Bison submodule
ifneq ($(BISON_CONTENT),)
libmesh_CXXFLAGS += -DENABLE_BISON_COUPLING
APPLICATION_DIR := $(BISON_DIR)
APPLICATION_NAME := bison
include $(FRAMEWORK_DIR)/app.mk
endif

# SAM submodule
ifneq ($(SAM_CONTENT),)
libmesh_CXXFLAGS += -DENABLE_SAM_COUPLING
Expand Down
13 changes: 13 additions & 0 deletions src/base/CardinalApp.C
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
#include "NekSyntax.h"
#endif

#ifdef ENABLE_BISON_COUPLING
#include "BisonApp.h"
#endif

#ifdef ENABLE_SAM_COUPLING
#include "SamApp.h"
#endif
Expand Down Expand Up @@ -81,6 +85,11 @@ CardinalApp::CardinalApp(InputParameters parameters) : MooseApp(parameters)
ModulesApp::registerAll(_factory, _action_factory, _syntax);
CardinalApp::registerAll(_factory, _action_factory, _syntax);

#ifdef ENABLE_BISON_COUPLING
BisonApp::registerApps();
BisonApp::registerAll(_factory, _action_factory, _syntax);
#endif

#ifdef ENABLE_SAM_COUPLING
SamApp::registerApps();
SamApp::registerAll(_factory, _action_factory, _syntax);
Expand Down Expand Up @@ -129,6 +138,10 @@ CardinalApp::registerApps()
{
registerApp(CardinalApp);

#ifdef ENABLE_BISON_COUPLING
BisonApp::registerApps();
#endif

#ifdef ENABLE_SAM_COUPLING
SamApp::registerApps();
#endif
Expand Down

0 comments on commit d523fad

Please sign in to comment.