diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..7a1d2295c4bbf18b02c188312d250ff3f3e89c5f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+build/cluster/*
+build/sphere/*
+build/trapping/*
+
diff --git a/cluster/.gitkeep b/build/.gitkeep
similarity index 100%
rename from cluster/.gitkeep
rename to build/.gitkeep
diff --git a/build/README.md b/build/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..a873c7d103077d8dbc81dea056f79cccf5349d10
--- /dev/null
+++ b/build/README.md
@@ -0,0 +1,37 @@
+# Folder instructions
+
+This directory collects all the output of make builds.
+
+## Instructions
+
+The original code produces output in the current working directory (the path where the code is executed from). The build directory is intended to collect local builds and test run output in a safe place, without cluttering the code development folders, thus helping git to filter out unnecessary logs through .gitignore.
+
+## Code work-flow
+
+This section describes the use of the pre-existing programs, once the binaries have been properly built by a succesful run of make in the src folder.
+
+### cluster
+
+1. cd to the build/cluster folder
+2. run edfb (./edfb)
+3. run clu (./clu)
+
+NOTE: both edfb and sph expect an input which is assumed to be in a folder named "../../test_data/cluster/" (i.e. two levels above the current execution path)
+
+TODO: set up a code variable to locate the input data (data file paths should not be hard-coded)
+
+### sphere
+
+1. cd to the build/sphere folder
+2. run edfb (./edfb)
+3. run sph (./sph)
+
+NOTE: both edfb and sph expect an input which is assumed to be in a folder named "../../test_data/sphere/" (i.e. two levels above the current execution path)
+
+TODO: set up a code variable to locate the input data (data file paths should not be hard-coded)
+
+### trapping
+
+The execution of trapping programs requires at least one of the previous programs to have produced a complete output set.
+
+TODO: investigate which conditions allow clu or sph to write TTMS output files.
\ No newline at end of file
diff --git a/sphere/.gitkeep b/build/cluster/.gitkeep
similarity index 100%
rename from sphere/.gitkeep
rename to build/cluster/.gitkeep
diff --git a/trapping/.gitkeep b/build/sphere/.gitkeep
similarity index 100%
rename from trapping/.gitkeep
rename to build/sphere/.gitkeep
diff --git a/build/trapping/.gitkeep b/build/trapping/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/cluster/Makefile b/cluster/Makefile
deleted file mode 100644
index 210889bcbfa36bdd6ea7ffe107a23592ea1e408c..0000000000000000000000000000000000000000
--- a/cluster/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-FC=gfortran
-FCFLAGS=-std=legacy -O3
-LFLAGS=
-
-all: clu edfb
-
-clu: clu.o
- $(FC) $(FCFLAGS) -o clu clu.o $(LFLAGS)
-
-edfb: edfb.o
- $(FC) $(FCFLAGS) -o edfb edfb.o $(LFLAGS)
-
-clean:
- rm -f *.o
-
-wipe:
- rm -f clu edfb *.o
-
-%.o : %.f
- $(FC) $(FCFLAGS) -c -o $@ $<
-
diff --git a/sphere/Makefile b/sphere/Makefile
deleted file mode 100644
index 47e5c07995edee6fac7f8ba32c056471e2ee670d..0000000000000000000000000000000000000000
--- a/sphere/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-FC=gfortran
-FCFLAGS=-std=legacy -O3
-LFLAGS=
-
-all: edfb sph
-
-edfb: edfb.o
- $(FC) $(FCFLAGS) -o edfb edfb.o $(LFLAGS)
-
-sph: sph.o
- $(FC) $(FCFLAGS) -o sph sph.o $(LFLAGS)
-
-clean:
- rm -f *.o
-
-wipe:
- rm -f edfb sph *.o
-
-%.o : %.f
- $(FC) $(FCFLAGS) -c -o $@ $<
-
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..948ea958e6b9d0a00c2edc24c055813cbea21c27
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,19 @@
+SUBDIRS := $(wildcard */.)
+BUILDDIR=../build
+
+all: $(SUBDIRS)
+
+$(SUBDIRS):
+ $(MAKE) -C $@
+
+clean:
+ rm -f $(BUILDDIR)/cluster/*.o
+ rm -f $(BUILDDIR)/sphere/*.o
+ rm -f $(BUILDDIR)/trapping/*.o
+
+wipe:
+ rm -f $(BUILDDIR)/cluster/*
+ rm -f $(BUILDDIR)/sphere/*
+ rm -f $(BUILDDIR)/trapping/*
+
+.PHONY: all $(SUBDIRS)
diff --git a/src/cluster/.gitkeep b/src/cluster/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/cluster/Makefile b/src/cluster/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..f884a43e5634e1486ce9178047e45e91373caacf
--- /dev/null
+++ b/src/cluster/Makefile
@@ -0,0 +1,22 @@
+BUILDDIR=../../build/cluster
+FC=gfortran
+FCFLAGS=-std=legacy -O3
+LFLAGS=
+
+all: clu edfb
+
+clu: clu.o
+ $(FC) $(FCFLAGS) -o $(BUILDDIR)/clu $(BUILDDIR)/clu.o $(LFLAGS)
+
+edfb: edfb.o
+ $(FC) $(FCFLAGS) -o $(BUILDDIR)/edfb $(BUILDDIR)/edfb.o $(LFLAGS)
+
+clean:
+ rm -f $(BUILDDIR)/*.o
+
+wipe:
+ rm -f $(BUILDDIR)/clu $(BUILDDIR)/edfb $(BUILDDIR)/*.o
+
+%.o : %.f
+ $(FC) $(FCFLAGS) -c -o $(BUILDDIR)/$@ $<
+
diff --git a/cluster/clu.f b/src/cluster/clu.f
similarity index 99%
rename from cluster/clu.f
rename to src/cluster/clu.f
index 8f1c2172f1534fff341322d0ab075e8689e61c74..1aecb479acc0cbfdf4c94c9973ec70b1639f357d 100644
--- a/cluster/clu.f
+++ b/src/cluster/clu.f
@@ -196,7 +196,7 @@ CCC AS A FUNCTION OF INCIDENCE ANGLES
CCC FOR A FIXED SCATTERING ANGLE THSCA=THS-TH;
CCC NEEDS ONLY TH, PH, THS
CCC
- OPEN(IR,FILE='DCLU',STATUS='OLD')
+ OPEN(IR,FILE='../../test_data/cluster/DCLU',STATUS='OLD')
READ(IR,*)NSPH,LI,LE,MXNDM,INPOL,NPNT,NPNTTS,IAVM,ISAM
DO 101 I=1,NSPH
101 READ(IR,*)RXX(I),RYY(I),RZZ(I)
@@ -3466,4 +3466,4 @@ CCC DIMENSION AV(NDDMST*NDDMST)
3 CDTP=CDTP+AV((J-1)*ISTEP+I)*AV(J+IR)
RETURN
END
-CCC
\ No newline at end of file
+CCC
diff --git a/sphere/edfb.f b/src/cluster/edfb.f
similarity index 99%
rename from sphere/edfb.f
rename to src/cluster/edfb.f
index e54ab7462955ef05e63f11669a2357ca7edffec2..765ceeb38ed265eb138e4384d12248d35448a877 100644
--- a/sphere/edfb.f
+++ b/src/cluster/edfb.f
@@ -46,7 +46,7 @@ CCC
CCC
CCC READING OF DIELECTRIC FUNCTIONS DRIVEN BY ICI DEFINED BELOW
CCC
- OPEN(IR,FILE='DEDFB',STATUS='OLD')
+ OPEN(IR,FILE='../../test_data/cluster/DEDFB',STATUS='OLD')
READ(IR,*)NSPH,IES
IF(IES.NE.0)IES=1
READ(IR,*)EXDC,WP,XIP,IDFC,NXI,INSTPC,INSN
@@ -333,4 +333,4 @@ CCC VLST=V+(NXI-1)*VSTP
6612 FORMAT(I5,1PD13.4)
RETURN
END
-CCC
\ No newline at end of file
+CCC
diff --git a/src/sphere/.gitkeep b/src/sphere/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/sphere/Makefile b/src/sphere/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..41d1d3342ed431507d63447b539fe3813fb2d827
--- /dev/null
+++ b/src/sphere/Makefile
@@ -0,0 +1,22 @@
+BUILDDIR=../../build/sphere
+FC=gfortran
+FCFLAGS=-std=legacy -O3
+LFLAGS=
+
+all: edfb sph
+
+edfb: edfb.o
+ $(FC) $(FCFLAGS) -o $(BUILDDIR)/edfb $(BUILDDIR)/edfb.o $(LFLAGS)
+
+sph: sph.o
+ $(FC) $(FCFLAGS) -o $(BUILDDIR)/sph $(BUILDDIR)/sph.o $(LFLAGS)
+
+clean:
+ rm -f $(BUILDDIR)/*.o
+
+wipe:
+ rm -f $(BUILDDIR)/edfb $(BUILDDIR)/sph $(BUILDDIR)/*.o
+
+%.o : %.f
+ $(FC) $(FCFLAGS) -c -o $(BUILDDIR)/$@ $<
+
diff --git a/cluster/edfb.f b/src/sphere/edfb.f
similarity index 99%
rename from cluster/edfb.f
rename to src/sphere/edfb.f
index e54ab7462955ef05e63f11669a2357ca7edffec2..8590188db6aef5dca515b8e0850bc290354fbba8 100644
--- a/cluster/edfb.f
+++ b/src/sphere/edfb.f
@@ -46,7 +46,7 @@ CCC
CCC
CCC READING OF DIELECTRIC FUNCTIONS DRIVEN BY ICI DEFINED BELOW
CCC
- OPEN(IR,FILE='DEDFB',STATUS='OLD')
+ OPEN(IR,FILE='../../test_data/sphere/DEDFB',STATUS='OLD')
READ(IR,*)NSPH,IES
IF(IES.NE.0)IES=1
READ(IR,*)EXDC,WP,XIP,IDFC,NXI,INSTPC,INSN
@@ -333,4 +333,4 @@ CCC VLST=V+(NXI-1)*VSTP
6612 FORMAT(I5,1PD13.4)
RETURN
END
-CCC
\ No newline at end of file
+CCC
diff --git a/sphere/sph.f b/src/sphere/sph.f
similarity index 99%
rename from sphere/sph.f
rename to src/sphere/sph.f
index f7aafd525b4d3ed005eeb5ad52428e2eeea05965..5eb62c2fa02e53689cd6a79063d48c98c026a1de 100644
--- a/sphere/sph.f
+++ b/src/sphere/sph.f
@@ -127,7 +127,7 @@ CCC AS A FUNCTION OF INCIDENCE ANGLES
CCC FOR A FIXED SCATTERING ANGLE THSCA=THS-TH;
CCC NEEDS ONLY TH, PH, THS
CCC
- OPEN(IR,FILE='DSPH',STATUS='OLD')
+ OPEN(IR,FILE='../../test_data/sphere/DSPH',STATUS='OLD')
READ(IR,*)NSPH,LM,INPOL,NPNT,NPNTTS,ISAM
READ(IR,*)TH,THSTP,THLST,THS,THSSTP,THSLST
READ(IR,*)PH,PHSTP,PHLST,PHS,PHSSTP,PHSLST
@@ -1490,4 +1490,4 @@ CCC LL=LM
L=L+1
GO TO 40
END
-CCC
\ No newline at end of file
+CCC
diff --git a/src/trapping/.gitkeep b/src/trapping/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/trapping/Makefile b/src/trapping/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..bfad43bddcd843a6d71010b2a39c6e36d09e403d
--- /dev/null
+++ b/src/trapping/Makefile
@@ -0,0 +1,22 @@
+BUILDDIR=../../build/trapping
+FC=gfortran
+FCFLAGS=-std=legacy -O3
+LFLAGS=
+
+all: frfme lffft
+
+frfme: frfme.o
+ $(FC) $(FCFLAGS) -o $(BUILDDIR)/frfme $(BUILDDIR)/frfme.o $(LFLAGS)
+
+lffft: lffft.o
+ $(FC) $(FCFLAGS) -o $(BUILDDIR)/lffft $(BUILDDIR)/lffft.o $(LFLAGS)
+
+clean:
+ rm -f $(BUILDDIR)/*.o
+
+wipe:
+ rm -f $(BUILDDIR)/frfme $(BUILDDIR)/lffft $(BUILDDIR)/*.o
+
+%.o : %.f
+ $(FC) $(FCFLAGS) -c -o $(BUILDDIR)/$@ $<
+
diff --git a/trapping/frfme.f b/src/trapping/frfme.f
similarity index 99%
rename from trapping/frfme.f
rename to src/trapping/frfme.f
index 3c368a4a4cfa960d3f31eeb88d0adc5b113a85b9..caee1f4136541bd4da09487f2399c6e4cce6abdb 100644
--- a/trapping/frfme.f
+++ b/src/trapping/frfme.f
@@ -30,7 +30,7 @@ CCC 1WK(NLMMT),W(NKV,NKV),WSUM(NLMMT,NRVC)
ITT1=11
ITT2=12
CC0=(0.0D0,0.0D0)
- OPEN(IR,FILE='DFRFME',STATUS='OLD')
+ OPEN(IR,FILE='../../test_data/trapping/DFRFME',STATUS='OLD')
READ(IR,*)JLMF,JLML
IF(JLMF.EQ.1)GO TO 16
CLOSE(IR)
@@ -493,4 +493,4 @@ CCC DIMENSION W(NLWMT,2),YLM(NLWM+2)
30 W(I,2)=-UIM*W(K,1)
RETURN
END
-CCC
\ No newline at end of file
+CCC
diff --git a/trapping/lffft.f b/src/trapping/lffft.f
similarity index 99%
rename from trapping/lffft.f
rename to src/trapping/lffft.f
index a805621c4c21acb24744b6f03b295f846986fe4b..521c61e8771fdc0a800e8135bbb558ee8614753a 100644
--- a/trapping/lffft.f
+++ b/src/trapping/lffft.f
@@ -33,7 +33,7 @@ CCC DIMENSION TMS(LE,3)
COMPLEX*16 CC0,UIM,SQ2ITI
IR=5
IT=7
- OPEN(IR,FILE='DLFFFT',STATUS='OLD')
+ OPEN(IR,FILE='../../test_data/trapping/DLFFFT',STATUS='OLD')
READ(IR,*)JFT,JSS,JTW
CLOSE(IR)
OPEN(IT,FILE='TTMS',FORM='UNFORMATTED',STATUS='OLD')
@@ -491,4 +491,4 @@ CCC DIMENSION AC(NLEMT),WS(NLEMT)
FFTS(3)=-DREAL(CTQCS(2))
RETURN
END
-CCC
\ No newline at end of file
+CCC
diff --git a/test_data/README.md b/test_data/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..77cffcf6ab6d8abcae441501636c6484faa65d1c
--- /dev/null
+++ b/test_data/README.md
@@ -0,0 +1 @@
+This directory collects the input files for test the code.
diff --git a/cluster/DCLU b/test_data/cluster/DCLU
similarity index 100%
rename from cluster/DCLU
rename to test_data/cluster/DCLU
diff --git a/cluster/DEDFB b/test_data/cluster/DEDFB
similarity index 100%
rename from cluster/DEDFB
rename to test_data/cluster/DEDFB
diff --git a/cluster/OCLU b/test_data/cluster/OCLU
similarity index 100%
rename from cluster/OCLU
rename to test_data/cluster/OCLU
diff --git a/sphere/DEDFB b/test_data/sphere/DEDFB
similarity index 100%
rename from sphere/DEDFB
rename to test_data/sphere/DEDFB
diff --git a/sphere/DSPH b/test_data/sphere/DSPH
similarity index 100%
rename from sphere/DSPH
rename to test_data/sphere/DSPH
diff --git a/sphere/OSPH b/test_data/sphere/OSPH
similarity index 100%
rename from sphere/OSPH
rename to test_data/sphere/OSPH
diff --git a/trapping/DFRFME b/test_data/trapping/DFRFME
similarity index 100%
rename from trapping/DFRFME
rename to test_data/trapping/DFRFME
diff --git a/trapping/DLFFFT b/test_data/trapping/DLFFFT
similarity index 100%
rename from trapping/DLFFFT
rename to test_data/trapping/DLFFFT
diff --git a/trapping/OFRF b/test_data/trapping/OFRF
similarity index 100%
rename from trapping/OFRF
rename to test_data/trapping/OFRF
diff --git a/trapping/Makefile b/trapping/Makefile
deleted file mode 100644
index 9ce1810263c4c5cb08d474d37679f31d3d6c2c3f..0000000000000000000000000000000000000000
--- a/trapping/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-FC=gfortran
-FCFLAGS=-std=legacy -O3
-LFLAGS=
-
-all: frfme lffft
-
-frfme: frfme.o
- $(FC) $(FCFLAGS) -o frfme frfme.o $(LFLAGS)
-
-lffft: lffft.o
- $(FC) $(FCFLAGS) -o lffft lffft.o $(LFLAGS)
-
-clean:
- rm -f *.o
-
-wipe:
- rm -f frfme lffft *.o
-
-%.o : %.f
- $(FC) $(FCFLAGS) -c -o $@ $<
-