X-Git-Url: https://hackdaworld.org/gitweb/?p=physik%2Fising.git;a=blobdiff_plain;f=ising.c;h=4ff3ba80befc47aecc8a45e0c536d71df04ba8d4;hp=dd538b34bd51424fb2a19da036dd0885ef599574;hb=52bfe319f10ec529c59a2e7cebe844f9a4be4694;hpb=0646288c1f9b82c04ff6c74546600e5527c64b2f

diff --git a/ising.c b/ising.c
index dd538b3..4ff3ba8 100644
--- a/ising.c
+++ b/ising.c
@@ -11,19 +11,21 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
+#include <time.h>
+
 #include "dfbapi.h"
 
-#define X 100
-#define Y 100
-#define MAX_T 200
+#define X 200
+#define Y 200
+#define MAX_T 10
 
 int main(int argc, char **argv)
 {
  unsigned char *atom;
  char *arg_v[4];
- char m_text[30];
- char t_text[30];
- char b_text[30];
+ char m_text[64];
+ char t_text[64];
+ char b_text[64];
  int max_x,x_c,max_y,y_c;
  int i;
  int count_p;
@@ -33,6 +35,9 @@ int main(int argc, char **argv)
  double beta;
  double delta_e;
 
+ /* random stuff*/
+ srand(time(0));
+
  /* display stuff */
  d2_lattice d2_l;
 
@@ -53,37 +58,37 @@ int main(int argc, char **argv)
  
  for(T=1;T<MAX_T;T++)
  {
-  beta=1.0/T; /* k_B = 1 */
+  beta=5.0/T; /* k_B = 1 */
   /* do 100 itterations, we will need more */
   for(i=0;i<100;i++)
   {
 
+ M=0;
  for(x_c=0;x_c<max_x;x_c++)
  {
   for(y_c=0;y_c<max_y;y_c++)
   {
    count_p=0;
-   M=0;
-   if((*(atom+x_c+((2*y_c+1)%max_y)*max_x))&1) ++count_p;
-   if((*(atom+x_c+((2*y_c-1)%max_y)*max_x))&1) ++count_p;
-   if((*(atom+((2*x_c+1)%max_x)+y_c*max_x))&1) ++count_p;
-   if((*(atom+((2*x_c-1)%max_x)+y_c*max_x))&1) ++count_p;
+   if((*(atom+x_c+((y_c+max_y+1)%max_y)*max_x))&1) ++count_p;
+   if((*(atom+x_c+((y_c+max_y-1)%max_y)*max_x))&1) ++count_p;
+   if((*(atom+((max_x+x_c+1)%max_x)+y_c*max_x))&1) ++count_p;
+   if((*(atom+((max_x+x_c-1)%max_x)+y_c*max_x))&1) ++count_p;
    if(((*(atom+x_c+y_c*max_x))&1)==0) count_p=4-count_p;
-   delta_e=(4-2*count_p)*S;
+   delta_e=(2*count_p-4)*S;
    if(delta_e<0) *(atom+x_c+y_c*max_x)=(*(atom+x_c+y_c*max_x)+1)&1;
    else
    {
     if(1.0*rand()/RAND_MAX<exp(-1.0*delta_e*beta))
      *(atom+x_c+y_c*max_x)=(*(atom+x_c+y_c*max_x)+1)&1;
-    else M+=1;
    }
+   if((*(atom+x_c+y_c*max_x))&1) ++M;
   }
  }
-  sprintf(t_text,"T = %d",T);
+  sprintf(t_text,"temp = %d",T);
   arg_v[1]=t_text;
-  sprintf(b_text,"b = %f",beta);
+  sprintf(b_text,"beta = %f",beta);
   arg_v[2]=b_text;
-  sprintf(m_text,"M = %f",1.0-2*M/(max_x*max_y));
+  sprintf(m_text,"magn = %f",1.0-2.0*M/(max_x*max_y));
   arg_v[3]=m_text;
   d2_lattice_draw(&d2_l,0,0,3,arg_v);
   }