default values now in optimum, added rand debug defines

diff --git a/nlsop.c b/nlsop.c
index f030561..b8c9e28 100644 (file)
--- a/nlsop.c
+++ b/nlsop.c
@@ -1407,7 +1407,9 @@ int main(int argc,char **argv)
   if(c_profile[d3_l.max_z-1]!=0)
   {
    printf("max_z (%d) too small - sputtering not possible\n",d3_l.max_z);
+ #ifndef DEBUG_RAND
    return -1;
+ #endif
   }
   /* calculate ratio of c_simwindow / c_total */
   //if(get_c_ratio(&c_ratio,p_file,&my_info,&d3_l)!=1)
@@ -1432,6 +1434,9 @@ int main(int argc,char **argv)
 #endif
 #ifdef DEBUG_NORM
   printf("%d\n",get_rand(d3_l.max_z));
+#endif
+#ifdef DEBUG_LINEAR
+  printf("%d\n",get_rand_lgp(d3_l.max_z,1,0));
 #endif
  if(i==10000000) return 1;
  i++;

diff --git a/nlsop.h b/nlsop.h
index 6715c59..b18b966 100644 (file)
--- a/nlsop.h
+++ b/nlsop.h
@@ -35,9 +35,9 @@ typedef struct __info
 #define DR_AC .005
 #define DIFF_RATE 1000000
 
-#define S_D .00001
-#define B_D .0
-#define C_D .005
+#define S_D .0001
+#define B_D .01
+#define C_D .001
 
 #define MAX_CHARS 128
 #define MAX_TXT 40
@@ -53,7 +53,7 @@ typedef struct __info
 #define S_RATE ((2*3*STEPS)/100)
 #define SI_PER_VOLUME (168*8)
 
-#define A_START 0.1
+#define A_START 0.23
 #define AC_START 0.89
 #define A_END 0.84