Migration step 1: replace BOXLIB_HOME with AMREX_HOME

wazedxwxx · Dec 14, 2016 · beebbfc · beebbfc
1 parent 816f4e7
commit beebbfc
Show file tree

Hide file tree

Showing 89 changed files with 633 additions and 617 deletions.
diff --git a/MiniApps/AMR_Adv_Diff_F90/GNUmakefile b/MiniApps/AMR_Adv_Diff_F90/GNUmakefile
@@ -1,6 +1,6 @@
-# BOXLIB_HOME defines the directory in which we will find all the BoxLib code
-# If you set BOXLIB_HOME as an environment variable, this line will be ignored
-BOXLIB_HOME ?= ../..
+# AMREX_HOME defines the directory in which we will find all the BoxLib code
+# If you set AMREX_HOME as an environment variable, this line will be ignored
+AMREX_HOME ?= ../..
 
 NDEBUG    := t
 MPI       :=
@@ -9,16 +9,16 @@ PROF      :=
 COMP      := gfortran
 MKVERBOSE := t
 
-include $(BOXLIB_HOME)/Tools/F_mk/GMakedefs.mak
+include $(AMREX_HOME)/Tools/F_mk/GMakedefs.mak
 
 include ./GPackage.mak
 VPATH_LOCATIONS += .
 
-include $(BOXLIB_HOME)/Src/F_BaseLib/GPackage.mak
-VPATH_LOCATIONS += $(BOXLIB_HOME)/Src/F_BaseLib
+include $(AMREX_HOME)/Src/F_BaseLib/GPackage.mak
+VPATH_LOCATIONS += $(AMREX_HOME)/Src/F_BaseLib
 
 main.$(suf).exe: $(objects) 
 	$(LINK.f90) -o main.$(suf).exe $(objects) $(libraries)
 	@echo SUCCESS
 
-include $(BOXLIB_HOME)/Tools/F_mk/GMakerules.mak
+include $(AMREX_HOME)/Tools/F_mk/GMakerules.mak
diff --git a/MiniApps/FillBoundary/GNUmakefile b/MiniApps/FillBoundary/GNUmakefile
@@ -1,4 +1,4 @@
-BOXLIB_HOME = ../../../BoxLib
+AMREX_HOME = ../../../amrex
 
 DEBUG        = FALSE
 USE_MPI      = TRUE
@@ -17,8 +17,8 @@ EBASE        = fbtest
 
 CEXE_sources += MultiFabFillBoundaryTest.cpp
 
-include $(BOXLIB_HOME)/Tools/C_mk/Make.defs
-include $(BOXLIB_HOME)/Src/C_BoundaryLib/Make.package
-include $(BOXLIB_HOME)/Src/C_BaseLib/Make.package
+include $(AMREX_HOME)/Tools/C_mk/Make.defs
+include $(AMREX_HOME)/Src/C_BoundaryLib/Make.package
+include $(AMREX_HOME)/Src/C_BaseLib/Make.package
 
-include $(BOXLIB_HOME)/Tools/C_mk/Make.rules
+include $(AMREX_HOME)/Tools/C_mk/Make.rules
diff --git a/MiniApps/MultiGrid_C/GNUmakefile b/MiniApps/MultiGrid_C/GNUmakefile
@@ -1,6 +1,6 @@
-# BOXLIB_HOME defines the directory in which we will find all the BoxLib code -- if this is already defined
+# AMREX_HOME defines the directory in which we will find all the BoxLib code -- if this is already defined
 #    then the line below will be ignored
-BOXLIB_HOME = ../..
+AMREX_HOME = ../..
 
 # If you try to build with USE_MPI = TRUE and the make system can not find your mpi files, it may be because
 #    MPI_HOME is not already defined on your machine.  In that case, you may need to set
@@ -31,16 +31,16 @@ EBASE        = main
 CPPFLAGS += -DCG_USE_OLD_CONVERGENCE_CRITERIA
 
 
