From 1e794a4365284b01e4d8b686d2d71a8e2fbc1e83 Mon Sep 17 00:00:00 2001 From: hackbard Date: Thu, 22 Jul 2004 13:33:07 +0000 Subject: [PATCH 01/16] fixed nuclear energy loss profile --- nel-profile.txt | 200 ++++++++++++++++++++++++------------------------ 1 file changed, 100 insertions(+), 100 deletions(-) diff --git a/nel-profile.txt b/nel-profile.txt index 22060e8..6bb0385 100644 --- a/nel-profile.txt +++ b/nel-profile.txt @@ -1,100 +1,100 @@ -800100,E-04 3216,79E-5 -160010,E-03 3075,05E-5 -240010,E-03 3143,18E-5 -320010,E-03 3219,79E-5 -400010,E-03 3376,13E-5 -480010,E-03 3372,10E-5 -560010,E-03 3355,78E-5 -640010,E-03 3464,64E-5 -720010,E-03 3500,30E-5 -800010,E-03 3682,39E-5 -880010,E-03 3613,67E-5 -960010,E-03 3767,24E-5 -104001,E-02 3782,77E-5 -112001,E-02 3712,38E-5 -120001,E-02 3898,09E-5 -128001,E-02 4098,88E-5 -136001,E-02 4024,27E-5 -144001,E-02 4236,01E-5 -152001,E-02 4271,16E-5 -160001,E-02 4350,11E-5 -168001,E-02 4445,08E-5 -176001,E-02 4541,91E-5 -184001,E-02 4743,65E-5 -192001,E-02 4793,74E-5 -200001,E-02 4858,77E-5 -208001,E-02 5082,54E-5 -216001,E-02 5132,66E-5 -224001,E-02 5264,37E-5 -232001,E-02 5168,46E-5 -240001,E-02 5353,25E-5 -248001,E-02 5545,37E-5 -256001,E-02 5933,99E-5 -264001,E-02 6036,05E-5 -272001,E-02 6070,48E-5 -280001,E-02 6344,41E-5 -288001,E-02 6544,72E-5 -296001,E-02 6824,88E-5 -304001,E-02 6935,89E-5 -312001,E-02 6929,64E-5 -320001,E-02 7110,25E-5 -328001,E-02 7174,12E-5 -336001,E-02 7435,69E-5 -344001,E-02 7778,75E-5 -352001,E-02 8014,75E-5 -360001,E-02 8066,68E-5 -368001,E-02 8316,20E-5 -376001,E-02 8465,42E-5 -384001,E-02 8595,79E-5 -392001,E-02 8806,10E-5 -400001,E-02 8891,96E-5 -408001,E-02 8915,27E-5 -416001,E-02 9092,26E-5 -424001,E-02 8958,24E-5 -432001,E-02 8918,95E-5 -440001,E-02 8811,51E-5 -448001,E-02 8707,25E-5 -456001,E-02 8732,42E-5 -464001,E-02 8491,13E-5 -472001,E-02 8208,35E-5 -480001,E-02 7891,68E-5 -488001,E-02 7435,04E-5 -496001,E-02 7195,51E-5 -504001,E-02 6656,11E-5 -512001,E-02 6131,67E-5 -520001,E-02 5561,24E-5 -528001,E-02 5154,09E-5 -536001,E-02 4589,91E-5 -544001,E-02 4025,89E-5 -552001,E-02 3515,17E-5 -560001,E-02 3063,79E-5 -568001,E-02 2616,11E-5 -576001,E-02 2172,26E-5 -584001,E-02 1758,54E-5 -592001,E-02 1439,73E-5 -600001,E-02 1135,96E-5 -608001,E-02 8795,44E-6 -616001,E-02 6934,24E-6 -624001,E-02 5123,25E-6 -632001,E-02 3924,54E-6 -640001,E-02 2757,85E-6 -648001,E-02 2022,33E-6 -656001,E-02 1394,18E-6 -664001,E-02 9877,09E-7 -672001,E-02 6246,92E-7 -680001,E-02 4447,48E-7 -688001,E-02 2404,19E-7 -696001,E-02 2221,25E-7 -704001,E-02 1360,45E-7 -712001,E-02 8023,02E-8 -720001,E-02 5441,88E-8 -728001,E-02 4821,42E-8 -736001,E-02 1955,61E-8 -744001,E-02 1111,77E-8 -752001,E-02 1880,49E-9 -760001,E-02 2346,72E-9 -768001,E-02 1273,80E-9 -776001,E-02 0000,00E+00 -784001,E-02 0000,00E+00 -792001,E-02 0000,00E+00 -800001,E-02 0000,00E+00 +800100.E-04 3216.79E-03 +160010.E-03 3075.05E-03 +240010.E-03 3143.18E-03 +320010.E-03 3219.79E-03 +400010.E-03 3376.13E-03 +480010.E-03 3372.10E-03 +560010.E-03 3355.78E-03 +640010.E-03 3464.64E-03 +720010.E-03 3500.30E-03 +800010.E-03 3682.39E-03 +880010.E-03 3613.67E-03 +960010.E-03 3767.24E-03 +104001.E-02 3782.77E-03 +112001.E-02 3712.38E-03 +120001.E-02 3898.09E-03 +128001.E-02 4098.88E-03 +136001.E-02 4024.27E-03 +144001.E-02 4236.01E-03 +152001.E-02 4271.16E-03 +160001.E-02 4350.11E-03 +168001.E-02 4445.08E-03 +176001.E-02 4541.91E-03 +184001.E-02 4743.65E-03 +192001.E-02 4793.74E-03 +200001.E-02 4858.77E-03 +208001.E-02 5082.54E-03 +216001.E-02 5132.66E-03 +224001.E-02 5264.37E-03 +232001.E-02 5168.46E-03 +240001.E-02 5353.25E-03 +248001.E-02 5545.37E-03 +256001.E-02 5933.99E-03 +264001.E-02 6036.05E-03 +272001.E-02 6070.48E-03 +280001.E-02 6344.41E-03 +288001.E-02 6544.72E-03 +296001.E-02 6824.88E-03 +304001.E-02 6935.89E-03 +312001.E-02 6929.64E-03 +320001.E-02 7110.25E-03 +328001.E-02 7174.12E-03 +336001.E-02 7435.69E-03 +344001.E-02 7778.75E-03 +352001.E-02 8014.75E-03 +360001.E-02 8066.68E-03 +368001.E-02 8316.20E-03 +376001.E-02 8465.42E-03 +384001.E-02 8595.79E-03 +392001.E-02 8806.10E-03 +400001.E-02 8891.96E-03 +408001.E-02 8915.27E-03 +416001.E-02 9092.26E-03 +424001.E-02 8958.24E-03 +432001.E-02 8918.95E-03 +440001.E-02 8811.51E-03 +448001.E-02 8707.25E-03 +456001.E-02 8732.42E-03 +464001.E-02 8491.13E-03 +472001.E-02 8208.35E-03 +480001.E-02 7891.68E-03 +488001.E-02 7435.04E-03 +496001.E-02 7195.51E-03 +504001.E-02 6656.11E-03 +512001.E-02 6131.67E-03 +520001.E-02 5561.24E-03 +528001.E-02 5154.09E-03 +536001.E-02 4589.91E-03 +544001.E-02 4025.89E-03 +552001.E-02 3515.17E-03 +560001.E-02 3063.79E-03 +568001.E-02 2616.11E-03 +576001.E-02 2172.26E-03 +584001.E-02 1758.54E-03 +592001.E-02 1439.73E-03 +600001.E-02 1135.96E-03 +608001.E-02 8795.44E-04 +616001.E-02 6934.24E-04 +624001.E-02 5123.25E-04 +632001.E-02 3924.54E-04 +640001.E-02 2757.85E-04 +648001.E-02 2022.33E-04 +656001.E-02 1394.18E-04 +664001.E-02 9877.09E-05 +672001.E-02 6246.92E-05 +680001.E-02 4447.48E-05 +688001.E-02 2404.19E-05 +696001.E-02 2221.25E-05 +704001.E-02 1360.45E-05 +712001.E-02 8023.02E-06 +720001.E-02 5441.88E-06 +728001.E-02 4821.42E-06 +736001.E-02 1955.61E-06 +744001.E-02 1111.77E-06 +752001.E-02 1880.49E-07 +760001.E-02 2346.72E-07 +768001.E-02 1273.80E-07 +776001.E-02 0000.00E+00 +784001.E-02 0000.00E+00 +792001.E-02 0000.00E+00 +800001.E-02 0000.00E+00 -- 2.20.1 From 4240005b45c20c4969622da7b2b2b54e9da98952 Mon Sep 17 00:00:00 2001 From: hackbard Date: Thu, 22 Jul 2004 13:34:36 +0000 Subject: [PATCH 02/16] any profile --- nlsop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nlsop.c b/nlsop.c index 26ba461..21d9439 100644 --- a/nlsop.c +++ b/nlsop.c @@ -838,7 +838,7 @@ u32 get_reject_graph(info *my_info,d3_lattice *d3_l,char *file,u32 *graph) { free(flag); #ifdef DEBUG_INTERPOL_PROFILE - printf("debug: (interpolated c profile)\n"); + printf("debug: (interpolated profile)\n"); for(i=0;imax_z;i++) printf("%d %d\n",i,graph[i]); #endif -- 2.20.1 From f6959d7d28ab1289b61695d2da202ba1eec9071b Mon Sep 17 00:00:00 2001 From: hackbard Date: Thu, 22 Jul 2004 13:40:26 +0000 Subject: [PATCH 03/16] again fixed the tab! --- nel-profile.txt | 200 ++++++++++++++++++++++++------------------------ 1 file changed, 100 insertions(+), 100 deletions(-) diff --git a/nel-profile.txt b/nel-profile.txt index 6bb0385..3e3d356 100644 --- a/nel-profile.txt +++ b/nel-profile.txt @@ -1,100 +1,100 @@ -800100.E-04 3216.79E-03 -160010.E-03 3075.05E-03 -240010.E-03 3143.18E-03 -320010.E-03 3219.79E-03 -400010.E-03 3376.13E-03 -480010.E-03 3372.10E-03 -560010.E-03 3355.78E-03 -640010.E-03 3464.64E-03 -720010.E-03 3500.30E-03 -800010.E-03 3682.39E-03 -880010.E-03 3613.67E-03 -960010.E-03 3767.24E-03 -104001.E-02 3782.77E-03 -112001.E-02 3712.38E-03 -120001.E-02 3898.09E-03 -128001.E-02 4098.88E-03 -136001.E-02 4024.27E-03 -144001.E-02 4236.01E-03 -152001.E-02 4271.16E-03 -160001.E-02 4350.11E-03 -168001.E-02 4445.08E-03 -176001.E-02 4541.91E-03 -184001.E-02 4743.65E-03 -192001.E-02 4793.74E-03 -200001.E-02 4858.77E-03 -208001.E-02 5082.54E-03 -216001.E-02 5132.66E-03 -224001.E-02 5264.37E-03 -232001.E-02 5168.46E-03 -240001.E-02 5353.25E-03 -248001.E-02 5545.37E-03 -256001.E-02 5933.99E-03 -264001.E-02 6036.05E-03 -272001.E-02 6070.48E-03 -280001.E-02 6344.41E-03 -288001.E-02 6544.72E-03 -296001.E-02 6824.88E-03 -304001.E-02 6935.89E-03 -312001.E-02 6929.64E-03 -320001.E-02 7110.25E-03 -328001.E-02 7174.12E-03 -336001.E-02 7435.69E-03 -344001.E-02 7778.75E-03 -352001.E-02 8014.75E-03 -360001.E-02 8066.68E-03 -368001.E-02 8316.20E-03 -376001.E-02 8465.42E-03 -384001.E-02 8595.79E-03 -392001.E-02 8806.10E-03 -400001.E-02 8891.96E-03 -408001.E-02 8915.27E-03 -416001.E-02 9092.26E-03 -424001.E-02 8958.24E-03 -432001.E-02 8918.95E-03 -440001.E-02 8811.51E-03 -448001.E-02 8707.25E-03 -456001.E-02 8732.42E-03 -464001.E-02 8491.13E-03 -472001.E-02 8208.35E-03 -480001.E-02 7891.68E-03 -488001.E-02 7435.04E-03 -496001.E-02 7195.51E-03 -504001.E-02 6656.11E-03 -512001.E-02 6131.67E-03 -520001.E-02 5561.24E-03 -528001.E-02 5154.09E-03 -536001.E-02 4589.91E-03 -544001.E-02 4025.89E-03 -552001.E-02 3515.17E-03 -560001.E-02 3063.79E-03 -568001.E-02 2616.11E-03 -576001.E-02 2172.26E-03 -584001.E-02 1758.54E-03 -592001.E-02 1439.73E-03 -600001.E-02 1135.96E-03 -608001.E-02 8795.44E-04 -616001.E-02 6934.24E-04 -624001.E-02 5123.25E-04 -632001.E-02 3924.54E-04 -640001.E-02 2757.85E-04 -648001.E-02 2022.33E-04 -656001.E-02 1394.18E-04 -664001.E-02 9877.09E-05 -672001.E-02 6246.92E-05 -680001.E-02 4447.48E-05 -688001.E-02 2404.19E-05 -696001.E-02 2221.25E-05 -704001.E-02 1360.45E-05 -712001.E-02 8023.02E-06 -720001.E-02 5441.88E-06 -728001.E-02 4821.42E-06 -736001.E-02 1955.61E-06 -744001.E-02 1111.77E-06 -752001.E-02 1880.49E-07 -760001.E-02 2346.72E-07 -768001.E-02 1273.80E-07 -776001.E-02 0000.00E+00 -784001.E-02 0000.00E+00 -792001.E-02 0000.00E+00 -800001.E-02 0000.00E+00 +800100.E-04 3216.79E-03 +160010.E-03 3075.05E-03 +240010.E-03 3143.18E-03 +320010.E-03 3219.79E-03 +400010.E-03 3376.13E-03 +480010.E-03 3372.10E-03 +560010.E-03 3355.78E-03 +640010.E-03 3464.64E-03 +720010.E-03 3500.30E-03 +800010.E-03 3682.39E-03 +880010.E-03 3613.67E-03 +960010.E-03 3767.24E-03 +104001.E-02 3782.77E-03 +112001.E-02 3712.38E-03 +120001.E-02 3898.09E-03 +128001.E-02 4098.88E-03 +136001.E-02 4024.27E-03 +144001.E-02 4236.01E-03 +152001.E-02 4271.16E-03 +160001.E-02 4350.11E-03 +168001.E-02 4445.08E-03 +176001.E-02 4541.91E-03 +184001.E-02 4743.65E-03 +192001.E-02 4793.74E-03 +200001.E-02 4858.77E-03 +208001.E-02 5082.54E-03 +216001.E-02 5132.66E-03 +224001.E-02 5264.37E-03 +232001.E-02 5168.46E-03 +240001.E-02 5353.25E-03 +248001.E-02 5545.37E-03 +256001.E-02 5933.99E-03 +264001.E-02 6036.05E-03 +272001.E-02 6070.48E-03 +280001.E-02 6344.41E-03 +288001.E-02 6544.72E-03 +296001.E-02 6824.88E-03 +304001.E-02 6935.89E-03 +312001.E-02 6929.64E-03 +320001.E-02 7110.25E-03 +328001.E-02 7174.12E-03 +336001.E-02 7435.69E-03 +344001.E-02 7778.75E-03 +352001.E-02 8014.75E-03 +360001.E-02 8066.68E-03 +368001.E-02 8316.20E-03 +376001.E-02 8465.42E-03 +384001.E-02 8595.79E-03 +392001.E-02 8806.10E-03 +400001.E-02 8891.96E-03 +408001.E-02 8915.27E-03 +416001.E-02 9092.26E-03 +424001.E-02 8958.24E-03 +432001.E-02 8918.95E-03 +440001.E-02 8811.51E-03 +448001.E-02 8707.25E-03 +456001.E-02 8732.42E-03 +464001.E-02 8491.13E-03 +472001.E-02 8208.35E-03 +480001.E-02 7891.68E-03 +488001.E-02 7435.04E-03 +496001.E-02 7195.51E-03 +504001.E-02 6656.11E-03 +512001.E-02 6131.67E-03 +520001.E-02 5561.24E-03 +528001.E-02 5154.09E-03 +536001.E-02 4589.91E-03 +544001.E-02 4025.89E-03 +552001.E-02 3515.17E-03 +560001.E-02 3063.79E-03 +568001.E-02 2616.11E-03 +576001.E-02 2172.26E-03 +584001.E-02 1758.54E-03 +592001.E-02 1439.73E-03 +600001.E-02 1135.96E-03 +608001.E-02 8795.44E-04 +616001.E-02 6934.24E-04 +624001.E-02 5123.25E-04 +632001.E-02 3924.54E-04 +640001.E-02 2757.85E-04 +648001.E-02 2022.33E-04 +656001.E-02 1394.18E-04 +664001.E-02 9877.09E-05 +672001.E-02 6246.92E-05 +680001.E-02 4447.48E-05 +688001.E-02 2404.19E-05 +696001.E-02 2221.25E-05 +704001.E-02 1360.45E-05 +712001.E-02 8023.02E-06 +720001.E-02 5441.88E-06 +728001.E-02 4821.42E-06 +736001.E-02 1955.61E-06 +744001.E-02 1111.77E-06 +752001.E-02 1880.49E-07 +760001.E-02 2346.72E-07 +768001.E-02 1273.80E-07 +776001.E-02 0000.00E+00 +784001.E-02 0000.00E+00 +792001.E-02 0000.00E+00 +800001.E-02 0000.00E+00 -- 2.20.1 From 08843ccf3744390f19558bd30a0fa619a9f9010e Mon Sep 17 00:00:00 2001 From: hackbard Date: Thu, 22 Jul 2004 13:48:12 +0000 Subject: [PATCH 04/16] adapted cvsignore file --- .cvsignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.cvsignore b/.cvsignore index 259d33b..0d8585c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,7 @@ *data* +nlsop_* nlsop +nlsop.* conv_fg_tif +Makefile +nlsop-* -- 2.20.1 From 2c4d66c386d0f1a9ec4c8d82b924a8c0601978b6 Mon Sep 17 00:00:00 2001 From: hackbard Date: Thu, 22 Jul 2004 15:36:34 +0000 Subject: [PATCH 05/16] fixed get_reject method --- nlsop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nlsop.c b/nlsop.c index 21d9439..0cdecc4 100644 --- a/nlsop.c +++ b/nlsop.c @@ -817,7 +817,7 @@ u32 get_reject_graph(info *my_info,d3_lattice *d3_l,char *file,u32 *graph) { if(a>d3_l->max_z*CELL_LENGTH) k=0; else { - graph[(int)(a/CELL_LENGTH)]=(int)(URAND_MAX*b); + graph[(int)(a/CELL_LENGTH)]=(int)(URAND_MAX/100*b); flag[(int)(a/CELL_LENGTH)]=1; } } -- 2.20.1 From 155c5693f418004502a709b88fb0b1d4796d5508 Mon Sep 17 00:00:00 2001 From: hackbard Date: Fri, 23 Jul 2004 13:42:05 +0000 Subject: [PATCH 06/16] corrected saturation value --- nlsop.h | 2 +- runs.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nlsop.h b/nlsop.h index 80ce82b..b309cc4 100644 --- a/nlsop.h +++ b/nlsop.h @@ -56,7 +56,7 @@ typedef struct __info #define CPI 20 -#define C_SAT (6*6*6) +#define C_SAT (6*6*6*8) #define FFT_HEIGHT 64 diff --git a/runs.txt b/runs.txt index 4295e8c..c7de4b0 100644 --- a/runs.txt +++ b/runs.txt @@ -14,3 +14,5 @@ ./nlsop -S data_21_07_2004/default.save -n -i -Z ./nlsop -S data_21_07_2004/default_e1000000.save -e 1000000 -n -i -Z + +./nlsop -S data_22_07_2004/default.save -n -i -Z -- 2.20.1 From bb240931106929c84b40ebba0abfe44dc1bb0bb9 Mon Sep 17 00:00:00 2001 From: hackbard Date: Fri, 23 Jul 2004 13:42:54 +0000 Subject: [PATCH 07/16] new run --- runs.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runs.txt b/runs.txt index c7de4b0..239d00d 100644 --- a/runs.txt +++ b/runs.txt @@ -16,3 +16,5 @@ ./nlsop -S data_21_07_2004/default_e1000000.save -e 1000000 -n -i -Z ./nlsop -S data_22_07_2004/default.save -n -i -Z + +./nlsop -S data_23_07_2004/default.save -n -i -Z -- 2.20.1 From 2190f2faf2ada04bb004efff88141773f7bf92c8 Mon Sep 17 00:00:00 2001 From: hackbard Date: Sat, 24 Jul 2004 16:29:17 +0000 Subject: [PATCH 08/16] new run --- runs.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/runs.txt b/runs.txt index 239d00d..2e75020 100644 --- a/runs.txt +++ b/runs.txt @@ -18,3 +18,6 @@ ./nlsop -S data_22_07_2004/default.save -n -i -Z ./nlsop -S data_23_07_2004/default.save -n -i -Z + +./nlsop -S data_23_07_2004/default_F0.00005.save -F 0.00005 -n -i -Z + -- 2.20.1 From 1ef7284c9e6ba47a6e4a907bff427f741b951d9f Mon Sep 17 00:00:00 2001 From: hackbard Date: Wed, 28 Jul 2004 15:35:08 +0000 Subject: [PATCH 09/16] removed linear pprox of c distr and nel profile --- nlsop.c | 51 +++++++++++++++------------------------------------ nlsop.h | 8 +------- 2 files changed, 16 insertions(+), 43 deletions(-) diff --git a/nlsop.c b/nlsop.c index 0cdecc4..7603876 100644 --- a/nlsop.c +++ b/nlsop.c @@ -55,8 +55,6 @@ int usage(void) puts("-n \t\t no user interaction"); puts("-Z \t\t cryst -> amorph c diffusion in z direction"); puts("-i \t\t no cryst to cryst diffusion"); - printf("-a \t slope of nuclear energy loss (default %f)\n",A_EL); - printf("-b \t nuclear energy loss offset (default %f)\n",B_EL); printf("-x \t # x cells (default %d)\n",X); printf("-y \t # y cells (default %d)\n",Y); printf("-z \t # z cells (default %d)\n",Z); @@ -66,8 +64,6 @@ int usage(void) printf("-f \t pressure = * 1/distance^2 (default %f)\n",A_AP); printf("-p \t pressure offset (default %f)\n",B_AP); printf("-F \t proportionality constant between c conc and ability to get amorphous (default %f)\n",A_CP); - printf("-A \t slope of linear c distribution (default %f)\n",A_CD); - printf("-B \t linear c distribution offset (default %f)\n",B_CD); printf("-D \t diffusion rate from cryst to amorph cells (default %f)\n",DR_AC); printf("-c \t diffusion rate in cryst cells (default %f)\n",DR_CC); printf("-e \t do diffusion every steps (default %d)\n",DIFF_RATE); @@ -85,7 +81,7 @@ int usage(void) return 1; } -int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,info *my_info) +int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,info *my_info,u32 nel_z) { unsigned char *thiz; int *conc; @@ -95,7 +91,7 @@ int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,info *my_info) thiz=d3_l->status+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y; conc=d3_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y; - p=my_info->b_ap*URAND_MAX; + p=my_info->b_ap*URAND_MAX*nel_z; for(i=-(my_info->range);i<=my_info->range;i++) { for(j=-(my_info->range);j<=my_info->range;j++) @@ -768,7 +764,7 @@ int get_c_ratio(double *c_ratio,char *pfile,info *my_info,d3_lattice *d3_l) a=atof(p)/10; /* nm */ p=strtok(NULL," "); b=atof(p); - if(a>my_info->b_cd*CELL_LENGTH && a<(my_info->b_cd+d3_l->max_z)*CELL_LENGTH) d+=b; + if(a<=d3_l->max_z*CELL_LENGTH) d+=b; all+=b; } } @@ -868,8 +864,6 @@ int main(int argc,char **argv) char a_txt[MAX_TXT]; char s_txt[MAX_TXT]; char ap_txt[MAX_TXT]; - char el_txt[MAX_TXT]; - char cd_txt[MAX_TXT]; char r_txt[MAX_TXT]; char cp_txt[MAX_TXT]; char zdiff_txt[MAX_TXT]; @@ -892,6 +886,7 @@ int main(int argc,char **argv) u32 *c_profile; u32 *n_e_loss; u32 ne_max,ip_max; + u32 nel_z; d3_l.max_x=X; d3_l.max_y=Y; @@ -902,10 +897,6 @@ int main(int argc,char **argv) resave=RESAVE; my_info.z_diff=0; my_info.c_diff=1; - my_info.a_el=A_EL; - my_info.b_el=B_EL; - my_info.a_cd=A_CD; - my_info.b_cd=B_CD; my_info.a_ap=A_AP; my_info.b_ap=B_AP; my_info.a_cp=A_CP; @@ -943,12 +934,6 @@ int main(int argc,char **argv) case 'n': nowait=1; break; - case 'a': - my_info.a_el=atof(argv[++i]); - break; - case 'b': - my_info.b_el=atof(argv[++i]); - break; case 'x': d3_l.max_x=atoi(argv[++i]); break; @@ -983,12 +968,6 @@ int main(int argc,char **argv) case 'F': my_info.a_cp=atof(argv[++i]); break; - case 'A': - my_info.a_cd=atof(argv[++i]); - break; - case 'B': - my_info.b_cd=atof(argv[++i]); - break; case 'W': resave=atoi(argv[++i]); break; @@ -1097,8 +1076,6 @@ int main(int argc,char **argv) sprintf(dose_txt,"dose: %.2fe+17 C/cm²",my_info.steps*1.0/(d3_l.max_x*d3_l.max_y*CELL_LENGTH*CELL_LENGTH*1000)); sprintf(r_txt,"pressure range: %d",my_info.range); sprintf(ap_txt,"a_ap: %f b_ap: %f",my_info.a_ap,my_info.b_ap); - sprintf(el_txt,"a_el: %f b_el: %f",my_info.a_el,my_info.b_el); - sprintf(cd_txt,"a_cd: %f b_cd: %f",my_info.a_cd,my_info.b_cd); sprintf(cp_txt,"a_cp: %f",my_info.a_cp); sprintf(dr_ac_txt,"a/c diffusion rate: %f",my_info.dr_ac); if(my_info.c_diff!=0) sprintf(dr_cc_txt,"c/c diffusion rate: %f",my_info.dr_cc); @@ -1123,13 +1100,13 @@ int main(int argc,char **argv) arg_v[13]=zdiff_txt; arg_v[14]=r_txt; arg_v[15]=ap_txt; - arg_v[16]=el_txt; - arg_v[17]=cd_txt; - arg_v[18]=cp_txt; - arg_v[19]=dr_ac_txt; - arg_v[20]=dr_cc_txt; - arg_v[21]=hpi_txt; - arg_v[22]=csat_txt; + arg_v[16]=cp_txt; + arg_v[17]=dr_ac_txt; + arg_v[18]=dr_cc_txt; + arg_v[19]=hpi_txt; + arg_v[20]=csat_txt; + arg_v[21]=NULL; + arg_v[22]=NULL; arg_v[23]=NULL; arg_v[24]=NULL; arg_v[25]=NULL; @@ -1179,8 +1156,10 @@ int main(int argc,char **argv) { x_c=get_rand(d3_l.max_x); y_c=get_rand(d3_l.max_y); - z_c=get_rand_reject(d3_l.max_z,ne_max,n_e_loss); - process_cell(&d3_l,x_c,y_c,z_c,&my_info); + // z_c=get_rand_reject(d3_l.max_z,ne_max,n_e_loss); + z_c=get_rand(d3_l.max_z); + nel_z=(URAND_MAX*n_e_loss[z_c])/ne_max; + process_cell(&d3_l,x_c,y_c,z_c,&my_info,nel_z); } distrib_c(&d3_l,&my_info,i,c_ratio,ip_max,c_profile); #ifdef USE_DFB_API diff --git a/nlsop.h b/nlsop.h index b309cc4..3231cb7 100644 --- a/nlsop.h +++ b/nlsop.h @@ -13,15 +13,12 @@ typedef unsigned int u32; typedef struct __info { int cc,steps,range,diff_rate,cpi,c_sat; - double a_el,b_el,a_cd,b_cd,a_ap,b_ap,a_cp,dr_ac,dr_cc; + double a_ap,b_ap,a_cp,dr_ac,dr_cc; char z_diff,c_diff; } info; #define AMORPH 1 -#define A_EL 1. -#define B_EL .0 - #define X 64 #define Y 64 #define Z 233 @@ -31,9 +28,6 @@ typedef struct __info #define REFRESH 100000 #define RESAVE 10000000 -#define A_CD 1. -#define B_CD .0 - #define CC 0 #define DR_AC .5 -- 2.20.1 From 2cdf781ce8f65b1b008efd254325ae597b37d0d6 Mon Sep 17 00:00:00 2001 From: hackbard Date: Wed, 28 Jul 2004 17:17:08 +0000 Subject: [PATCH 10/16] care for neighbours while recrystalization --- nlsop.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nlsop.c b/nlsop.c index 7603876..ae62925 100644 --- a/nlsop.c +++ b/nlsop.c @@ -87,11 +87,11 @@ int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,info *my_info,u32 nel_z) int *conc; int i,j; int off; - double p; + double p,q; thiz=d3_l->status+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y; conc=d3_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y; - p=my_info->b_ap*URAND_MAX*nel_z; + p=my_info->b_ap*nel_z; for(i=-(my_info->range);i<=my_info->range;i++) { for(j=-(my_info->range);j<=my_info->range;j++) @@ -110,6 +110,16 @@ int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,info *my_info,u32 nel_z) } else { /* assume 1-p probability */ + /* also look for neighbours ! */ + q=(URAND_MAX-p)>0?URAND_MAX-p:0; + j=0; + j+=(*(d3_l->status+((x+d3_l->max_x+1)%d3_l->max_x)+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0; + j+=(*(d3_l->status+((x+d3_l->max_x-1)%d3_l->max_x)+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0; + j+=(*(d3_l->status+x+((y+1+d3_l->max_y)%d3_l->max_y)*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0; + j+=(*(d3_l->status+x+((y-1+d3_l->max_y)%d3_l->max_y)*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0; + j+=(*(d3_l->status+x+y*d3_l->max_x+((z+1+d3_l->max_z)%d3_l->max_z)*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0; + j+=(*(d3_l->status+x+y*d3_l->max_x+((z-1+d3_l->max_z)%d3_l->max_z)*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0; + p+=((q/6)*j); if(get_rand(URAND_MAX)>p) MAKE_CRYST(thiz); } -- 2.20.1 From eddb13dea76e12b6d38b73b5c41346e576f3a031 Mon Sep 17 00:00:00 2001 From: hackbard Date: Wed, 28 Jul 2004 17:20:34 +0000 Subject: [PATCH 11/16] new runs --- runs.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/runs.txt b/runs.txt index 2e75020..e265a00 100644 --- a/runs.txt +++ b/runs.txt @@ -21,3 +21,7 @@ ./nlsop -S data_23_07_2004/default_F0.00005.save -F 0.00005 -n -i -Z +./nlsop -S data_23_07_2004/default_F0.0001_f0.0001.save -F 0.0001 -f 0.0001 -n -i -Z + +./nlsop -S data_23_07_2004/default_e100000.save -e 100000 -n -i -Z + -- 2.20.1 From 9973c73196e8b4e9a91e5bdaf753cbc79030e594 Mon Sep 17 00:00:00 2001 From: hackbard Date: Wed, 28 Jul 2004 17:26:01 +0000 Subject: [PATCH 12/16] new run --- runs.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/runs.txt b/runs.txt index e265a00..1786c34 100644 --- a/runs.txt +++ b/runs.txt @@ -25,3 +25,4 @@ ./nlsop -S data_23_07_2004/default_e100000.save -e 100000 -n -i -Z +/nlsop -S data_28_07_2004/default_p0.01.save -p 0.01 -n -i -Z > /dev/null 2>&1 & -- 2.20.1 From cbdc384108e54988075a50fd0347905c85b33cc6 Mon Sep 17 00:00:00 2001 From: hackbard Date: Wed, 28 Jul 2004 17:30:11 +0000 Subject: [PATCH 13/16] new run --- runs.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runs.txt b/runs.txt index 1786c34..111c026 100644 --- a/runs.txt +++ b/runs.txt @@ -26,3 +26,5 @@ ./nlsop -S data_23_07_2004/default_e100000.save -e 100000 -n -i -Z /nlsop -S data_28_07_2004/default_p0.01.save -p 0.01 -n -i -Z > /dev/null 2>&1 & + +./nlsop -S data_28_07_2004/default.save -n -i -Z > /dev/null 2>&1 & -- 2.20.1 From 6ca951e0c48b5b9372a34d4ea5c9e9e9704336f0 Mon Sep 17 00:00:00 2001 From: hackbard Date: Thu, 29 Jul 2004 14:16:01 +0000 Subject: [PATCH 14/16] nel_z bugfix ; new runs --- nlsop.c | 3 ++- runs.txt | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nlsop.c b/nlsop.c index ae62925..deb65c9 100644 --- a/nlsop.c +++ b/nlsop.c @@ -119,6 +119,7 @@ int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,info *my_info,u32 nel_z) j+=(*(d3_l->status+x+((y-1+d3_l->max_y)%d3_l->max_y)*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0; j+=(*(d3_l->status+x+y*d3_l->max_x+((z+1+d3_l->max_z)%d3_l->max_z)*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0; j+=(*(d3_l->status+x+y*d3_l->max_x+((z-1+d3_l->max_z)%d3_l->max_z)*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0; + p+=((q/6)*j); if(get_rand(URAND_MAX)>p) MAKE_CRYST(thiz); } @@ -1168,7 +1169,7 @@ int main(int argc,char **argv) y_c=get_rand(d3_l.max_y); // z_c=get_rand_reject(d3_l.max_z,ne_max,n_e_loss); z_c=get_rand(d3_l.max_z); - nel_z=(URAND_MAX*n_e_loss[z_c])/ne_max; + nel_z=URAND_MAX*(1.0*n_e_loss[z_c]/ne_max); process_cell(&d3_l,x_c,y_c,z_c,&my_info,nel_z); } distrib_c(&d3_l,&my_info,i,c_ratio,ip_max,c_profile); diff --git a/runs.txt b/runs.txt index 111c026..570b5ee 100644 --- a/runs.txt +++ b/runs.txt @@ -25,6 +25,7 @@ ./nlsop -S data_23_07_2004/default_e100000.save -e 100000 -n -i -Z -/nlsop -S data_28_07_2004/default_p0.01.save -p 0.01 -n -i -Z > /dev/null 2>&1 & +./nlsop -S data_28_07_2004/default_p0.0001.save -p 0.0001 -n -i -Z > /dev/null 2>&1 & + +./nlsop -S data_28_07_2004/default_p0.001.save -p 0.001 -n -i -Z > /dev/null 2>&1 & -./nlsop -S data_28_07_2004/default.save -n -i -Z > /dev/null 2>&1 & -- 2.20.1 From 928f0b918f532094df47e99093bb4fabc944eb8a Mon Sep 17 00:00:00 2001 From: hackbard Date: Fri, 30 Jul 2004 10:54:57 +0000 Subject: [PATCH 15/16] new runs --- runs.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/runs.txt b/runs.txt index 570b5ee..428fd25 100644 --- a/runs.txt +++ b/runs.txt @@ -29,3 +29,8 @@ ./nlsop -S data_28_07_2004/default_p0.001.save -p 0.001 -n -i -Z > /dev/null 2>&1 & +./nlsop -S data_28_07_2004/default_p0.01.save -p 0.01 -n -i -Z > /dev/null 2>&1 & + +./nlsop -S data_28_07_2004/default_p0.1.save -p 0.1 -n -i -Z > /dev/null 2>&1 & + + -- 2.20.1 From def36f407bde07845af3a32c960bca754a6e8d20 Mon Sep 17 00:00:00 2001 From: hackbard Date: Fri, 30 Jul 2004 11:13:35 +0000 Subject: [PATCH 16/16] new run --- runs.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/runs.txt b/runs.txt index 428fd25..67eb1d7 100644 --- a/runs.txt +++ b/runs.txt @@ -33,4 +33,5 @@ ./nlsop -S data_28_07_2004/default_p0.1.save -p 0.1 -n -i -Z > /dev/null 2>&1 & +./nlsop -S data_28_07_2004/default_p1.save -p 1 -n -i -Z -- 2.20.1