Fix range checks for new parameters.
authorSebastian Kehl <sebastian.kehl@mpcdf.mpg.de>
Fri, 24 Sep 2021 12:59:32 +0000 (14:59 +0200)
committerMagnus Lundborg <magnus.lundborg@scilifelab.se>
Tue, 5 Oct 2021 11:38:46 +0000 (11:38 +0000)
src/gromacs/gmxpreprocess/readir.cpp

index c5873ab705eb2e5ba15787c03aa2cb3f0e925546..5470fb0355a8ab75cbf338e3e43e88a9e2d812d6 100644 (file)
@@ -853,20 +853,21 @@ void check_ir(const char*                    mdparin,
 
         if (fep->softcoreFunction == SoftcoreType::Gapsys)
         {
-            if (fep->sc_alpha < 0.0)
+            if (fep->scScaleLinpointQGapsys < 0.0)
             {
                 sprintf(warn_buf,
-                        "sc_alpha is equal %g but must be >= 0 when used with sc_function=gapsys.",
-                        fep->sc_alpha);
+                        "sc_scale_linpoint_Q_gapsys is equal %g but must be >= 0",
+                        fep->scScaleLinpointQGapsys);
                 warning_note(wi, warn_buf);
             }
 
-            if ((fep->sc_sigma < 0.0) || (fep->sc_sigma >= 1.0))
+            if ((fep->scScaleLinpointLJGapsys < 0.0) || (fep->scScaleLinpointLJGapsys >= 1.0))
             {
                 sprintf(warn_buf,
-                        "sc_sigma is equal %g but must be in [0,1) when used with "
+                        "sc_scale_linpoint_LJ_gapsys is equal %g but must be in [0,1) when used "
+                        "with "
                         "sc_function=gapsys.",
-                        fep->sc_sigma);
+                        fep->scScaleLinpointLJGapsys);
                 warning_note(wi, warn_buf);
             }
         }