Fix AMREX_HOME in Tests and Tutorials only (AMReX-Codes#1233)

* 1) Replace all instances of "AMREX_HOME ?=" by "AMREX_HOME =" in Tests and Tutorials only. Since these exist within the amrex directory structure the default should be that they always use the amrex they are part of, not the one set by the user's environment variable 2) Replace all instances of BoxLib/BOXLIB/boxlib by AMReX.
mohuangrui · Aug 6, 2020 · fe8cc5f · fe8cc5f
1 parent 888e804
commit fe8cc5f
Show file tree

Hide file tree

Showing 129 changed files with 140 additions and 163 deletions.
diff --git a/Tests/Algoim/GNUmakefile b/Tests/Algoim/GNUmakefile
@@ -13,7 +13,7 @@ COMP = gnu
 
 DIM = 3
 
-AMREX_HOME ?= ../../..
+AMREX_HOME = ../../..
 
 include $(AMREX_HOME)/Tools/GNUMake/Make.defs
 include ./Make.package

diff --git a/Tests/AsyncOut/multifab/GNUmakefile b/Tests/AsyncOut/multifab/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG = FALSE
 DIM = 3

diff --git a/Tests/BBIOBenchmark/GNUmakefile b/Tests/BBIOBenchmark/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../amrex
+AMREX_HOME = ../../../amrex
 
 PROFILE   = FALSE
 PRECISION = DOUBLE

diff --git a/Tests/BaseFabTesting/GNUmakefile b/Tests/BaseFabTesting/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../
+AMREX_HOME = ../../
 
 DEBUG   = FALSE
 #DEBUG   = TRUE

diff --git a/Tests/GPU/CudaGraphs/BuildingGraphs/GNUmakefile b/Tests/GPU/CudaGraphs/BuildingGraphs/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../..
+AMREX_HOME = ../../../..
 
 DEBUG	= FALSE
 #DEBUG	= TRUE

diff --git a/Tests/GPU/CudaGraphs/GraphBoundary/GNUmakefile b/Tests/GPU/CudaGraphs/GraphBoundary/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../..
+AMREX_HOME = ../../../..
 
 DEBUG	= FALSE
 #DEBUG	= TRUE

diff --git a/Tests/GPU/CudaGraphs/GraphInitTest/GNUmakefile b/Tests/GPU/CudaGraphs/GraphInitTest/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../..
+AMREX_HOME = ../../../..
 
 DEBUG	= FALSE
 #DEBUG	= TRUE

diff --git a/Tests/GPU/CudaGraphs/GraphReuseCopy/GNUmakefile b/Tests/GPU/CudaGraphs/GraphReuseCopy/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../..
+AMREX_HOME = ../../../..
 
 DEBUG	= FALSE
 #DEBUG	= TRUE

diff --git a/Tests/GPU/CudaGraphs/GraphWithMemcpy/GNUmakefile b/Tests/GPU/CudaGraphs/GraphWithMemcpy/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../..
+AMREX_HOME = ../../../..
 
 DEBUG	= FALSE
 #DEBUG	= TRUE

diff --git a/Tests/GPU/CuptiTest/Exec/CUDA/GNUmakefile b/Tests/GPU/CuptiTest/Exec/CUDA/GNUmakefile
@@ -1,6 +1,5 @@
 # AMREX_HOME defines the directory in which we will find all the AMReX code.
-# If you set AMREX_HOME as an environment variable, this line will be ignored
-AMREX_HOME ?= ../../../../../
+AMREX_HOME = ../../../../../
 
 DEBUG     = FALSE
 USE_MPI   = TRUE 

diff --git a/Tests/GPU/Fuse/GNUmakefile b/Tests/GPU/Fuse/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../..
+AMREX_HOME = ../../..
 
 DEBUG	= TRUE
 DEBUG	= FALSE

diff --git a/Tests/GPU/Locking/GNUmakefile b/Tests/GPU/Locking/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG	= FALSE
 

diff --git a/Tests/GPU/RandomNumberGeneration/GNUmakefile b/Tests/GPU/RandomNumberGeneration/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG	= FALSE
 

diff --git a/Tests/GPU/Vector/GNUmakefile b/Tests/GPU/Vector/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG	= FALSE
 

