-

[physik/ising.git] / ising.c

diff --git a/ising.c b/ising.c
index b92cf99..d369024 100644 (file)
--- a/ising.c
+++ b/ising.c
@@ -36,6 +36,8 @@ int usage(void)
  puts("-y <value> \t # y lattice sites");
  puts("-s <value> \t spin interaction strength");
  puts("-r \t run in interactive mode (still in work)");
+ puts("-d <value> \t refresh display rate");
+ puts("-t <value> maximal temperature");
 
  return 1;
 }
@@ -61,6 +63,7 @@ int main(int argc, char **argv)
  double delta_e;
  int runfree=0;
  double max_T;
+ int dr=1;
 
  /* random stuff*/
  srand(time(0));
@@ -73,6 +76,7 @@ int main(int argc, char **argv)
  itt=I;
  s=S;
  strcpy(output_file,"");
+ max_T=0;
  /* parse argv */
  for(i=1;i<argc;i++)
  {
@@ -98,6 +102,12 @@ int main(int argc, char **argv)
     case 'r':
      runfree=1;
      break;
+    case 'd':
+     dr=atoi(argv[++i]);
+     break;
+    case 't':
+     max_T=atof(argv[++i]);
+     break;
     default:
      usage();
      return -1;
@@ -122,8 +132,8 @@ int main(int argc, char **argv)
 
  /* begin at T=0 M=1 situation */
  memset(atom,0,max_x*max_y*sizeof(unsigned char));
- 
- max_T=1.3*s;
+
+ if(max_T==0) max_T=3.0*s; 
 
  for(T=.05;T<max_T;T+=.05)
  {
@@ -143,7 +153,7 @@ int main(int argc, char **argv)
    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=(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;
+   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))
@@ -153,6 +163,8 @@ int main(int argc, char **argv)
   }
  }
  
+ if(i%dr==0)
+ {
   sprintf(t_text," temp: %.3f",T);
   arg_v[1]=t_text;
   sprintf(b_text," beta: %.3f",beta);
@@ -164,6 +176,7 @@ int main(int argc, char **argv)
   sprintf(m_text," magnetization: %.3f",1.0-2.0*M/(max_x*max_y));
   arg_v[6]=m_text;
   d2_lattice_draw(&d2_l,0,0,6,arg_v);
+ }
 
   }
   if(of_fd) dprintf(of_fd,"%f %f\n",T,1.0-2.0*M/(max_x*max_y));
@@ -187,7 +200,7 @@ int main(int argc, char **argv)
    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=(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;
+   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))
@@ -197,6 +210,8 @@ int main(int argc, char **argv)
   }
  }
 
+ if(i%dr==0)
+ {
   sprintf(t_text," temp = %.3f",T);
   arg_v[1]=t_text;
   sprintf(b_text," beta = %.3f",beta);
@@ -208,6 +223,7 @@ int main(int argc, char **argv)
   sprintf(m_text," magnetization: %.3f",1.0-2.0*M/(max_x*max_y));
   arg_v[6]=m_text;
   d2_lattice_draw(&d2_l,0,0,6,arg_v);
+ }
   
   }
   if(of_fd) dprintf(of_fd,"%f %f\n",T,1.0-2.0*M/(max_x*max_y));