-include $(BOXLIB_HOME)/Tools/C_mk/Make.defs
+include $(AMREX_HOME)/Tools/C_mk/Make.defs
 
 CEXE_sources += $(EBASE).cpp
 
 include Make.package
-include $(BOXLIB_HOME)/Src/C_BoundaryLib/Make.package
-include $(BOXLIB_HOME)/Src/LinearSolvers/C_CellMG/Make.package
-include $(BOXLIB_HOME)/Src/C_BaseLib/Make.package
+include $(AMREX_HOME)/Src/C_BoundaryLib/Make.package
+include $(AMREX_HOME)/Src/LinearSolvers/C_CellMG/Make.package
+include $(AMREX_HOME)/Src/C_BaseLib/Make.package
 
 all: $(executable)
 	@echo SUCCESS
 
-include $(BOXLIB_HOME)/Tools/C_mk/Make.rules
+include $(AMREX_HOME)/Tools/C_mk/Make.rules
diff --git a/MiniApps/PGAS_SMC/GNUmakefile b/MiniApps/PGAS_SMC/GNUmakefile
@@ -1,5 +1,5 @@
 
-BOXLIB_HOME ?= ../..
+AMREX_HOME ?= ../..
 
 # compilation options
 COMP    = g++
@@ -22,15 +22,15 @@ Bpack := ./Make.package
 
 EBASE = SMC
 
-include $(BOXLIB_HOME)/Tools/C_mk/Make.defs
+include $(AMREX_HOME)/Tools/C_mk/Make.defs
 
 all: $(executable)
 	@echo SUCCESS
 
 include ./Make.package
-include $(BOXLIB_HOME)/Src/C_BaseLib/Make.package
+include $(AMREX_HOME)/Src/C_BaseLib/Make.package
 
-include $(BOXLIB_HOME)/Tools/C_mk/Make.rules
+include $(AMREX_HOME)/Tools/C_mk/Make.rules
 
 
 #-----------------------------------------------------------------------------

diff --git a/MiniApps/SMC/GNUmakefile b/MiniApps/SMC/GNUmakefile
@@ -1,4 +1,4 @@
-BOXLIB_HOME := ../..
+AMREX_HOME := ../..
 
 NDEBUG := t
 PROF   := 
@@ -9,7 +9,7 @@ COMP := gfortran
 
 MKVERBOSE := t
 
-include $(BOXLIB_HOME)/Tools/F_mk/GMakedefs.mak
+include $(AMREX_HOME)/Tools/F_mk/GMakedefs.mak
 
 include ./GPackage.mak
 VPATH_LOCATIONS += .
@@ -36,8 +36,8 @@ BOXLIB_CORE := Src/F_BaseLib
 # we need to tell the compiler about.
 
 # BoxLib
-Fmpack += $(foreach dir, $(BOXLIB_CORE), $(BOXLIB_HOME)/$(dir)/GPackage.mak)
-Fmlocs += $(foreach dir, $(BOXLIB_CORE), $(BOXLIB_HOME)/$(dir))
+Fmpack += $(foreach dir, $(BOXLIB_CORE), $(AMREX_HOME)/$(dir)/GPackage.mak)
+Fmlocs += $(foreach dir, $(BOXLIB_CORE), $(AMREX_HOME)/$(dir))
 
 # include the necessary GPackage.mak files that define this setup
 include $(Fmpack)
@@ -76,17 +76,17 @@ PROBIN_TEMPLATE := ./probin.template
 PROBIN_PARAMETER_DIRS = ./
 
 # list of all valid _parameters files for probin
-PROBIN_PARAMETERS := $(shell $(BOXLIB_HOME)/Tools/F_scripts/findparams.py $(PROBIN_PARAMETER_DIRS))
+PROBIN_PARAMETERS := $(shell $(AMREX_HOME)/Tools/F_scripts/findparams.py $(PROBIN_PARAMETER_DIRS))
 
 probin.f90: $(PROBIN_PARAMETERS) $(PROBIN_TEMPLATE)
 	@echo " "
 	@echo "${bold}WRITING probin.f90${normal}"
 ifdef MKVERBOSE
