[Debian-astro-commits] [gyoto] 95/221: First step into checking lorene in make check
Thibaut Jean-Claude Paumard
thibaut at moszumanska.debian.org
Fri May 22 20:52:37 UTC 2015
This is an automated email from the git hooks/post-receive script.
thibaut pushed a commit to branch master
in repository gyoto.
commit af0810339362462079fd66339aaca2509692b2ba
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date: Wed Nov 19 16:04:47 2014 +0100
First step into checking lorene in make check
---
Makefile.am | 2 +-
Makefile.in | 2 +-
bin/Makefile.am | 25 +++++++++++++++++++++++++
bin/Makefile.in | 21 +++++++++++++++++++++
4 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 16d1fc2..fdb9772 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ $(SUBDIRS):
ChangeLog:
git log --no-merges > ChangeLog
-check-mpi check-mpi-clean:
+check-mpi check-mpi-clean check-lorene check-lorene-clean:
if BUILD_GYOTO
cd bin ; $(MAKE) $@
endif
diff --git a/Makefile.in b/Makefile.in
index c8b2699..d4a7d20 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -893,7 +893,7 @@ $(SUBDIRS):
ChangeLog:
git log --no-merges > ChangeLog
-check-mpi check-mpi-clean:
+check-mpi check-mpi-clean check-lorene check-lorene-clean:
@BUILD_GYOTO_TRUE@ cd bin ; $(MAKE) $@
@HAVE_YORICK_TRUE@ cd yorick ; $(MAKE) $@
diff --git a/bin/Makefile.am b/bin/Makefile.am
index f012d91..16ec552 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -81,6 +81,31 @@ check-mpi: check-mpi-clean check-mpi-compute
check: check-nompi
+if HAVE_LORENE
+export HOME_LORENE
+$(HOME_LORENE)/Codes/Nrotstar/nrotstar:
+ cd $(HOME_LORENE)/Codes/Nrotstar/ && cp Parameters/GR/Kepler/*.d ./ && $(SED) -i.bak 's/1 graph/0 graph/' par_rot.d && $(MAKE)
+
+$(HOME_LORENE)/Codes/Nrotstar/resu.d: $(HOME_LORENE)/Codes/Nrotstar/nrotstar
+ cd $(HOME_LORENE)/Codes/Nrotstar/ && ./nrotstar
+
+$(EXAMPLE_DIR)resu.d: $(HOME_LORENE)/Codes/Nrotstar/resu.d
+ cp $^ $@
+
+CHECK_ROTSTAR_RESULTS = example-movingstar-rotstar3_1.fits example-fixedstar-rotstar3_1.fits
+
+$(CHECK_ROTSTAR_RESULTS): gyoto $(EXAMPLE_DIR)$(@:.fits=.xml) $(EXAMPLE_DIR)resu.d
+ $(CHECK_CMD) $(EXAMPLE_DIR)$(@:.fits=.xml) \!$@
+
+check-lorene-clean:
+ rm -f $(CHECK_ROTSTAR_RESULTS) $(EXAMPLE_DIR)resu.d
+
+check-lorene-compute: $(CHECK_ROTSTAR_RESULTS)
+
+check-lorene: check-lorene-clean check-lorene-compute
+
+endif
+
endif
.PHONY: check-nompi-compute check-nompi-clean check-nompi check-mpi-clean check-mpi-compute check-mpi check
diff --git a/bin/Makefile.in b/bin/Makefile.in
index aff9500..997f48c 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -421,6 +421,7 @@ CHECK_RESULTS = example-thin-disk.fits example-thin-disk-KS.fits \
example-torus-KS.fits $(am__append_6)
CHECK_MPI_RESULTS = $(CHECK_RESULTS:.fits=-mpi.fits)
CHECK_CMD = unset GYOTO_PLUGINS && ./gyoto --resolution=32 --nthreads=8 --nprocesses=0
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE at CHECK_ROTSTAR_RESULTS = example-movingstar-rotstar3_1.fits example-fixedstar-rotstar3_1.fits
all: all-am
.SUFFIXES:
@@ -855,6 +856,26 @@ check-mpi-clean:
@BUILD_GYOTO_TRUE at check: check-nompi
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE at export HOME_LORENE
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@$(HOME_LORENE)/Codes/Nrotstar/nrotstar:
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ cd $(HOME_LORENE)/Codes/Nrotstar/ && cp Parameters/GR/Kepler/*.d ./ && $(SED) -i.bak 's/1 graph/0 graph/' par_rot.d && $(MAKE)
+
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@$(HOME_LORENE)/Codes/Nrotstar/resu.d: $(HOME_LORENE)/Codes/Nrotstar/nrotstar
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ cd $(HOME_LORENE)/Codes/Nrotstar/ && ./nrotstar
+
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@$(EXAMPLE_DIR)resu.d: $(HOME_LORENE)/Codes/Nrotstar/resu.d
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ cp $^ $@
+
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@$(CHECK_ROTSTAR_RESULTS): gyoto $(EXAMPLE_DIR)$(@:.fits=.xml) $(EXAMPLE_DIR)resu.d
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ $(CHECK_CMD) $(EXAMPLE_DIR)$(@:.fits=.xml) \!$@
+
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE at check-lorene-clean:
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ rm -f $(CHECK_ROTSTAR_RESULTS) $(EXAMPLE_DIR)resu.d
+
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE at check-lorene-compute: $(CHECK_ROTSTAR_RESULTS)
+
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE at check-lorene: check-lorene-clean check-lorene-compute
+
.PHONY: check-nompi-compute check-nompi-clean check-nompi check-mpi-clean check-mpi-compute check-mpi check
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git
More information about the Debian-astro-commits
mailing list