From cb0e0b42266bbe2c364703098d2f56dd6fdd2543 Mon Sep 17 00:00:00 2001 From: aprilnovak Date: Thu, 27 Jul 2023 14:58:46 -0500 Subject: [PATCH] Add Griffin super app. Refs #753 --- Makefile | 25 +++++++++++++++++++++++++ config/check_deps.mk | 1 + src/base/CardinalApp.C | 17 +++++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/Makefile b/Makefile index 7576d9bfe..d2689cce2 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,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) +# * GRIFFIN_DIR : Top-level Griffin dir (default: $(CONTRIB_DIR)/griffin) # * 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) @@ -75,6 +76,7 @@ PETSC_DIR ?= $(MOOSE_DIR)/petsc PETSC_ARCH ?= arch-moose LIBMESH_DIR ?= $(MOOSE_DIR)/libmesh/installed/ CONTRIB_INSTALL_DIR ?= $(CARDINAL_DIR)/install +GRIFFIN_DIR ?= $(CONTRIB_DIR)/griffin BISON_DIR ?= $(CONTRIB_DIR)/bison SAM_DIR ?= $(CONTRIB_DIR)/SAM SOCKEYE_DIR ?= $(CONTRIB_DIR)/sockeye @@ -229,6 +231,29 @@ include $(FRAMEWORK_DIR)/moose.mk include $(MOOSE_DIR)/modules/modules.mk +# Griffin submodule +ifneq ($(GRIFFIN_CONTENT),) + libmesh_CXXFLAGS += -DENABLE_GRIFFIN_COUPLING + + APPLICATION_DIR := $(GRIFFIN_DIR)/isoxml + APPLICATION_NAME := isoxml + include $(FRAMEWORK_DIR)/app.mk + #ADDITIONAL_DEPEND_LIBS += $(CURDIR)/isoxml/lib/libisoxml-$(METHOD).la + + APPLICATION_DIR := $(GRIFFIN_DIR)/xs_generation + APPLICATION_NAME := mcc3 + include $(APPLICATION_DIR)/mcc3.dep + include $(FRAMEWORK_DIR)/app.mk + + APPLICATION_DIR := $(GRIFFIN_DIR)/radiation_transport + APPLICATION_NAME := radiation_transport + include $(FRAMEWORK_DIR)/app.mk + + APPLICATION_DIR := $(GRIFFIN_DIR) + APPLICATION_NAME := griffin + include $(FRAMEWORK_DIR)/app.mk +endif + # Bison submodule ifneq ($(BISON_CONTENT),) libmesh_CXXFLAGS += -DENABLE_BISON_COUPLING diff --git a/config/check_deps.mk b/config/check_deps.mk index 9986afe73..0400dde1c 100644 --- a/config/check_deps.mk +++ b/config/check_deps.mk @@ -9,6 +9,7 @@ NEKRS_CONTENT := $(shell ls $(NEKRS_DIR) 2> /dev/null) OPENMC_CONTENT := $(shell ls $(OPENMC_DIR) 2> /dev/null) DAGMC_CONTENT := $(shell ls $(DAGMC_DIR) 2> /dev/null) MOAB_CONTENT := $(shell ls $(MOAB_DIR) 2> /dev/null) +GRIFFIN_CONTENT := $(shell ls $(GRIFFIN_DIR) 2> /dev/null) BISON_CONTENT := $(shell ls $(BISON_DIR) 2> /dev/null) SAM_CONTENT := $(shell ls $(SAM_DIR) 2> /dev/null) SOCKEYE_CONTENT := $(shell ls $(SOCKEYE_DIR) 2> /dev/null) diff --git a/src/base/CardinalApp.C b/src/base/CardinalApp.C index 1bad37fce..594a427b4 100644 --- a/src/base/CardinalApp.C +++ b/src/base/CardinalApp.C @@ -26,6 +26,11 @@ #include "NekSyntax.h" #endif +#ifdef ENABLE_GRIFFIN_COUPLING +#include "GriffinApp.h" +#include "RadiationTransportApp.h" +#endif + #ifdef ENABLE_BISON_COUPLING #include "BisonApp.h" #endif @@ -77,6 +82,13 @@ CardinalApp::CardinalApp(InputParameters parameters) : MooseApp(parameters) ModulesApp::registerAllObjects(_factory, _action_factory, _syntax); CardinalApp::registerAll(_factory, _action_factory, _syntax); +#ifdef ENABLE_GRIFFIN_COUPLING + GriffinApp::registerApps(); + GriffinApp::registerAll(_factory, _action_factory, _syntax); + RadiationTransportApp::registerApps(); + RadiationTransportApp::registerAll(_factory, _action_factory, _syntax); +#endif + #ifdef ENABLE_BISON_COUPLING BisonApp::registerApps(); BisonApp::registerAll(_factory, _action_factory, _syntax); @@ -127,6 +139,11 @@ CardinalApp::registerApps() { registerApp(CardinalApp); +#ifdef ENABLE_GRIFFIN_COUPLING + GriffinApp::registerApps(); + RadiationTransportApp::registerApps(); +#endif + #ifdef ENABLE_BISON_COUPLING BisonApp::registerApps(); #endif