Skip to content

Commit

Permalink
fix Makefile and enable GitHub CI
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathanschilling committed Feb 28, 2023
1 parent ac25627 commit 01edd5e
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 18 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -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
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

*.o
*.mod
test_abscab
test_cel
demo_abscab

19 changes: 10 additions & 9 deletions test/Makefile → Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
19 changes: 10 additions & 9 deletions test/test_abscab.f08
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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, &
Expand Down Expand Up @@ -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

0 comments on commit 01edd5e

Please sign in to comment.