diff --git a/Tests/GPU/libamrex_CUDA/GNUmakefile b/Tests/GPU/libamrex_CUDA/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_INSTALL_DIR ?= ../../../tmp_install_dir
+AMREX_INSTALL_DIR = ?../../../tmp_install_dir
 CUDA_ARCH ?= 60
 
 CXX = nvcc

diff --git a/Tests/HDF5Benchmark/GNUmakefile b/Tests/HDF5Benchmark/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../
+AMREX_HOME = ../../
 
 DEBUG	= TRUE
 DEBUG	= FALSE

diff --git a/Tests/LinearSolvers/CellEB/GNUmakefile b/Tests/LinearSolvers/CellEB/GNUmakefile
@@ -15,7 +15,7 @@ COMP = gnu
 
 DIM = 2
 
-AMREX_HOME ?= ../../..
+AMREX_HOME = ../../..
 
 include $(AMREX_HOME)/Tools/GNUMake/Make.defs
 include ./Make.package

diff --git a/Tests/LinearSolvers/CellEB2/GNUmakefile b/Tests/LinearSolvers/CellEB2/GNUmakefile
@@ -14,7 +14,7 @@ COMP = gnu
 
 DIM = 2
 
-AMREX_HOME ?= ../../..
+AMREX_HOME = ../../..
 
 include $(AMREX_HOME)/Tools/GNUMake/Make.defs
 

diff --git a/Tests/LinearSolvers/CellOverset/GNUmakefile b/Tests/LinearSolvers/CellOverset/GNUmakefile
@@ -18,7 +18,7 @@ COMP = gnu
 
 DIM = 2
 
-AMREX_HOME ?= ../../..
+AMREX_HOME = ../../..
 
 include $(AMREX_HOME)/Tools/GNUMake/Make.defs
 include ./Make.package

diff --git a/Tests/LinearSolvers/EBConvergenceTest/GNUmakefile b/Tests/LinearSolvers/EBConvergenceTest/GNUmakefile
@@ -13,7 +13,7 @@ COMP = gnu
 
 DIM = 2
 
-AMREX_HOME ?= ../../..
+AMREX_HOME = ../../..
 
 include $(AMREX_HOME)/Tools/GNUMake/Make.defs
 

diff --git a/Tests/LinearSolvers/EBTensor/GNUmakefile b/Tests/LinearSolvers/EBTensor/GNUmakefile
@@ -13,7 +13,7 @@ COMP = gnu
 
 DIM = 3
 
-AMREX_HOME ?= ../../..
+AMREX_HOME = ../../..
 
 include $(AMREX_HOME)/Tools/GNUMake/Make.defs
 

diff --git a/Tests/LinearSolvers/EBflux_grad/GNUmakefile b/Tests/LinearSolvers/EBflux_grad/GNUmakefile
@@ -13,7 +13,7 @@ COMP = gnu
 
 DIM = 2
 
-AMREX_HOME ?= ../../..
+AMREX_HOME = ../../..
 
 include $(AMREX_HOME)/Tools/GNUMake/Make.defs
 

diff --git a/Tests/LinearSolvers/MLMG/GNUmakefile b/Tests/LinearSolvers/MLMG/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG	?= FALSE
 DIM	?= 3

diff --git a/Tests/LinearSolvers/NodalOverset/GNUmakefile b/Tests/LinearSolvers/NodalOverset/GNUmakefile
@@ -16,7 +16,7 @@ COMP = gnu
 
 DIM = 2
 
-AMREX_HOME ?= ../../..
+AMREX_HOME = ../../..
 
 include $(AMREX_HOME)/Tools/GNUMake/Make.defs
 include ./Make.package

diff --git a/Tests/LinearSolvers/NodeEB/GNUmakefile b/Tests/LinearSolvers/NodeEB/GNUmakefile
@@ -16,7 +16,7 @@ COMP = gnu
 
 DIM = 3
 
-AMREX_HOME ?= ../../..
+AMREX_HOME = ../../..
 
 include $(AMREX_HOME)/Tools/GNUMake/Make.defs
 include ./Make.package

diff --git a/Tests/LinearSolvers/TensorOverset/GNUmakefile b/Tests/LinearSolvers/TensorOverset/GNUmakefile
@@ -18,7 +18,7 @@ COMP = gnu
 
 DIM = 3
 
-AMREX_HOME ?= ../../..
+AMREX_HOME = ../../..
 
 include $(AMREX_HOME)/Tools/GNUMake/Make.defs
 include ./Make.package

