changes are mostly related to:

1. Introducing dlsch_16qam_llr_SIC.
2. New writing files format in file_output.c
3. Some comments addded.

openair1/SIMULATION/TOOLS/random_channel.c

@@ -932,7 +932,7 @@ channel_desc_t *new_channel_desc_scm(uint8_t nb_tx,
 				   maxDoppler,
 				   channel_offset, 
 				   path_loss_dB,
-				   0);
+				   1);
       break;
       
       case Rayleigh1_orth_eff_ch_TM4_prec_imag:

openair1/SIMULATION/TOOLS/rangen_double.c

@@ -68,8 +68,35 @@ void randominit(unsigned seed_init)
     ir[i]= seed;                   /* initialize the shuffle table    */
   }
 
-  iy=1;
-}
+ iy=1;
+} 
+
+
+/*void randominit(unsigned seed_init)
+{
+  int i;
+  // this need to be integrated with the existing rng, like taus: navid
+  msg("Initializing random number generator, seed %x\n",seed_init);
+
+  seed_init = 62110;
+  
+  if (seed_init == 0) {
+    srand((unsigned)time(NULL));
+
+    seed = (unsigned int) rand();
+  } else {
+    seed = seed_init;
+  }
+
+  if (seed % 2 == 0) seed += 1; /* seed and mod are relative prime */
+
+//  for (i=1; i<=97; i++) {
+//    seed = a*seed;                 /* mod 2**32  */
+//    ir[i]= seed;                   /* initialize the shuffle table    */
+//  }
+
+//  iy=1;
+//}
 
 /*!\brief Uniform linear congruential random number generator on \f$[0,1)\f$.  Returns a double-precision floating-point number.*/
 

openair1/SIMULATION/TOOLS/taus.c

@@ -87,7 +87,44 @@ void set_taus_seed(unsigned int seed_init)
     s2 = result;
 #endif
   }
-}
+} 
+ 
+/* void set_taus_seed(unsigned int seed_init)
+{
+
+#ifdef USER_MODE
+  struct drand48_data buffer;
+  unsigned long result = 0;
+#endif
+    s0 = (unsigned int)0x1e23d852;
+    s1 = (unsigned int)0x81f38a1c;
+    s2 = (unsigned int)0xfe1a133e;
+
+    return;
+
+  if (seed_init == 0) {
+    s0 = (unsigned int)time(NULL);
+    s1 = (unsigned int)time(NULL);
+    s2 = (unsigned int)time(NULL);
+  } else {
+#ifndef USER_MODE
+    s0 = (unsigned int)0x1e23d852;
+    s1 = (unsigned int)0x81f38a1c;
+    s2 = (unsigned int)0xfe1a133e;
+#else
+   // Use reentrant version of rand48 to ensure that no conflicts with other generators occur */
+  //  srand48_r((long int)seed_init, &buffer);
+  //  mrand48_r(&buffer, (long int *)&result);
+  //  s0 = result;
+  //  mrand48_r(&buffer, (long int *)&result);
+  //  s1 = result;
+  //  mrand48_r(&buffer, (long int *)&result);
+  //  s2 = result;
+//#endif
+ // }
+//}
+
+    
 
 #ifdef MAIN