From 895e0779dd8ae76b1c933bbf24cee64ac3844449 Mon Sep 17 00:00:00 2001 From: Vanday Bundu Date: Wed, 29 Sep 2021 18:09:20 -0400 Subject: [PATCH] the file adjustments so far --- src/image/fits/Testfile | 2 ++ src/image/io/Testfile | 2 ++ src/image/misc/Testfile | 7 +++++-- src/image/rotcur/Testfile | 2 +- src/image/trans/Testfile | 4 ++++ src/kernel/fortran/Testfile | 4 ++-- src/kernel/io/Testfile | 3 +++ src/kernel/misc/Testfile | 5 +++-- src/kernel/tab/Testfile | 1 + src/scripts/testsuite | 1 - 10 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/image/fits/Testfile b/src/image/fits/Testfile index f5b8a4321..667c40159 100644 --- a/src/image/fits/Testfile +++ b/src/image/fits/Testfile @@ -57,11 +57,13 @@ fitsccd: ccdfits scanfits: ccdfits @echo Running $@ + $(EXEC) scanfits fits.in; $(EXEC) scanfits fits.in ; nemo.coverage scanfits.c fitsglue: map001.fits map002.fits map003.fits @echo Running $@ + $(EXEC) fitsglue map%03d.fits cube.fits inlist=1:3; $(EXEC) fitsglue map%03d.fits cube.fits inlist=1:3 ; nemo.coverage fitsglue.c $(EXEC) fitshead map001.fits | grep DATA; nemo.coverage fitshead.c $(EXEC) fitshead map002.fits | grep DATA diff --git a/src/image/io/Testfile b/src/image/io/Testfile index 6746de0cf..1f4813ff8 100644 --- a/src/image/io/Testfile +++ b/src/image/io/Testfile @@ -32,9 +32,11 @@ ccdprint: ccd.in ccddump: ccd.in @echo Running $@ + $(EXEC) ccddump ccd.in; $(EXEC) ccddump ccd.in . ; nemo.coverage ccddump.c ccdspec: ccd3.in + ccdspec ccd3.in ccdspec ccd3.in | tail -3 ccdhead: ccd.in diff --git a/src/image/misc/Testfile b/src/image/misc/Testfile index cdd5c2d68..82fb71a4e 100644 --- a/src/image/misc/Testfile +++ b/src/image/misc/Testfile @@ -32,6 +32,7 @@ ccdmom.in: ccdplot: ccd.in @echo Running $@ + $(EXEC) ccdplot ccd.in $(EXEC) ccdplot ccd.in $(C) yapp=$(YAPP) ; nemo.coverage ccdplot.c ccdstat: ccd.in @@ -40,12 +41,13 @@ ccdstat: ccd.in ccdsub: ccd.in @echo Running $@ + $(EXEC) ccdsub ccd.in - 10:20 10:20 $(EXEC) ccdsub ccd.in - 10:20 10:20 | $(EXEC) ccdstat - ; nemo.coverage ccdsub.c ccdstat.c ccdrow: ccd.in @echo Running $@ - $(EXEC) ccdrow ccd.in - row=0 | $(EXEC) ccdstat - ; nemo.coverage ccdrow.c ccdstat.c - + $(EXEC) ccdrow ccd.in - row=0 | $(EXEC) ccdstat - ; nemo.coverage ccdrow.c ccdstat.c + $(EXEC) ccdrow ccd.in . row=0; ccdmom: ccdmom.in @echo Running $@ $(EXEC) ccdmom ccdmom.in - 1 | $(EXEC) ccdstat - ; nemo.coverage ccdmom.c ccdstat.c @@ -63,6 +65,7 @@ gauss2: ccdstack: gauss1 gauss2 @echo Running $@ + $(EXEC) ccdstack gauss1,gauss2 . $(EXEC) ccdstack gauss1,gauss2 - | $(EXEC) ccdstat - $(EXEC) ccdstack gauss2,gauss1 - | $(EXEC) ccdstat - diff --git a/src/image/rotcur/Testfile b/src/image/rotcur/Testfile index d1f7bd5d3..855d884f7 100644 --- a/src/image/rotcur/Testfile +++ b/src/image/rotcur/Testfile @@ -83,7 +83,7 @@ rotcurshape: map1.vel rotcurtab: $(EXEC) rotcurtab radii=0:5 rotcur1=linear,1 rotcur2=core,1,2,3; nemo.coverage rotcurtab.c - + $(EXEC) rotcurtab radii=0:5 rotcur1=linear,1 rotcur2=core,1,2,3; velfit: map1.vel $(EXEC) velfit in=map1.vel radii=$(R) pa=$(PA) inc=$(INC) out=map2.vel PA = 30 diff --git a/src/image/trans/Testfile b/src/image/trans/Testfile index 5f885dba1..601eef0f7 100644 --- a/src/image/trans/Testfile +++ b/src/image/trans/Testfile @@ -34,18 +34,22 @@ ccdgen: ccdflip: ccd.in @echo Running $@ + $(EXEC) ccdflip ccd.in - xy; $(EXEC) ccdflip ccd.in - xy | $(EXEC) ccdprint - x= y= format=%7.3f ; nemo.coverage ccdflip.c ccdsmooth: ccd.in @echo Running $@ + $(EXEC) ccdsmooth ccd.in - 1; $(EXEC) ccdsmooth ccd.in - 1 | $(EXEC) ccdprint - x= y= format=%7.3f ; nemo.coverage ccdsmooth.c ccdsharp: @echo Running $@ + $(EXEC) ccdsharp ccd.in -; $(EXEC) ccdsharp ccd.in - | $(EXEC) ccdprint - x= y= format=%7.3f ; nemo.coverage ccdsmooth.c ccdsharp3: ccd3.in @echo Running $@ + $(EXEC) ccdsharp3 ccd3.in -; $(EXEC) ccdsharp3 ccd3.in -| $(EXEC) ccdprint - x= y= z= format=%7.3f ; nemo.coverage ccdsmooth.c ccdintpol: ccd.in diff --git a/src/kernel/fortran/Testfile b/src/kernel/fortran/Testfile index 81c41e1f3..aa93459f3 100644 --- a/src/kernel/fortran/Testfile +++ b/src/kernel/fortran/Testfile @@ -1,6 +1,6 @@ DIR = src/kernel/fortran BIN = -NEED =$(BIN) unfio ftoc +NEED =$(BIN) ftoc # no testing done here yet @@ -13,7 +13,7 @@ need: clean: @echo Cleaning $(DIR) -all: $(BIN) +all: $(BIN) func: ($(MAKE) funcc; $(EXEC) funcc) diff --git a/src/kernel/io/Testfile b/src/kernel/io/Testfile index fa8cbd74c..635263446 100644 --- a/src/kernel/io/Testfile +++ b/src/kernel/io/Testfile @@ -36,10 +36,12 @@ tsf: csf: @echo Running csf + $(EXEC) csf rsf.out csf.out MySet $(EXEC) csf rsf.out csf.out MySet ; nemo.coverage csf.c $(EXEC) csf rsf.out - MyD | $(EXEC) tsf - maxprec=t ; nemo.coverage csf.c tsf.c $(EXEC) csf rsf.out - MyD convert=d2f | $(EXEC) tsf - maxprec=t ; nemo.coverage csf.c tsf.c $(EXEC) csf rsf.out - MyF | $(EXEC) tsf - maxprec=t ; nemo.coverage csf.c tsf.c + # oops,there is a problem here, can't do this # csf rsf.out - MyF convert=f2d | tsf - maxprec=t $(EXEC) tsf csf.out ; nemo.coverage tsf.c @@ -50,5 +52,6 @@ bsf: hisf: @echo Running hisf + $(EXEC) hisf csf.out $(EXEC) hisf csf.out ; nemo.coverage history.c diff --git a/src/kernel/misc/Testfile b/src/kernel/misc/Testfile index cf2e90d2c..743edbe96 100644 --- a/src/kernel/misc/Testfile +++ b/src/kernel/misc/Testfile @@ -8,7 +8,7 @@ help: need: @echo $(NEED) -all: xrandom nemoinp +all: xrandom nemoinp linreg clean: @echo Cleaning $(DIR) @@ -17,6 +17,7 @@ clean: xrandom: @echo Running xrandom @echo uniform seed=5 n=5 + $(EXEC) xrandom seed=5 n=5 report=t; $(EXEC) xrandom seed=5 n=5 report=t ; nemo.coverage xrandom.c @echo gauss seed=5 n=5 $(EXEC) xrandom seed=5 n=5 gauss=t report=t ; nemo.coverage xrandom.c @@ -45,5 +46,5 @@ nemoinp: linreg: - @nemoinp 1:10 | tabmath - - '%1+rang(0,0.5)' seed=123 > linreg.tab + @nemoinp 1:10 | tabmath - - '%1+rang(0,0.5)' seed=123 > linreg.tab; $(EXEC) linreg linreg.tab diff --git a/src/kernel/tab/Testfile b/src/kernel/tab/Testfile index cb470a4a1..ef1de44df 100644 --- a/src/kernel/tab/Testfile +++ b/src/kernel/tab/Testfile @@ -26,6 +26,7 @@ tabmath: tab.in tabplot: @echo Running $@ + $(EXEC) tabplot -; $(EXEC) tabmath tab.in - 'sqrt(%1)' | $(EXEC) tabplot - ; nemo.coverage tabplot.c NMAX = 100000 diff --git a/src/scripts/testsuite b/src/scripts/testsuite index f4f7d8a27..65e284a39 100755 --- a/src/scripts/testsuite +++ b/src/scripts/testsuite @@ -214,4 +214,3 @@ help: echo "(see also Testfile.def)" echo " NBODY=10 should at least be 10; 10 makes it run fast" echo -