From b9ca241f8847e84c7fbce8df938acccbfdac69f2 Mon Sep 17 00:00:00 2001 From: Giovanni Bussi Date: Sun, 15 Aug 2021 16:16:23 +0200 Subject: [PATCH] Revert "Test for #726" This reverts commit 922f11d29b38d70a1fdee29ab63da2e0af02a5aa. See #727 --- regtest/basic/rt-make-exceptions/COLVAR.reference | 6 +++--- regtest/basic/rt-make-exceptions/H1 | 5 ----- regtest/basic/rt-make-exceptions/H1.reference | 5 ----- regtest/basic/rt-make-exceptions/config | 5 ----- regtest/basic/rt-make-exceptions/main.cpp | 3 +-- regtest/basic/rt-make-exceptions/output.reference | 2 -- 6 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 regtest/basic/rt-make-exceptions/H1 diff --git a/regtest/basic/rt-make-exceptions/COLVAR.reference b/regtest/basic/rt-make-exceptions/COLVAR.reference index 82dabbfbb1..151e6fe3ff 100644 --- a/regtest/basic/rt-make-exceptions/COLVAR.reference +++ b/regtest/basic/rt-make-exceptions/COLVAR.reference @@ -1,4 +1,4 @@ #! FIELDS time d d1 m1.bias - 0.000000 0.00000 0.00000 0.69807 - 0.000000 5.19615 5.19615 1.58275 - 0.000000 10.39230 10.39230 2.16550 + 0.000000 0.00000 0.00000 0.00000 + 0.000000 5.19615 5.19615 0.00000 + 0.000000 10.39230 10.39230 0.58275 diff --git a/regtest/basic/rt-make-exceptions/H1 b/regtest/basic/rt-make-exceptions/H1 deleted file mode 100644 index c051b0489b..0000000000 --- a/regtest/basic/rt-make-exceptions/H1 +++ /dev/null @@ -1,5 +0,0 @@ -#! FIELDS time d sigma_d height biasf -#! SET multivariate false -#! SET kerneltype gaussian - 0.00000 5.19615 5.00000 1.00000 -1.00000 - 0.00000 10.39230 5.00000 1.00000 -1.00000 diff --git a/regtest/basic/rt-make-exceptions/H1.reference b/regtest/basic/rt-make-exceptions/H1.reference index 19616d0483..c051b0489b 100644 --- a/regtest/basic/rt-make-exceptions/H1.reference +++ b/regtest/basic/rt-make-exceptions/H1.reference @@ -3,8 +3,3 @@ #! SET kerneltype gaussian 0.00000 5.19615 5.00000 1.00000 -1.00000 0.00000 10.39230 5.00000 1.00000 -1.00000 -#! FIELDS time d sigma_d height biasf -#! SET multivariate false -#! SET kerneltype gaussian - 0.00000 5.19615 5.00000 1.00000 -1.00000 - 0.00000 10.39230 5.00000 1.00000 -1.00000 diff --git a/regtest/basic/rt-make-exceptions/config b/regtest/basic/rt-make-exceptions/config index a4db08c22e..2c8627a724 100644 --- a/regtest/basic/rt-make-exceptions/config +++ b/regtest/basic/rt-make-exceptions/config @@ -1,7 +1,2 @@ type=make plumed_needs="dlopen cregex" - -function plumed_regtest_before(){ - awk 'BEGIN{N='$(wc -l H1 |awk '{print $1}')'}{printf($0);if(NR H1_nonewline -} - diff --git a/regtest/basic/rt-make-exceptions/main.cpp b/regtest/basic/rt-make-exceptions/main.cpp index c3ba3e5c18..cdab46cbef 100644 --- a/regtest/basic/rt-make-exceptions/main.cpp +++ b/regtest/basic/rt-make-exceptions/main.cpp @@ -116,7 +116,6 @@ int main(){ test_line(ofs,plumed,"METAD ARG=d,d1 ADAPTIVE=DIFF PACE=1.5 SIGMA=1 HEIGHT=5"); test_line(ofs,plumed,"METAD ARG=d,d1 ADAPTIVE=GEOM PACE=1 SIGMA=1 HEIGHT=5 SIGMA_MIN=3"); test_line(ofs,plumed,"METAD ARG=d,d1 ADAPTIVE=GEOM PACE=1 SIGMA=1 HEIGHT=5 SIGMA_MAX=4"); - test_line(ofs,plumed,"METAD ARG=d PACE=1 SIGMA=5 HEIGHT=1 FILE=H1_nonewline RESTART=YES FMT=%9.5f"); test_line(ofs,plumed,"PIECEWISE ARG=t POINT0=1.2,10 POINT1=1.3,0 POINT2=1.4,5"); test_line(ofs,plumed,"SORT ARG=t,d"); test_line(ofs,plumed,"COMBINE ARG=d,d1 COEFFICIENTS=3"); @@ -124,7 +123,7 @@ int main(){ test_line(ofs,plumed,"COMBINE ARG=d,d1 COEFFICIENTS=3,3 PARAMETERS=1,2 POWERS=4"); // these should not fail - plumed.cmd("readInputLine","m1: METAD ARG=d PACE=1 SIGMA=5 HEIGHT=1 FILE=H1 RESTART=YES FMT=%9.5f"); + plumed.cmd("readInputLine","m1: METAD ARG=d PACE=1 SIGMA=5 HEIGHT=1 FILE=H1 FMT=%9.5f"); plumed.cmd("readInputLine","m2: METAD ARG=d PACE=2 SIGMA=5 HEIGHT=1 FILE=H2 FMT=%9.5f"); plumed.cmd("readInputLine","PRINT ARG=d,d1,m1.bias FILE=COLVAR FMT=%9.5f"); diff --git a/regtest/basic/rt-make-exceptions/output.reference b/regtest/basic/rt-make-exceptions/output.reference index a980de7b4e..99c86d9b23 100644 --- a/regtest/basic/rt-make-exceptions/output.reference +++ b/regtest/basic/rt-make-exceptions/output.reference @@ -64,8 +64,6 @@ readInputLine METAD ARG=d,d1 ADAPTIVE=GEOM PACE=1 SIGMA=1 HEIGHT=5 SIGMA_MIN=3 +++ catched readInputLine METAD ARG=d,d1 ADAPTIVE=GEOM PACE=1 SIGMA=1 HEIGHT=5 SIGMA_MAX=4 +++ catched -readInputLine METAD ARG=d PACE=1 SIGMA=5 HEIGHT=1 FILE=H1_nonewline RESTART=YES FMT=%9.5f -+++ catched readInputLine PIECEWISE ARG=t POINT0=1.2,10 POINT1=1.3,0 POINT2=1.4,5 +++ catched readInputLine SORT ARG=t,d