diff --git a/Tests/MKDir/GNUmakefile b/Tests/MKDir/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../amrex
+AMREX_HOME = ../../../amrex
 
 DEBUG        = FALSE
 USE_MPI      = TRUE

diff --git a/Tests/NoFort/GNUmakefile b/Tests/NoFort/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../
+AMREX_HOME = ../../
 
 DEBUG	= FALSE
 DEBUG	= TRUE

diff --git a/Tests/Particles/AssignDensity/GNUmakefile b/Tests/Particles/AssignDensity/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG	= TRUE
 DEBUG	= FALSE

diff --git a/Tests/Particles/AssignMultiLevelDensity/GNUmakefile b/Tests/Particles/AssignMultiLevelDensity/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG	= TRUE
 DEBUG	= FALSE

diff --git a/Tests/Particles/AsyncIO/GNUmakefile b/Tests/Particles/AsyncIO/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG	= TRUE
 DEBUG	= FALSE

diff --git a/Tests/Particles/GNUmakefile b/Tests/Particles/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../
+AMREX_HOME = ../../
 
 DEBUG	= TRUE
 DEBUG	= FALSE

diff --git a/Tests/Particles/GhostsAndVirtuals/GNUmakefile b/Tests/Particles/GhostsAndVirtuals/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG	= TRUE
 DEBUG	= FALSE

diff --git a/Tests/Particles/InitFromAscii/GNUmakefile b/Tests/Particles/InitFromAscii/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG	= TRUE
 DEBUG	= FALSE

diff --git a/Tests/Particles/Intersection/GNUmakefile b/Tests/Particles/Intersection/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG	= TRUE
 DEBUG	= FALSE

diff --git a/Tests/Particles/NeighborParticles/GNUmakefile b/Tests/Particles/NeighborParticles/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG	= FALSE
 

diff --git a/Tests/Particles/ParallelContext/GNUmakefile b/Tests/Particles/ParallelContext/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG	= FALSE
 

diff --git a/Tests/Particles/ParticleIterator/GNUmakefile b/Tests/Particles/ParticleIterator/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG	= TRUE
 DEBUG	= FALSE

diff --git a/Tests/Particles/ParticleMesh/GNUmakefile b/Tests/Particles/ParticleMesh/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG	= TRUE
 DEBUG	= FALSE

diff --git a/Tests/Particles/ParticleReduce/GNUmakefile b/Tests/Particles/ParticleReduce/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG	= FALSE
 

diff --git a/Tests/Particles/ParticleTransformations/GNUmakefile b/Tests/Particles/ParticleTransformations/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG	= FALSE
 

diff --git a/Tests/Particles/Redistribute/GNUmakefile b/Tests/Particles/Redistribute/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG	= FALSE
 

diff --git a/Tests/Particles/SparseBins/GNUmakefile b/Tests/Particles/SparseBins/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG	= TRUE
 DEBUG	= FALSE

diff --git a/Tests/Particles/TypeDescriptor/GNUmakefile b/Tests/Particles/TypeDescriptor/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG	= TRUE
 DEBUG	= FALSE

diff --git a/Tests/PnetCDFBenchmark/GNUmakefile b/Tests/PnetCDFBenchmark/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../
+AMREX_HOME = ../../
 
 DEBUG	= TRUE
 DEBUG	= FALSE

diff --git a/Tests/ProfTests/HeatEquation_EX1_C/Exec/GNUmakefile b/Tests/ProfTests/HeatEquation_EX1_C/Exec/GNUmakefile
@@ -1,6 +1,5 @@
 # AMREX_HOME defines the directory in which we will find all the AMReX code.
-# If you set AMREX_HOME as an environment variable, this line will be ignored
-AMREX_HOME ?= ../../../../
+AMREX_HOME = ../../../../
 
 DEBUG         = FALSE
 USE_MPI       = TRUE

diff --git a/Tests/ProfTests/ThirdParty/Exec/GNUmakefile b/Tests/ProfTests/ThirdParty/Exec/GNUmakefile
@@ -1,6 +1,5 @@
 # AMREX_HOME defines the directory in which we will find all the AMReX code.
-# If you set AMREX_HOME as an environment variable, this line will be ignored
-AMREX_HOME ?= ../../../..
+AMREX_HOME = ../../../..
 
 DEBUG     = FALSE
 USE_MPI   = TRUE 