-	$(BOXLIB_HOME)/Tools/F_scripts/write_probin.py \
+	$(AMREX_HOME)/Tools/F_scripts/write_probin.py \
            -t $(PROBIN_TEMPLATE) -o probin.f90 -n probin \
            --pa "$(PROBIN_PARAMETERS)"
 else
-	@$(BOXLIB_HOME)/Tools/F_scripts/write_probin.py \
+	@$(AMREX_HOME)/Tools/F_scripts/write_probin.py \
            -t $(PROBIN_TEMPLATE) -o probin.f90 -n probin \
            --pa "$(PROBIN_PARAMETERS)"
 endif
@@ -101,17 +101,17 @@ build_info.f90:
 	@echo " "
 	@echo "${bold}WRITING build_info.f90${normal}"
 ifdef MKVERBOSE
-	$(BOXLIB_HOME)/Tools/F_scripts/make_build_info2 \
+	$(AMREX_HOME)/Tools/F_scripts/make_build_info2 \
             "$(Fmdirs)" "$(COMP)" "$(FCOMP_VERSION)" \
             "$(COMPILE.f90)" "$(COMPILE.f)" \
             "$(COMPILE.c)" "$(LINK.f90)" \
-            "GIT=$(BOXLIB_HOME)"
+            "GIT=$(AMREX_HOME)"
 else
-	@$(BOXLIB_HOME)/Tools/F_scripts/make_build_info2 \
+	@$(AMREX_HOME)/Tools/F_scripts/make_build_info2 \
             "$(Fmdirs)" "$(COMP)" "$(FCOMP_VERSION)" \
             "$(COMPILE.f90)" "$(COMPILE.f)" \
             "$(COMPILE.c)" "$(LINK.f90)" \
-            "GIT=$(BOXLIB_HOME)"
+            "GIT=$(AMREX_HOME)"
 endif
 	@echo " "
 
@@ -128,7 +128,7 @@ endif
 
 #-----------------------------------------------------------------------------
 # include the BoxLib Fortran Makefile rules
-include $(BOXLIB_HOME)/Tools/F_mk/GMakerules.mak
+include $(AMREX_HOME)/Tools/F_mk/GMakerules.mak
 
 ifeq ($(findstring bint01.nersc.gov, $(HOSTNAMEF)), bint01.nersc.gov)
 #  F90FLAGS += -no-prec-div -fno-alias -fimf-precision=low -fimf-domain-exclusion=15 -align array64byte -opt-assume-safe-padding -opt-streaming-stores always -opt-streaming-cache-evict=0

diff --git a/Src/C_AMRLib/Make.package b/Src/C_AMRLib/Make.package
@@ -42,6 +42,6 @@ ifeq ($(USE_SDCLIB), TRUE)
   CEXE_headers += MLSDCAmr.H
 endif
 
-VPATH_LOCATIONS += $(BOXLIB_HOME)/Src/C_AMRLib
-INCLUDE_LOCATIONS += $(BOXLIB_HOME)/Src/C_AMRLib
+VPATH_LOCATIONS += $(AMREX_HOME)/Src/C_AMRLib
+INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/C_AMRLib
 
diff --git a/Src/C_AmrCoreLib/Make.package b/Src/C_AmrCoreLib/Make.package
@@ -11,5 +11,5 @@ ifeq ($(USE_PARTICLES), TRUE)
   CEXE_headers += AmrParGDB.H AmrParticles.H
 endif
 
