From a9e5f20c39ab4a4c2d7c2c5865dae448e43ac2a7 Mon Sep 17 00:00:00 2001 From: tayral Date: Fri, 17 Oct 2014 17:01:20 +0100 Subject: [PATCH] put back literalinclude instead of triqs_example for c++ --- doc/reference/c++/clef/examples/lazy_sum.rst | 5 +- doc/reference/c++/statistics/ising2d.rst | 5 +- doc/reference/c++/statistics/ising2d_0.cpp | 181 ------------------- 3 files changed, 8 insertions(+), 183 deletions(-) delete mode 100644 doc/reference/c++/statistics/ising2d_0.cpp diff --git a/doc/reference/c++/clef/examples/lazy_sum.rst b/doc/reference/c++/clef/examples/lazy_sum.rst index a9e0754a..b781fb61 100644 --- a/doc/reference/c++/clef/examples/lazy_sum.rst +++ b/doc/reference/c++/clef/examples/lazy_sum.rst @@ -6,4 +6,7 @@ A lazy sum Here is a little functional `sum` that sums a function f over various domains and accepts lazy expressions as arguments. -.. triqs_example:: src/sum_functional.cpp +.. literalinclude:: src/sum_functional.cpp + +The output is: +.. literalinclude:: src/sum_functional.output diff --git a/doc/reference/c++/statistics/ising2d.rst b/doc/reference/c++/statistics/ising2d.rst index 519aa78e..689b18c5 100644 --- a/doc/reference/c++/statistics/ising2d.rst +++ b/doc/reference/c++/statistics/ising2d.rst @@ -3,6 +3,9 @@ Full example: Monte-Carlo simulation of the 2D Ising model =========================================================== +.. literalinclude:: src/ising2d.cpp -.. triqs_example:: ising2d_0.cpp +The output is: + +.. literalinclude:: src/ising2d.output diff --git a/doc/reference/c++/statistics/ising2d_0.cpp b/doc/reference/c++/statistics/ising2d_0.cpp deleted file mode 100644 index 5170551d..00000000 --- a/doc/reference/c++/statistics/ising2d_0.cpp +++ /dev/null @@ -1,181 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -//#define TRIQS_ARRAYS_ENFORCE_BOUNDCHECK -// H = -J \sum_ s_i s_j - h \sum_i s_i -// theoretical T_c = 2/log(1+sqrt(2)) for J = 1.0 -using namespace triqs::statistics; -/************** - * config - **************/ - -struct configuration { - // N is the linear size of spin matrix, M the total magnetization, - // beta the inverse temperature, J the coupling, - // field the magnetic field and energy the energy of the configuration - int N, M; - double beta, J, field, energy; - // the chain of spins: true means "up", false means "down" - triqs::arrays::array chain; - observable M_stack; - - // constructor - configuration(int N_, double beta_, double J_, double field_): - N(N_), M(-N*N), beta(beta_), J(J_), field(field_), energy(-J*4*N/2+N*field), chain(N,N) , M_stack(){ - chain()=false; - } - -}; - -/************** - * move - **************/ - -// A move flipping a random spin -struct flip { - configuration * config; - triqs::mc_tools::random_generator &RNG; - - struct site { int i,j ;};//small struct storing indices of a given site - site s; - double delta_energy; - - // constructor - flip(configuration & config_, triqs::mc_tools::random_generator & RNG_) : - config(&config_), RNG(RNG_) {} - - // find the neighbours with periodicity - std::vector neighbors(site s, int N){ - std::vector nns(4); - int counter=0; - for(int i=-1;i<=1;i++){ - for(int j=-1;j<=1;j++){ - if ((i==0) != (j==0)) //xor - nns[counter++] = site{(s.i+i)%N, (s.j+j)%N}; - } - } - return nns; - } - double attempt() { - // pick a random site - int index = RNG(config->N*config->N); - s = {index%config->N, index/config->N}; - - // compute energy difference from field - delta_energy = (config->chain(s.i,s.j) ? 2 : -2) * config->field; - auto nns = neighbors(s,config->N); //nearest-neighbors - double sum_neighbors=0.0; - for(auto & x:nns) sum_neighbors += ((config->chain(x.i,x.j))?1:-1); - // compute energy difference from J - delta_energy += - sum_neighbors * config->J* (config->chain(s.i,s.j)?-2:2); - - // return Metroplis ratio - return std::exp(-config->beta * delta_energy); - } - - // if move accepted just flip site and update energy and magnetization - double accept() { - config->M += (config->chain(s.i,s.j) ? -2 : 2); - config->chain(s.i,s.j) = !config->chain(s.i,s.j); - config->energy += delta_energy; - return 1.0; - } - - // nothing to do if the move is rejected - void reject() {} -}; - - -/************** - * measure - **************/ -struct compute_m { - - configuration * config; - double Z, M; - - compute_m(configuration & config_) : config(&config_), Z(0), M(0) {} - - // accumulate Z and magnetization - void accumulate(int sign) { - - Z += sign; - M += config->M; - //config->M_stack << double(config->M/(config->N*config->N)); - config->M_stack << config->M; - } - - // get final answer M / (Z*N) - void collect_results(boost::mpi::communicator const &c) { - - double sum_Z, sum_M; - boost::mpi::reduce(c, Z, sum_Z, std::plus(), 0); - boost::mpi::reduce(c, M, sum_M, std::plus(), 0); - - if (c.rank() == 0) { - std::cout << "@Beta:\t"<beta<<"\tMagnetization:\t" << sum_M / (sum_Z*(config->N*config->N)) << std::endl ; - std::cout << "average_and_error(M) = " << average_and_error(config->M_stack) << std::endl; - std::cout << "#Beta:\t"<beta<<"\tAutocorr_time:\t" << autocorrelation_time_from_binning(config->M_stack) << std::endl; - std::ofstream outfile("magnetization_series.dat"); - for(int i=0;iM_stack.size();i++) - outfile << config->M_stack[i] < IsingMC(n_cycles, length_cycle, n_warmup_cycles, - random_name, random_seed, verbosity); - - // parameters of the model - int length = N; - double J = 1.0; - double field = H; - double beta = B; - - // construct configuration - configuration config(length, beta, J, field); - - // add moves and measures - IsingMC.add_move(flip(config, IsingMC.rng()), "spin flip"); - IsingMC.add_measure(compute_m(config), "measure magnetization"); - - // Run and collect results - IsingMC.start(1.0, triqs::utility::clock_callback(-1)); - IsingMC.collect_results(world); - - return 0; -}