Merge pull request #2082 from sdouglas/trunk-patch

Patch FIRE GPU minimizer to prevent conflicts

Author: joaander

hoomd/md/FIREEnergyMinimizerGPU.cc

@@ -206,10 +206,13 @@ void FIREEnergyMinimizerGPU::update(uint64_t timestep)
                 CHECK_CUDA_ERROR();
             }
 
-        ArrayHandle<Scalar> h_sum(m_sum3, access_location::host, access_mode::read);
-        Pt += h_sum.data[0];
-        vnorm += h_sum.data[1];
-        fnorm += h_sum.data[2];
+            // Ensure h_sum goes out of scope before anisotropic block
+            {
+            ArrayHandle<Scalar> h_sum(m_sum3, access_location::host, access_mode::read);
+            Pt += h_sum.data[0];
+            vnorm += h_sum.data[1];
+            fnorm += h_sum.data[2];
+            }
 
         if ((*method)->getAnisotropic())
             {

sphinx-doc/credits.rst

@@ -111,6 +111,7 @@ The following people have contributed to HOOMD-blue:
 * Sam Nola, University of Michigan
 * Simone Ciarella, Eindhoven University of Technology
 * Shannon Moran, University of Michigan
+* Shawn Douglas, University of California, San Francisco
 * Sophie YouJung Lee, University of Michigan
 * Stephen Thomas, Boise State University
 * Steve Barr, Princeton University