Implemented starting configuration.

diff --git a/latlib b/latlib
index 493266210f4f7627378161978968e719372ef03e..c819c7a5996c18a6b1c5501c1984245840ddc8ca 160000 (submodule)
--- a/latlib
+++ b/latlib
@@ -1 +1 @@
-Subproject commit 493266210f4f7627378161978968e719372ef03e
+Subproject commit c819c7a5996c18a6b1c5501c1984245840ddc8ca

diff --git a/u1casc-flux/CMakeLists.txt b/u1casc-flux/CMakeLists.txt
index 9b85594c6e7e2e88738e2bf68c58d9076bba7b5b..e3d1d2375aeb8b0638ab2047e82fa4ff7ed7967b 100644 (file)
--- a/u1casc-flux/CMakeLists.txt
+++ b/u1casc-flux/CMakeLists.txt
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.8)
 
 project(u1casc-flux)
 
 
 project(u1casc-flux)
 

+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+

 # #PROFILING
 # set(CMAKE_CXX_FLAGS -pg)
 # set(CMAKE_EXE_LINKER_FLAGS -pg)
 # #PROFILING
 # set(CMAKE_CXX_FLAGS -pg)
 # set(CMAKE_EXE_LINKER_FLAGS -pg)

diff --git a/u1casc-flux/sim.hpp b/u1casc-flux/sim.hpp
index 7fd59aff106cd447785b33d106fd6b1fad5bc001..496a28db15a944f9c2c9c9192b7ab2be9eab3a9c 100644 (file)
--- a/u1casc-flux/sim.hpp
+++ b/u1casc-flux/sim.hpp
@@ -24,10 +24,11 @@ public:
   double WF(int nom, int denom, int iflav);
   int iPlaq(int i, int j);
   double I(int p);
   double WF(int nom, int denom, int iflav);
   int iPlaq(int i, int j);
   double I(int p);

-
+  void _newParas();
+  

 private:
 private:

+  void _resetConfig();

   void _makeSweep();
   void _makeSweep();

-  void _newParas();

   gsl_rng* rangsl;
   int lineSweep();
   int lineUpdate(int x, int vardir);
   gsl_rng* rangsl;
   int lineSweep();
   int lineUpdate(int x, int vardir);


@@ -92,7 +93,7 @@ sim::sim(o815 *_O815) : o815::sim( _O815,
 }
 
 void sim::_makeSweep() 
 }
 
 void sim::_makeSweep() 

-{  
+{ 

   lineSweep();
   
   for( int x=0; x<lsize4; x++) {
   lineSweep();
   
   for( int x=0; x<lsize4; x++) {


@@ -118,8 +119,10 @@ void sim::_newParas() {
   beta = (*O815->paraQ)["beta"];
   Mu[0] = (*O815->paraQ)["muone"];
   Mu[1] = (*O815->paraQ)["mutwo"];
   beta = (*O815->paraQ)["beta"];
   Mu[0] = (*O815->paraQ)["muone"];
   Mu[1] = (*O815->paraQ)["mutwo"];

+}

 
 

-  memset(confMem, 0, sizeof(int)*lsize4*(2*4+2*4+6));
+void sim::_resetConfig() {
+  memset(confMem, 0, confmemSize);

 }
 
 int sim::lineSweep()
 }
 
 int sim::lineSweep()

diff --git a/u1casc-ordinary/CMakeLists.txt b/u1casc-ordinary/CMakeLists.txt
index 40225bd5155175e5057f536e54b2738d9e34abea..d032e4a952c2b502e58a069e0dc01aff0836ffa2 100644 (file)
--- a/u1casc-ordinary/CMakeLists.txt
+++ b/u1casc-ordinary/CMakeLists.txt
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.8)
 
 project(u1casc)
 
 
 project(u1casc)
 

+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+

 # #PROFILING
 # set(CMAKE_CXX_FLAGS -pg)
 # set(CMAKE_EXE_LINKER_FLAGS -pg)
 # #PROFILING
 # set(CMAKE_CXX_FLAGS -pg)
 # set(CMAKE_EXE_LINKER_FLAGS -pg)

diff --git a/u1casc-ordinary/sim.hpp b/u1casc-ordinary/sim.hpp
index f88e650d6c2bc407b5aa44565a431040ed5e7591..986ae371fe10f54b8a041848e8e401e4b735745e 100644 (file)
--- a/u1casc-ordinary/sim.hpp
+++ b/u1casc-ordinary/sim.hpp
@@ -18,10 +18,11 @@ public:
   neigh *nb;
   complex<double> *U, *phi;
   double kappa[2], lambda[2], beta;
   neigh *nb;
   complex<double> *U, *phi;
   double kappa[2], lambda[2], beta;

-
+  void _newParas();
+  

 private:
 private:

+  void _resetConfig();

   void _makeSweep();
   void _makeSweep();

-  void _newParas();

   gsl_rng* rangsl;
   double rhoPhi(const int& iphi, const int& x0, const complex<double>& candPhi);
   double rhoU(const int& x0, const int& nu0, const complex<double>& candU);
   gsl_rng* rangsl;
   double rhoPhi(const int& iphi, const int& x0, const complex<double>& candPhi);
   double rhoU(const int& x0, const int& nu0, const complex<double>& candU);


@@ -60,7 +61,9 @@ void sim::_newParas() {
   lambda[0] = (*O815->paraQ)["lambdaone"];
   lambda[1] = (*O815->paraQ)["lambdatwo"];
   beta = (*O815->paraQ)["beta"];
   lambda[0] = (*O815->paraQ)["lambdaone"];
   lambda[1] = (*O815->paraQ)["lambdatwo"];
   beta = (*O815->paraQ)["beta"];

+}

 
 

+void sim::_resetConfig() {

   for(int ix=0; ix<lsize4; ix++) {
     for(int i=0; i<2; i++) phi[ i*lsize4 + ix ] = 0;
     for(int nu=0; nu<4; nu++) U[ ix*4 + nu ] = 1;
   for(int ix=0; ix<lsize4; ix++) {
     for(int i=0; i<2; i++) phi[ i*lsize4 + ix ] = 0;
     for(int nu=0; nu<4; nu++) U[ ix*4 + nu ] = 1;