fix path

9 files changed, 38 insertions, 32 deletions

diff --git a/Docs/source/installation.rst b/Docs/source/installation.rst
index cb8032d72..326142a83 100644
--- a/Docs/source/installation.rst
+++ b/Docs/source/installation.rst
@@ -23,16 +23,17 @@ You should then switch to the branch ``development`` of AMReX
     git checkout development
     cd ..
 
-Compiling the Langmuir example
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Compiling the code
+~~~~~~~~~~~~~~~~~~
 
-``cd`` into the the directory ``warpx/Exec/Langmuir`` and type
+``cd`` into the directory ``warpx`` and type
 
 ::
 
     make -j 4
 
-(in order to compile the code in parallel on 4 cores).
+(in order to compile the code in parallel on 4 cores).  This will
+generate an executable file in the ``Bin`` directory.
 
 In order to clean a previously compiled version:
 
diff --git a/Example/Langmuir/python/README b/Example/Langmuir/python/README
index e61333279..e14c50d81 100644
--- a/Example/Langmuir/python/README
+++ b/Example/Langmuir/python/README
@@ -1,6 +1,10 @@
+#
+# This needs to be updated.
+#
+
 To run in Python mode, do the following steps:
 
-1. In the warpx/Exec/Langmuir directory, type:
+1. In the warpx directory, type:
 
    make -j4 USE_PYTHON_MAIN=TRUE
 
@@ -16,4 +20,4 @@ This step can be streamlined in the future.
 
 This script initializes the simulation and runs it for 10 steps. It also
 gets a numpy array of the particle positions and uses them to make a simple
-plot using matplotlib.
\ No newline at end of file
+plot using matplotlib.
diff --git a/Example/plasma_acceleration/GNUmakefile b/Example/plasma_acceleration/GNUmakefile
index 2a0e9032c..cfeb320e3 100644
--- a/Example/plasma_acceleration/GNUmakefile
+++ b/Example/plasma_acceleration/GNUmakefile
@@ -17,4 +17,4 @@ EBASE     = main
 USE_PYTHON_MAIN = FALSE
 
 WARPX_HOME := ../..
-include $(WARPX_HOME)/Example/Make.WarpX
+include $(WARPX_HOME)/Source/Make.WarpX
diff --git a/GNUmakefile b/GNUmakefile
index 4c1016c99..6f7f14acf 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -22,4 +22,4 @@ USE_PYTHON_MAIN = FALSE
 WarpxBinDir = Bin
 
 WARPX_HOME := .
-include $(WARPX_HOME)/Exec/Make.WarpX
+include $(WARPX_HOME)/Source/Make.WarpX
diff --git a/Python/GNUmakefile b/Python/GNUmakefile
index e86d23141..9e95b89d5 100644
--- a/Python/GNUmakefile
+++ b/Python/GNUmakefile
@@ -1,4 +1,4 @@
-AMREX_HOME ?= ../../amrex
+gAMREX_HOME ?= ../../amrex
 PICSAR_HOME ?= ../../picsar
 
 DEBUG	= FALSE
@@ -19,4 +19,4 @@ EBASE     = main
 USE_PYTHON_MAIN = TRUE
 
 WARPX_HOME := ..
-include $(WARPX_HOME)/Exec/Make.WarpX
+include $(WARPX_HOME)/Source/Make.WarpX
diff --git a/README.md b/README.md
index 86402e2f8..5d8855e8e 100644
--- a/README.md
+++ b/README.md
@@ -29,13 +29,14 @@ git checkout development
 cd ..
 ```
 
-### Compiling the Langmuir example
+### Compiling the code
 
-`cd` into the the directory `warpx/Exec/Langmuir` and type
+`cd` into the the directory `warpx` and type
 ```
 make -j 4
 ```
-(in order to  compile the code in parallel on 4 cores).
+(in order to  compile the code in parallel on 4 cores).  This will
+generate an executable file in the `Bin` directory.
 
 In order to clean a previously compiled version:
 ```
@@ -52,7 +53,7 @@ compare the results. The instructions below explain how to do this.
 
 After compiling WarpX for (see the above instructions), copy the
 compiled executable (its name starts with `main3d`) from the folder
