From 01edd5e09fef68419fd996d256cfb843cf71e506 Mon Sep 17 00:00:00 2001
From: Jonathan Schilling <jonathan.schilling@mail.de>
Date: Tue, 28 Feb 2023 14:59:43 +0100
Subject: [PATCH] fix Makefile and enable GitHub CI

---
 .github/workflows/build.yml | 13 +++++++++++++
 .gitignore                  |  7 +++++++
 test/Makefile => Makefile   | 19 ++++++++++---------
 test/test_abscab.f08        | 19 ++++++++++---------
 4 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 .github/workflows/build.yml
 create mode 100644 .gitignore
 rename test/Makefile => Makefile (69%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..7033b14
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,13 @@
+name: build
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout sources
+        uses: actions/checkout@master
+      - name: compile
+        run: make
+      - name: run tests
+        run: make test
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6cf5f56
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+
+*.o
+*.mod
+test_abscab
+test_cel
+demo_abscab
+
diff --git a/test/Makefile b/Makefile
similarity index 69%
rename from test/Makefile
rename to Makefile
index 89223d6..f125bd2 100644
--- a/test/Makefile
+++ b/Makefile
@@ -2,7 +2,8 @@
 F08?=gfortran
 CFLAGS=-std=f2008 -fopenmp -O3
 
-ABSCAB_DIR=../../main/fortran
+ABSCAB_DIR=abscab
+TEST_DIR=test
 
 .PHONY: all test clean test_programs demo_programs
 
@@ -32,20 +33,20 @@ mod_cel.o: mod_kinds.o $(ABSCAB_DIR)/mod_cel.f08
 mod_compsum.o: mod_kinds.o $(ABSCAB_DIR)/mod_compsum.f08
 	$(F08) $(CFLAGS) $(ABSCAB_DIR)/mod_compsum.f08 -c
 
-mod_testutil.o: mod_kinds.o mod_testutil.f08
-	$(F08) $(CFLAGS) mod_testutil.f08 -c
+mod_testutil.o: mod_kinds.o $(TEST_DIR)/mod_testutil.f08
+	$(F08) $(CFLAGS) $(TEST_DIR)/mod_testutil.f08 -c
 
-test_cel: mod_cel.o test_cel.f08
-	$(F08) $(CFLAGS) test_cel.f08 -c
+test_cel: mod_cel.o $(TEST_DIR)/test_cel.f08
+	$(F08) $(CFLAGS) $(TEST_DIR)/test_cel.f08 -c
 	$(F08) $(CFLAGS) mod_kinds.o mod_cel.o test_cel.o -o test_cel
 
 abscab.o: mod_cel.o mod_compsum.o $(ABSCAB_DIR)/abscab.f08
 	$(F08) $(CFLAGS) $(ABSCAB_DIR)/abscab.f08 -c
 
-test_abscab: abscab.o mod_testutil.o test_abscab.f08
-	$(F08) $(CFLAGS) test_abscab.f08 -c
+test_abscab: abscab.o mod_testutil.o $(TEST_DIR)/test_abscab.f08
+	$(F08) $(CFLAGS) $(TEST_DIR)/test_abscab.f08 -c
 	$(F08) $(CFLAGS) mod_kinds.o mod_cel.o mod_compsum.o abscab.o mod_testutil.o test_abscab.o -o test_abscab
 
-demo_abscab: abscab.o mod_testutil.o demo_abscab.f08
-	$(F08) $(CFLAGS) demo_abscab.f08 -c
+demo_abscab: abscab.o mod_testutil.o $(TEST_DIR)/demo_abscab.f08
+	$(F08) $(CFLAGS) $(TEST_DIR)/demo_abscab.f08 -c
 	$(F08) $(CFLAGS) mod_kinds.o mod_cel.o mod_compsum.o abscab.o mod_testutil.o demo_abscab.o -o demo_abscab
diff --git a/test/test_abscab.f08 b/test/test_abscab.f08
index f0e0f80..7cedfe9 100644
--- a/test/test_abscab.f08
+++ b/test/test_abscab.f08
@@ -8,10 +8,10 @@ subroutine testStraightWireSegment(status)
     integer, intent(inout) :: status
 
     character(len=*), parameter :: &
-        filename_rP    = "../resources/testPointsRpStraightWireSegment.dat", &
-        filename_zP    = "../resources/testPointsZpStraightWireSegment.dat", &
-        filename_A_z   = "../resources/StraightWireSegment_A_z_ref.dat", &
-        filename_B_phi = "../resources/StraightWireSegment_B_phi_ref.dat"
+        filename_rP    = "test/resources/testPointsRpStraightWireSegment.dat", &
+        filename_zP    = "test/resources/testPointsZpStraightWireSegment.dat", &
+        filename_A_z   = "test/resources/StraightWireSegment_A_z_ref.dat", &
+        filename_B_phi = "test/resources/StraightWireSegment_B_phi_ref.dat"
 
     real(wp), parameter :: tolerance_A_z   = 1.0e-15_wp, &
                            tolerance_B_phi = 1.0e-15_wp
@@ -134,11 +134,11 @@ subroutine testCircularWireLoop(status)
     integer, intent(inout) :: status
 
     character(len=*), parameter :: &
-        filename_rP    = "../resources/testPointsRpCircularWireLoop.dat", &
-        filename_zP    = "../resources/testPointsZpCircularWireLoop.dat", &
-        filename_A_phi = "../resources/CircularWireLoop_A_phi_ref.dat", &
-        filename_B_rho = "../resources/CircularWireLoop_B_rho_ref.dat", &
-        filename_B_z   = "../resources/CircularWireLoop_B_z_ref.dat"
+        filename_rP    = "test/resources/testPointsRpCircularWireLoop.dat", &
+        filename_zP    = "test/resources/testPointsZpCircularWireLoop.dat", &
+        filename_A_phi = "test/resources/CircularWireLoop_A_phi_ref.dat", &
+        filename_B_rho = "test/resources/CircularWireLoop_B_rho_ref.dat", &
+        filename_B_z   = "test/resources/CircularWireLoop_B_z_ref.dat"
 
     real(wp), parameter :: tolerance_A_phi = 1.0e-15_wp, &
                            tolerance_B_rho = 1.0e-13_wp, &
@@ -440,6 +440,7 @@ program test_abscab
         print *, "test_abscab: all test(s) passed :-)"
     else
         print *, "test_abscab: some test(s) failed :-("
+        stop -1
     end if
 
 end program ! test_abscab