-VPATH_LOCATIONS += $(BOXLIB_HOME)/Src/C_AmrCoreLib
-INCLUDE_LOCATIONS += $(BOXLIB_HOME)/Src/C_AmrCoreLib
+VPATH_LOCATIONS += $(AMREX_HOME)/Src/C_AmrCoreLib
+INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/C_AmrCoreLib
diff --git a/Src/C_BaseLib/GNUmakefile b/Src/C_BaseLib/GNUmakefile
@@ -2,9 +2,9 @@
 # $Id: GNUmakefile,v 1.25 2010-10-01 21:54:57 marc Exp $
 #
 
-BOXLIB_HOME = ../..
+AMREX_HOME = ../..
 
-TOP = $(BOXLIB_HOME)
+TOP = $(AMREX_HOME)
 
 PRECISION = DOUBLE
 DEBUG     = TRUE
@@ -21,7 +21,7 @@ LBASE = box
 #
 # Where libraries and include files will be installed.
 #
-INSTALL_ROOT = $(BOXLIB_HOME)
+INSTALL_ROOT = $(AMREX_HOME)
 
 ifeq ($(BL_NO_FORT),TRUE)
   DEFINES += -DBL_NO_FORT
@@ -152,7 +152,7 @@ install_ps: BoxLib.ps
         fi
 	$(INSTALL_DATA) BoxLib.ps $(INSTALL_ROOT)/ps
 
-WRAPPERGEN=$(BOXLIB_HOME)/util/wrappergen/wrappergen
+WRAPPERGEN=$(AMREX_HOME)/util/wrappergen/wrappergen
 BLMpi.cpp: BLMpi.w
 	$(WRAPPERGEN) -c++ -o BLMpi.cpp -w BLMpi.w
 

diff --git a/Src/C_BaseLib/Make.package b/Src/C_BaseLib/Make.package
@@ -167,6 +167,6 @@ ifeq ($(TINY_PROFILE),TRUE)
   C$(BOXLIB_BASE)_sources += TinyProfiler.cpp
 endif
 
-VPATH_LOCATIONS += $(BOXLIB_HOME)/Src/C_BaseLib
-INCLUDE_LOCATIONS += $(BOXLIB_HOME)/Src/C_BaseLib
+VPATH_LOCATIONS += $(AMREX_HOME)/Src/C_BaseLib
+INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/C_BaseLib
 
diff --git a/Src/C_BoundaryLib/Make.package b/Src/C_BoundaryLib/Make.package
@@ -14,6 +14,6 @@ F$(BNDRYLIB_BASE)_headers += INTERPBNDRYDATA_F.H
 
 F$(BNDRYLIB_BASE)_sources += INTERPBNDRYDATA_$(DIM)D.F LO_UTIL.F
 
-VPATH_LOCATIONS += $(BOXLIB_HOME)/Src/C_BoundaryLib
-INCLUDE_LOCATIONS += $(BOXLIB_HOME)/Src/C_BoundaryLib
+VPATH_LOCATIONS += $(AMREX_HOME)/Src/C_BoundaryLib
+INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/C_BoundaryLib
 
diff --git a/Src/C_ParticleLib/Make.package b/Src/C_ParticleLib/Make.package
@@ -9,5 +9,5 @@ C$(BOXLIB_BASE)_headers += Particles.H ParticleInit.H ParGDB.H TracerParticles.H
 F$(BOXLIB_BASE)_headers += Particles_F.H
 F$(BOXLIB_BASE)_sources += Particles_$(DIM)D.F
 
-VPATH_LOCATIONS += $(BOXLIB_HOME)/Src/C_ParticleLib
-INCLUDE_LOCATIONS += $(BOXLIB_HOME)/Src/C_ParticleLib
+VPATH_LOCATIONS += $(AMREX_HOME)/Src/C_ParticleLib
+INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/C_ParticleLib
diff --git a/Src/Extern/amrdata/Make.package b/Src/Extern/amrdata/Make.package
@@ -3,5 +3,5 @@ CEXE_headers += AmrData.H AmrvisConstants.H DataServices.H
 FEXE_headers += 
 FEXE_sources += FABUTIL_${DIM}D.F
 
