Edits

QMCPACK · Jul 26, 2021 · 3ee5798 · 3ee5798
1 parent ba14d31
commit 3ee5798
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/QMCWaveFunctions/Jastrow/RadialJastrowBuilder.cpp b/src/QMCWaveFunctions/Jastrow/RadialJastrowBuilder.cpp
@@ -599,7 +599,7 @@ std::unique_ptr<WaveFunctionComponent> RadialJastrowBuilder::buildComponent(xmlN
     // it's a one body jastrow factor
     if (Jastfunction == "bspline")
     {
-      if (SpinOpt.find("yes") < SpinOpt.size())
+      if (SpinOpt == "yes")
       {
         return createJ1Spin<BsplineFunctor<RealType>>(cur);
       }
@@ -611,7 +611,7 @@ std::unique_ptr<WaveFunctionComponent> RadialJastrowBuilder::buildComponent(xmlN
     else if (Jastfunction == "pade")
     {
       guardAgainstPBC();
-      if (SpinOpt.find("yes") < SpinOpt.size())
+      if (SpinOpt == "yes")
       {
         return createJ1Spin<PadeFunctor<RealType>>(cur);
       }
@@ -628,7 +628,7 @@ std::unique_ptr<WaveFunctionComponent> RadialJastrowBuilder::buildComponent(xmlN
     else if (Jastfunction == "shortrangecusp")
     {
       //guardAgainstPBC(); // is this needed?
-      if (SpinOpt.find("yes") < SpinOpt.size())
+      if (SpinOpt == "yes")
       {
         return createJ1Spin<ShortRangeCuspFunctor<RealType>>(cur);
       }
@@ -639,7 +639,7 @@ std::unique_ptr<WaveFunctionComponent> RadialJastrowBuilder::buildComponent(xmlN
     }
     else if (Jastfunction == "user")
     {
-      if (SpinOpt.find("yes") < SpinOpt.size())
+      if (SpinOpt == "yes")
       {
         return createJ1Spin<UserFunctor<RealType>>(cur);
       }

diff --git a/src/QMCWaveFunctions/tests/test_J1SpinOrbitalSoA.cpp b/src/QMCWaveFunctions/tests/test_J1SpinOrbitalSoA.cpp
@@ -91,7 +91,7 @@ TEST_CASE("J1 spin evaluate derivatives Jastrow", "[wavefunction]")
 
   opt_variables_type active;
   twf.checkInVariables(active);
-
+  active.removeInactive();
   int nparam = active.size_of_active();
   REQUIRE(nparam == 4);