From 54082c3bd2d8f6ae0020b55055ed845525687ff7 Mon Sep 17 00:00:00 2001
From: kamischi <karl-michael.schindler@web.de>
Date: Fri, 7 Jun 2024 15:44:02 +0200
Subject: [PATCH] rename build to build-f90
---
.gitignore | 2 +-
tests/seteps/Makefile | 26 +++++++++----------
...{setepsdriver.f90 => setepsdriver-f90.f90} | 4 +--
3 files changed, 16 insertions(+), 16 deletions(-)
rename tests/seteps/{setepsdriver.f90 => setepsdriver-f90.f90} (95%)
diff --git a/.gitignore b/.gitignore
index beef64f..c3c06b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,4 @@ tests/oxlog/bosonf90
tests/oxlog/bosou
tests/oxlog/eelsou
tests/setepslog/eelsf90
-tests/seteps/build
+tests/seteps/build-f90
diff --git a/tests/seteps/Makefile b/tests/seteps/Makefile
index bfce715..69b3028 100644
--- a/tests/seteps/Makefile
+++ b/tests/seteps/Makefile
@@ -13,27 +13,27 @@ ifeq "$(GFORTAN_VERSION_GE_5)" "1"
endif
# implicit rules for compiling fortran files
-build/%.o: ../../source/f90/%.f90
- $(FC) $(FFLAGS) -c -Jbuild -o $@ $<
-build/%_mod.mod: ../../source/f90/%.f90
- $(FC) $(FFLAGS) -c -Jbuild -o build/seteps.o $<
+build-f90/%.o: ../../source/f90/%.f90
+ $(FC) $(FFLAGS) -c -Jbuild-f90 -o $@ $<
+build-f90/%_mod.mod: ../../source/f90/%.f90
+ $(FC) $(FFLAGS) -c -Jbuild-f90 -o build-f90/seteps.o $<
-all: build/setepsdriver
+all: build-f90/setepsdriver
-build/setepsdriver: setepsdriver.f90 build/seteps.o build/seteps_mod.mod
- $(FC) $(FFLAGS) -Jbuild -o $@ $< build/seteps.o
+build-f90/setepsdriver: setepsdriver-f90.f90 build-f90/seteps.o build-f90/seteps_mod.mod
+ $(FC) $(FFLAGS) -Jbuild-f90 -o $@ $< build-f90/seteps.o
-test: build/setepsdriver
+test: build-f90/setepsdriver
for NUMBER in 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017 018 019 020 021 022 023 024 025 ; do \
- cp ../../tests/inputFiles/eelsin$$NUMBER build/eelsin ; \
+ cp ../../tests/inputFiles/eelsin$$NUMBER build-f90/eelsin ; \
echo " eels input file number: "$$NUMBER ; \
- build/setepsdriver ; \
- mv build/epsout results/epsout$$NUMBER ; \
- rm build/eelsin ; \
+ build-f90/setepsdriver ; \
+ mv build-f90/epsout results/epsout$$NUMBER ; \
+ rm build-f90/eelsin ; \
done
clean:
- rm -rf build/*
+ rm -rf build-f90/*
rm -rf results/*
.PHONY: all clean test
diff --git a/tests/seteps/setepsdriver.f90 b/tests/seteps/setepsdriver-f90.f90
similarity index 95%
rename from tests/seteps/setepsdriver.f90
rename to tests/seteps/setepsdriver-f90.f90
index ef4b9e8..d84c788 100644
--- a/tests/seteps/setepsdriver.f90
+++ b/tests/seteps/setepsdriver-f90.f90
@@ -24,7 +24,7 @@ program setepsdriver
tab = char(9)
noPoints = 200
- open(unit = 11, file = 'build/eelsin')
+ open(unit = 11, file = 'build-f90/eelsin')
read(11, *) line
read(11, *) line
read(11, *) line
@@ -75,7 +75,7 @@ program setepsdriver
wn = wmin
allocate (eps(neps))
- open(unit = 12, file = 'build/epsout')
+ open(unit = 12, file = 'build-f90/epsout')
do i = 0, noPoints
call seteps(neps, nos, osc, epsinf, wn, name, eps, layers, mode)
write (12, '(30g15.7)') wn, (eps(j), j = 1, neps)
--
GitLab