diff options
| -rw-r--r-- | GNUmakefile | 8 | ||||
| -rw-r--r-- | Source/Make.WarpX | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/GNUmakefile b/GNUmakefile index dedd0ee85..90d45389a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -27,13 +27,7 @@ EBASE = main USE_PYTHON_MAIN = FALSE USE_SENSEI_INSITU = FALSE - -USE_CONDUIT ?= FALSE -USE_ASCENT ?= FALSE - -# The following must be absolute paths -CONDUIT_DIR ?= /project/projectdirs/alpine/ghweber/ascent/uberenv_libs/spack/opt/spack/cray-cnl9-haswell/gcc-5.3.0/conduit-master-w6ilqv5kfgt2wgbftzpssjj3lttgkqkv -ASCENT_DIR ?= /project/projectdirs/alpine/ghweber/ascent/uberenv_libs/ascent-install +USE_ASCENT_INSITU = FALSE WarpxBinDir = Bin diff --git a/Source/Make.WarpX b/Source/Make.WarpX index ff6916548..eb5725221 100644 --- a/Source/Make.WarpX +++ b/Source/Make.WarpX @@ -12,6 +12,15 @@ ifeq ($(USE_GPU),TRUE) NVCC_HOST_COMP = gcc endif +ifeq ($(USE_ASCENT_INSITU),TRUE) + ASCENT_HOME ?= NOT_SET + ifneq ($(ASCENT_HOME),NOT_SET) + include $(ASCENT_HOME)/share/ascent/ascent_config.mk + endif + USE_CONDUIT = TRUE + USE_ASCENT = TRUE +endif + include $(AMREX_HOME)/Tools/GNUMake/Make.defs ifndef USE_PYTHON_MAIN |