diff --git a/Tests/SinglePrecision/GNUmakefile b/Tests/SinglePrecision/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../
+AMREX_HOME = ../../
 
 PRECISION = FLOAT
 

diff --git a/Tests/Slice/GNUmakefile b/Tests/Slice/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../
+AMREX_HOME = ../../
 
 DEBUG	= FALSE
 DEBUG	= TRUE

diff --git a/Tests/Stream/GNUmakefile b/Tests/Stream/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../
+AMREX_HOME = ../../../
 
 DEBUG     = FALSE
 USE_MPI   = TRUE

diff --git a/Tests/TypeCheck/GNUmakefile b/Tests/TypeCheck/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../
+AMREX_HOME = ../../
 
 DEBUG	= FALSE
 DEBUG	= TRUE

diff --git a/Tests/Vectorization/GNUmakefile b/Tests/Vectorization/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../
+AMREX_HOME = ../../
 
 DEBUG	= FALSE
 

diff --git a/Tests/complementIn/GNUmakefile b/Tests/complementIn/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../
+AMREX_HOME = ../../
 
 DEBUG	= FALSE
 

diff --git a/Tutorials/Amr/Advection_AmrCore/Exec/SingleVortex/GNUmakefile b/Tutorials/Amr/Advection_AmrCore/Exec/SingleVortex/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../../..
+AMREX_HOME = ../../../../..
 
 PRECISION  = DOUBLE
 PROFILE    = FALSE

diff --git a/Tutorials/Amr/Advection_AmrLevel/Exec/SingleVortex/GNUmakefile b/Tutorials/Amr/Advection_AmrLevel/Exec/SingleVortex/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../../..
+AMREX_HOME = ../../../../..
 USE_EB = FALSE
 PRECISION  = DOUBLE
 PROFILE    = FALSE

diff --git a/Tutorials/Amr/Advection_AmrLevel/Exec/UniformVelocity/GNUmakefile b/Tutorials/Amr/Advection_AmrLevel/Exec/UniformVelocity/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../../..
+AMREX_HOME = ../../../../..
 USE_EB =FALSE
 PRECISION  = DOUBLE
 PROFILE    = FALSE

diff --git a/Tutorials/Amr/Advection_AmrLevel/Source/Src_2d/Adv_2d.f90 b/Tutorials/Amr/Advection_AmrLevel/Source/Src_2d/Adv_2d.f90
@@ -51,7 +51,7 @@ subroutine advect(time, lo, hi, &
   ! We like to allocate these **pointers** here and then pass them to a function
   ! to remove their pointerness for performance, because normally pointers could
   ! be aliasing.  We need to use pointers instead of allocatable arrays because
-  ! we like to use BoxLib's bl_allocate to allocate memeory instead of the intrinsic
+  ! we like to use AMReX's bl_allocate to allocate memeory instead of the intrinsic
   ! allocate.  Bl_allocate is much faster than allocate inside OMP.  
   ! Note that one MUST CALL BL_DEALLOCATE.
 

diff --git a/Tutorials/Amr/Advection_AmrLevel/Source/Src_3d/Adv_3d.f90 b/Tutorials/Amr/Advection_AmrLevel/Source/Src_3d/Adv_3d.f90
@@ -63,7 +63,7 @@ subroutine advect(time, lo, hi, &
   ! We like to allocate these **pointers** here and then pass them to a function
   ! to remove their pointerness for performance, because normally pointers could
   ! be aliasing.  We need to use pointers instead of allocatable arrays because
-  ! we like to use BoxLib's bl_allocate to allocate memeory instead of the intrinsic
+  ! we like to use AMReX's bl_allocate to allocate memeory instead of the intrinsic
   ! allocate.  Bl_allocate is much faster than allocate inside OMP.  
   ! Note that one MUST CALL BL_DEALLOCATE.
 

diff --git a/Tutorials/AmrTask/MiniApps/Adv_Async_OnDemand/Exec/SingleVortex/GNUmakefile b/Tutorials/AmrTask/MiniApps/Adv_Async_OnDemand/Exec/SingleVortex/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../../../../../
+AMREX_HOME = ../../../../../../
 
 PRECISION  = DOUBLE
 PROFILE    = FALSE
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ COMP = gnu @@
     DIM = 2
-    AMREX_HOME ?= ../../..
+    AMREX_HOME = ../../..
     include $(AMREX_HOME)/Tools/GNUMake/Make.defs
@@ Expand Down @@