-`Exec/Langmuir/` to the folder
+`Bin/` to the folder
 `tests/Langmuir/`. Then type
 ```
 cd tests/Langmuir
diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini
index 351518e2e..1deb5459b 100644
--- a/Regression/WarpX-tests.ini
+++ b/Regression/WarpX-tests.ini
@@ -55,8 +55,8 @@ branch = master
 # individual problems follow
 
 [Langmuir_2d]
-buildDir = Exec/Langmuir
-inputFile = inputs.rt
+buildDir = .
+inputFile = Example/Langmuir/inputs.rt
 dim = 2
 restartTest = 0
 useMPI = 1
@@ -68,8 +68,8 @@ doVis = 0
 runtime_params = electrons.ux=0.01 electrons.xmax=0.e-6
 
 [Langmuir_x]
-buildDir = Exec/Langmuir
-inputFile = inputs.rt
+buildDir = .
+inputFile = Example/Langmuir/inputs.rt
 dim = 3
 restartTest = 0
 useMPI = 1
@@ -81,8 +81,8 @@ doVis = 0
 runtime_params = electrons.ux=0.01 electrons.xmax=0.e-6
 
 [Langmuir_y]
-buildDir = Exec/Langmuir
-inputFile = inputs.rt
+buildDir = .
+inputFile = Example/Langmuir/inputs.rt
 dim = 3
 restartTest = 0
 useMPI = 1
@@ -94,8 +94,8 @@ doVis = 0
 runtime_params = electrons.uy=0.01 electrons.ymax=0.e-6
 
 [Langmuir_z]
-buildDir = Exec/Langmuir
-inputFile = inputs.rt
+buildDir = .
+inputFile = Example/Langmuir/inputs.rt
 dim = 3
 restartTest = 0
 useMPI = 1
@@ -107,8 +107,8 @@ doVis = 0
 runtime_params = electrons.uz=0.01 electrons.zmax=0.e-6
 
 [Langmuir_multi]
-buildDir = Exec/Langmuir
-inputFile = inputs.multi.rt
+buildDir = .
+inputFile = Example/Langmuir/inputs.multi.rt
 dim = 3
 restartTest = 0
 useMPI = 1
@@ -119,8 +119,8 @@ compileTest = 0
 doVis = 0
 
 [LaserInjection]
-buildDir = Exec/laser_injection
-inputFile = inputs.rt
+buildDir = .
+inputFile = Example/laser_injection/inputs.rt
 dim = 3
 restartTest = 0
 useMPI = 1
@@ -129,12 +129,12 @@ useOMP = 0
 numthreads = 2
 compileTest = 0
 doVis = 0
-analysisRoutine = Exec/laser_injection/laser_analysis.py
+analysisRoutine = Example/laser_injection/laser_analysis.py
 analysisOutputImage = laser_analysis.png
 
 [LaserInjection_2d]
-buildDir = Exec/laser_injection
-inputFile = inputs.2d.rt
+buildDir = .
+inputFile = Example/laser_injection/inputs.2d.rt
 dim = 2
 restartTest = 0
 useMPI = 1
@@ -159,8 +159,8 @@ doVis = 0
 outputFile = plt00040
 
 [uniform_plasma_restart]
-buildDir = Exec/uniform_plasma
-inputFile = inputs.rt
+buildDir = .
+inputFile = Example/uniform_plasma/inputs.rt
 dim = 3
 restartTest = 1
 restartFileNum = 6
diff --git a/Example/Make.WarpX b/Source/Make.WarpX
index b9b93e4c0..b9b93e4c0 100644
--- a/Example/Make.WarpX
+++ b/Source/Make.WarpX
diff --git a/tests/MovingWindow/GNUmakefile b/tests/MovingWindow/GNUmakefile
index 75d7fd10c..cfeb320e3 100644
--- a/tests/MovingWindow/GNUmakefile
+++ b/tests/MovingWindow/GNUmakefile
@@ -17,4 +17,4 @@ EBASE     = main
 USE_PYTHON_MAIN = FALSE
 
 WARPX_HOME := ../..
-include $(WARPX_HOME)/Exec/Make.WarpX
+include $(WARPX_HOME)/Source/Make.WarpX