Revert "Test for plumed#726"

This reverts commit 922f11d. See plumed#727
chen-jialan · Aug 15, 2021 · b9ca241 · b9ca241
1 parent 657fef9
commit b9ca241
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 22 deletions.
diff --git 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
diff --git 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
@@ -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<N)print""}' H1 > H1_nonewline
-}
-
diff --git a/regtest/basic/rt-make-exceptions/main.cpp b/regtest/basic/rt-make-exceptions/main.cpp
@@ -116,15 +116,14 @@ 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");
   test_line(ofs,plumed,"COMBINE ARG=d,d1 COEFFICIENTS=3,3 PARAMETERS=1");
   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
@@ -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