-VPATH_LOCATIONS += $(BOXLIB_HOME)/Src/Extern/amrdata
-INCLUDE_LOCATIONS += $(BOXLIB_HOME)/Src/Extern/amrdata
+VPATH_LOCATIONS += $(AMREX_HOME)/Src/Extern/amrdata
+INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/Extern/amrdata
diff --git a/Src/Extern/hpgmg/Make.package b/Src/Extern/hpgmg/Make.package
@@ -1,5 +1,5 @@
 CEXE_sources += BL_HPGMG.cpp
 CEXE_headers += BL_HPGMG.H
 
-VPATH_LOCATIONS += $(BOXLIB_HOME)/Src/Extern/hpgmg
-INCLUDE_LOCATIONS += $(BOXLIB_HOME)/Src/Extern/hpgmg
+VPATH_LOCATIONS += $(AMREX_HOME)/Src/Extern/hpgmg
+INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/Extern/hpgmg
diff --git a/Src/F_BaseLib/FParallelMG.mak b/Src/F_BaseLib/FParallelMG.mak
@@ -79,5 +79,5 @@ CEXE_sources += MemProfiler_f.cpp
 f90EXE_sources += memprof.f90
 endif
 
-VPATH_LOCATIONS += $(BOXLIB_HOME)/Src/F_BaseLib
-INCLUDE_LOCATIONS += $(BOXLIB_HOME)/Src/F_BaseLib
+VPATH_LOCATIONS += $(AMREX_HOME)/Src/F_BaseLib
+INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/F_BaseLib
diff --git a/Src/F_BaseLib/unittests/GNUmakefile b/Src/F_BaseLib/unittests/GNUmakefile
@@ -7,8 +7,8 @@ MKVERBOSE :=t
 COMP := gfortran
 
 # include the main Makefile stuff
-BOXLIB_HOME := ../../..
-include $(BOXLIB_HOME)/Tools/F_mk/GMakedefs.mak
+AMREX_HOME := ../../..
+include $(AMREX_HOME)/Tools/F_mk/GMakedefs.mak
 
 # core BoxLib directories
 BOXLIB_CORE := Src/F_BaseLib
@@ -21,8 +21,8 @@ Fmincludes :=
 
 
 # BoxLib stuff
-Fmpack += $(foreach dir, $(BOXLIB_CORE), $(BOXLIB_HOME)/$(dir)/GPackage.mak)
-Fmlocs += $(foreach dir, $(BOXLIB_CORE), $(BOXLIB_HOME)/$(dir))
+Fmpack += $(foreach dir, $(BOXLIB_CORE), $(AMREX_HOME)/$(dir)/GPackage.mak)
+Fmlocs += $(foreach dir, $(BOXLIB_CORE), $(AMREX_HOME)/$(dir))
 
 # any include files
 Fmincs := $(foreach dir, $(Fmincludes), $(MAESTRO_TOP_DIR)/$(dir))
@@ -40,7 +40,7 @@ programs += tests
 
 all: $(pnames)
 
-include $(BOXLIB_HOME)/Tools/F_mk/GMakerules.mak
+include $(AMREX_HOME)/Tools/F_mk/GMakerules.mak
 
 
 %.$(suf).exe:%.f90 $(objects)

diff --git a/Src/LinearSolvers/C_CellMG/Make.package b/Src/LinearSolvers/C_CellMG/Make.package
@@ -10,5 +10,5 @@ FEXE_headers += ABec_F.H LO_F.H LP_F.H MG_F.H
 FEXE_sources += ABec_$(DIM)D.F ABec_UTIL.F \
                 LO_$(DIM)D.F LP_$(DIM)D.F MG_$(DIM)D.F
 
