doing sweeploop in o815.

diff --git a/o815/o815.h b/o815/o815.h
index 1b941700ef66a51f6a79b6bb734477bf0a32184e..69a8276f67ea86a8c0aea2ee1171e652d1a18b97 100644 (file)
--- a/o815/o815.h
+++ b/o815/o815.h
@@ -48,7 +48,7 @@ class o815 {
     virtual void _newParas() {};
   private:
     virtual void _reset()=0;
     virtual void _newParas() {};
   private:
     virtual void _reset()=0;

-    virtual void _makeSweep(int nsweep)=0;
+    virtual void _makeSweep()=0;

   protected:
     o815 *O815;
     ostream *log;
   protected:
     o815 *O815;
     ostream *log;

diff --git a/o815/sim.cpp b/o815/sim.cpp
index 1b81dda4401b4bd042750763445c5dac4cd5adad..4e885b5745b03517caaecd786b775cd4ed4aaba5 100644 (file)
--- a/o815/sim.cpp
+++ b/o815/sim.cpp
@@ -44,12 +44,14 @@ void o815::sim::nextConfig() {
        *log << "SIM: " << nequileft << " of " << nequi << " equilibration steps left after virtual equilibration." << endl << flush;
       progress equiProg(nequileft);
       for( int iequi=0; iequi<nequileft; iequi++ ) {
        *log << "SIM: " << nequileft << " of " << nequi << " equilibration steps left after virtual equilibration." << endl << flush;
       progress equiProg(nequileft);
       for( int iequi=0; iequi<nequileft; iequi++ ) {

-       _makeSweep(1);
+       _makeSweep();

        while( equiProg.madeStep(iequi) ) *log << "SIM: " << equiProg.done()*100 << "% of equilibration done." << endl << flush;
       }
     }
        
        while( equiProg.madeStep(iequi) ) *log << "SIM: " << equiProg.done()*100 << "% of equilibration done." << endl << flush;
       }
     }
        

-    _makeSweep(nskip);
+    for (int iskip=0; iskip<nskip; iskip++)
+      _makeSweep();
+    

     hypercache::writeC();
   }
   
     hypercache::writeC();
   }