Commit 892b7d6d authored by Ron Rahaman's avatar Ron Rahaman

Merge branch 'makefile-fixes-rebase' into 'develop'

Makefile fixes

See merge request !16
parents edecc6b5 5a071439
......@@ -53,9 +53,14 @@ The `configure` script may be run with additional options (for example, to point
To run an example problem, it is recommended to use the convenience script `moon/examples/build_coupled_nek`. This script will automatically setup some input files needed by Nek5000 (such as SESSION.NAME). The script takes one command-line argument for the MOOSE configuration file, `-i <config_file>.i`.
```
$ cd moon/examples/integration_example
$ ../../scripts/build_coupled_nek.sh -i coefficient_integration.i
$ ../../moon-integration-example-opt -i coefficient_integration.i
```
Linking to libmoon
------------------
The MOON libraries are output to the top-level lib/ directory.
Developing Nek5000 in MOON
--------------------------
Developers may freely modify src/Nek5000 as if it were a normal part of the MOON repo. This is because Nek5000 is included as a Git subtree (rather than a submodule). For routine commits, pushes, and pulls to the MOON repository, no extra Git commands are necessary.
......
###############################################################################
################### MOOSE Application Standard Makefile #######################
# MOON MAKEFILE
###############################################################################
#
# Optional Environment variables
# MOOSE_DIR - Root directory of the MOOSE project
# MOOSE_DIR - Root directory of the MOOSE project
# FRAMEWORK_DIR - Location of the MOOSE framework
#
###############################################################################
# Use the MOOSE submodule if it exists and MOOSE_DIR is not set
MOOSE_SUBMODULE := $(CURDIR)/moose
ifneq ($(wildcard $(MOOSE_SUBMODULE)/framework/Makefile),)
MOOSE_DIR ?= $(MOOSE_SUBMODULE)
else
MOOSE_DIR ?= $(shell dirname `pwd`)/moose
endif
MOON_DIR := @abs_srcdir@
MOOSE_DIR := @MOOSE_DIR@
FRAMEWORK_DIR := @MOOSE_DIR@/framework
###############################################################################
# framework
FRAMEWORK_DIR := $(MOOSE_DIR)/framework
include $(FRAMEWORK_DIR)/build.mk
include $(FRAMEWORK_DIR)/moose.mk
################################## MODULES ####################################
SOLID_MECHANICS := yes
CONTACT := yes
SOLID_MECHANICS := no
CONTACT := no
HEAT_CONDUCTION := yes
WATER_STEAM_EOS := yes
MISC := yes
PHASE_FIELD := yes
XFEM := yes
WATER_STEAM_EOS := no
MISC := no
PHASE_FIELD := no
XFEM := no
include $(MOOSE_DIR)/modules/modules.mk
###############################################################################
# dep apps
APPLICATION_DIR := $(CURDIR)
APPLICATION_NAME := moon
APP_REV_HEADER := $(CURDIR)/include/base/MoonRevision.h
DEP_APPS := $(shell $(FRAMEWORK_DIR)/scripts/find_dep_apps.py $(APPLICATION_NAME))
################################## MOON ########################################
# nek
include moon.mk
APPLICATION_DIR := $(MOON_DIR)
APPLICATION_NAME := moon-$(subst _,-,$(CASENAME))
MAIN_DIR := $(APPLICATION_DIR)/src
BUILD_EXEC := yes
DEP_APPS := $(shell $(FRAMEWORK_DIR)/scripts/find_dep_apps.py integration_example)
include $(FRAMEWORK_DIR)/app.mk
###############################################################################
......
@CASENAME@
@abs_builddir@
......@@ -6,6 +6,7 @@ nek_objdir := @builddir@/nek_obj
nek_includedir := @builddir@/include
# == Discovered by autoconf script
CASENAME := @CASENAME@
nek_CFLAGS := @CFLAGS@
nek_INCLUDES := -I$(builddir) -I$(nek_includedir) -I$(srcdir)/Nek5000/core -I$(srcdir)/Nek5000/core/cmt -I$(srcdir)/Nek5000/core/3rd_party -I$(srcdir)/Nek5000/jl
nek_CPPFLAGS := @CPPFLAGS@ @DEFS@ @nek_DEFS@ $(nek_INCLUDES)
......
......@@ -524,6 +524,8 @@ fi
# ALL DONE!
###############################################################################
AC_CONFIG_FILES([nek.mk:Nek5000/nek.mk.in])
AC_CONFIG_FILES([moon.mk:config/moon.mk.in Makefile:config/Makefile.in
SESSION.NAME:config/SESSION.NAME.in])
AC_OUTPUT
###############################################################################
################### MOOSE Application Standard Makefile #######################
###############################################################################
#
# Optional Environment variables
# MOOSE_DIR - Root directory of the MOOSE project
# FRAMEWORK_DIR - Location of the MOOSE framework
#
###############################################################################
EXAMPLE_DIR ?= $(shell dirname `pwd`)
MOON_DIR ?= $(shell dirname $(EXAMPLE_DIR))
MOOSE_DIR ?= $(MOON_DIR)/moose
FRAMEWORK_DIR ?= $(MOOSE_DIR)/framework
###############################################################################
# framework
include $(FRAMEWORK_DIR)/build.mk
include $(FRAMEWORK_DIR)/moose.mk
################################## MODULES ####################################
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
###############################################################################
# nek
include nek.mk
# moon
APPLICATION_DIR := $(MOON_DIR)
APPLICATION_NAME := moon
DEP_APPS := $(shell $(FRAMEWORK_DIR)/scripts/find_dep_apps.py $(APPLICATION_NAME))
include $(FRAMEWORK_DIR)/app.mk
# case
APPLICATION_DIR := $(CURDIR)
APPLICATION_NAME := $(shell basename $(APPLICATION_DIR))
MAIN_DIR := $(MOON_DIR)/src
BUILD_EXEC := yes
DEP_APPS := $(shell $(FRAMEWORK_DIR)/scripts/find_dep_apps.py $(APPLICATION_NAME))
include $(FRAMEWORK_DIR)/app.mk
###############################################################################
# Additional special case targets should be added here
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