-VPATH_LOCATIONS += $(BOXLIB_HOME)/Src/LinearSolvers/C_CellMG
-INCLUDE_LOCATIONS += $(BOXLIB_HOME)/Src/LinearSolvers/C_CellMG
+VPATH_LOCATIONS += $(AMREX_HOME)/Src/LinearSolvers/C_CellMG
+INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/LinearSolvers/C_CellMG
diff --git a/Src/LinearSolvers/C_CellMG4/Make.package b/Src/LinearSolvers/C_CellMG4/Make.package
@@ -3,5 +3,5 @@ CEXE_headers += ABec2.H ABec4.H
 FEXE_headers += ABec2_F.H ABec4_F.H
 FEXE_sources += ABec2_$(DIM)D.F ABec4_$(DIM)D.F
 
-VPATH_LOCATIONS += $(BOXLIB_HOME)/Src/LinearSolvers/C_CellMG4
-INCLUDE_LOCATIONS += $(BOXLIB_HOME)/Src/LinearSolvers/C_CellMG4
+VPATH_LOCATIONS += $(AMREX_HOME)/Src/LinearSolvers/C_CellMG4
+INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/LinearSolvers/C_CellMG4
diff --git a/Src/LinearSolvers/C_TensorMG/Make.package b/Src/LinearSolvers/C_TensorMG/Make.package
@@ -17,5 +17,5 @@ else
   F$(MCMG_BASE)_sources += DV_3D1.F DV_3D2.F DV_3D3.F
 endif
 
-VPATH_LOCATIONS += $(BOXLIB_HOME)/Src/LinearSolvers/C_TensorMG
-INCLUDE_LOCATIONS += $(BOXLIB_HOME)/Src/LinearSolvers/C_TensorMG
+VPATH_LOCATIONS += $(AMREX_HOME)/Src/LinearSolvers/C_TensorMG
+INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/LinearSolvers/C_TensorMG
diff --git a/Src/LinearSolvers/C_to_F_MG/Make.package b/Src/LinearSolvers/C_to_F_MG/Make.package
@@ -2,5 +2,5 @@ CEXE_sources += MGT_Solver.cpp FMultiGrid.cpp
 CEXE_headers += MGT_Solver.H FMultiGrid.H
 CEXE_headers += stencil_types.H
 
-VPATH_LOCATIONS += $(BOXLIB_HOME)/Src/LinearSolvers/C_to_F_MG
-INCLUDE_LOCATIONS += $(BOXLIB_HOME)/Src/LinearSolvers/C_to_F_MG
+VPATH_LOCATIONS += $(AMREX_HOME)/Src/LinearSolvers/C_to_F_MG
+INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/LinearSolvers/C_to_F_MG
diff --git a/Src/LinearSolvers/F_MG/FParallelMG.mak b/Src/LinearSolvers/F_MG/FParallelMG.mak
@@ -9,12 +9,12 @@
 #
 # ------------- in your GNUmakefile --------------
 # 
-# FBOXLIB_HOME =
-# FBOXLIB_HOME = ../../../fParallel 
-# ifdef FBOXLIB_HOME
+# FAMREX_HOME =
+# FAMREX_HOME = ../../../fParallel 
+# ifdef FAMREX_HOME
 #   include FParallelMG.mak
 #   Fdirs   := boxlib mg extern/LAPACK
-#   Flocs   := $(foreach dir, $(Fdirs), $(FBOXLIB_HOME)/$(dir))
+#   Flocs   := $(foreach dir, $(Fdirs), $(FAMREX_HOME)/$(dir))
 # endif
 #
 # VPATH_LOCATIONS   += . $(Blocs) $(Flocs)
@@ -67,5 +67,5 @@ cEXE_headers   += mg_cpp_f.h
 
 f90EXE_sources += stencil_util.f90
 
-VPATH_LOCATIONS += $(BOXLIB_HOME)/Src/LinearSolvers/F_MG
-INCLUDE_LOCATIONS += $(BOXLIB_HOME)/Src/LinearSolvers/F_MG
+VPATH_LOCATIONS += $(AMREX_HOME)/Src/LinearSolvers/F_MG
+INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/LinearSolvers/F_MG