Merge pull request #529 from lisataldir/feature/handlers

Average handler for ArbLattice

Author: llaniewski

src/ArbLattice.cpp

@@ -835,3 +835,12 @@ void ArbLattice::debugDumpVTU() const {
         vtu_file.writeFooters();
     }
 }
+
+void ArbLattice::resetAverage(){
+    data.reset_iter = data.iter;
+    for(const Model::Field& f : model->fields) {
+        if (f.isAverage) {
+            CudaMemset(&getSnapPtr(Snap)[f.id*sizes.snaps_pitch], 0, sizes.snaps_pitch*sizeof(real_t));
+        }
+    }
+}

src/ArbLattice.hpp

@@ -100,6 +100,8 @@ class ArbLattice : public LatticeBase {
     const ArbLatticeConnectivity& getConnectivity() const { return connect; }
     const std::vector<unsigned>& getLocalPermutation() const { return local_permutation; }
 
+    void resetAverage();
+
    protected:
     ArbLatticeLauncher launcher;  /// Launcher responsible for running CUDA kernels on the lattice
     void SetFirstTabs(int tab0, int tab1);

src/Handlers/cbAveraging.cpp

@@ -3,16 +3,21 @@ std::string cbAveraging::xmlname = "Average";
 #include "../HandlerFactory.h"
 
 int cbAveraging::Init () {
-		Callback::Init();
-		solver->getCartLattice()->resetAverage();
-                return 0;
-        }
+	return Callback::Init();
+}
 
 
 int cbAveraging::DoIt () {
-                Callback::DoIt();
-                solver->getCartLattice()->resetAverage(); // reseting averages-storing densities and setting reset_iter to iter
-                return 0;
+	        Callback::DoIt();
+	        const auto do_cartesian = [&](const Lattice<CartLattice>* lattice){
+		        solver->getCartLattice()->resetAverage();
+		        return EXIT_SUCCESS;
+	        };
+	        const auto do_arbitrary = [&](const Lattice<ArbLattice>* lattice){
+		        solver->getArbLattice()->resetAverage();
+		        return EXIT_SUCCESS;
+	        };
+	        return std::visit(OverloadSet{do_cartesian, do_arbitrary}, solver->getLatticeVariant());
         }