Changeset 70 for trunk/src/sinobad.d
- Timestamp:
- 08/30/11 16:51:09 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/sinobad.d
- Property svn:mergeinfo changed
/branches/branche-mb/src/sinobad.d merged: 62-63,67-69
r64 r70 1 //#define FILTER 1 //defval K_NEU 2 //#define FZIMP 3 #define FILTER 4 #define FILZNOL 5 //#define FILLNOZ 2 6 //#define SOLSORYAO 3 7 //#define OPTIMORDER … … 18 22 defval TU 2 | start time step 19 23 #ifdef FILTER 20 defval OFTL 4021 defval OFTZ 4 022 defval OFT 8024 defval OFTL 0 25 defval OFTZ 4 26 defval OFT 4 23 27 #endif 24 28 #ifndef FILTER … … 26 30 #endif 27 31 //#exec disp_valdef 28 #ifdef FILTER 32 #ifdef FZIMP //Filtre Z implicit 33 defval K_FZIMP 34 #endif 35 #ifdef FILTER //Filtre 29 36 defval K_FILTER 37 #endif 38 #ifdef FILZNOL //uniquement Filtre Z 39 defval K_FILZNOL 40 #endif 41 #ifdef FILLNOZ //uniquement Filtre L 42 defval K_FILLNOZ 30 43 #endif 31 44 #ifdef SOLSORYAO … … 53 66 #ifdef FILTER 54 67 traj Tcstf M 0 1 68 #ifndef FILZNOL 55 69 traj Tlfil M 1 0 1 OFTL 70 #endif 71 #ifndef FILLNOZ 56 72 traj Tzfil M 1 OFTL 1 OFTZ 73 #endif 57 74 #endif 58 75 traj Tcst M 0 OFT 1 1 … … 62 79 #ifdef FILTER 63 80 space S3df M NX NY NZ Tcstf 81 #ifndef FILZNOL 64 82 space S3dtlf M NX NY NZ Tlfil 83 #endif 84 #ifndef FILLNOZ 65 85 space S3dtzf M NX NY NZ Tzfil 66 86 #endif 87 #endif 67 88 68 89 space S0d M 1 Tcst 69 //#space S3d M NX NY NZ Tcst70 90 space S3d M NX NY NZ Tcst 71 91 space S3dt M NX NY NZ Tsbd … … 96 116 #ifdef FILTER 97 117 modul nu space S3df noward output 1 target 98 modul dta_lfil space S3dtlf input 6 output 1 tempo 99 modul ztuv_lfil space S3dtlf input 3 output 2 tempo 100 modul dta_zfil space S3dtzf input 4 output 1 tempo 101 modul zwy_zfil space S3dtzf input 2 output 1 tempo 118 #ifndef FILZNOL 119 modul dta_lfexp space S3dtlf input 6 output 1 tempo 120 #endif 121 122 #ifndef FILLNOZ 123 #ifdef FZIMP 124 modul dta_zfimp_t space S3dtzf input 2 output 1 tempo 125 modul dta_zfimp space S3dtzf input 3 output 1 tempo 126 #endif 127 #ifndef FZIMP 128 modul dta_zfexp space S3dtzf input 4 output 1 tempo 129 #endif 130 131 #endif 132 102 133 modul ta_c space S3d input 1 output 1 103 134 #endif … … 285 316 286 317 #ifdef FILTER 287 //#---------->dta_lfil 288 ctin dta_lfil 1 from nu 1 i j k 289 ctin dta_lfil 2 from dta_lfil 1 i j k-1 t-1 290 ctin dta_lfil 3 from ztuv_lfil 1 i-1 j k t 291 ctin dta_lfil 4 from ztuv_lfil 1 i j k t 292 ctin dta_lfil 5 from ztuv_lfil 2 i j-1 k t 293 ctin dta_lfil 6 from ztuv_lfil 2 i j k t 294 295 //#---------->ztuv_lfil 296 ctin ztuv_lfil 1 from dta_lfil 1 i+1 j k t-1 297 ctin ztuv_lfil 2 from dta_lfil 1 i j k t-1 298 ctin ztuv_lfil 3 from dta_lfil 1 i j+1 k t-1 318 319 #ifndef FILZNOL 320 //#---------->dta_lfexp 321 ctin dta_lfexp 1 from nu 1 i j k 322 ctin dta_lfexp 2 from dta_lfexp 1 i j k t-1 323 ctin dta_lfexp 3 from dta_lfexp 1 i-1 j k t-1 324 ctin dta_lfexp 4 from dta_lfexp 1 i+1 j k t-1 325 ctin dta_lfexp 5 from dta_lfexp 1 i j-1 k t-1 326 ctin dta_lfexp 6 from dta_lfexp 1 i j+1 k t-1 327 #endif 299 328 300 329 //#---------->dta_zfil 301 ctin dta_zfil 1 from dta_lfil 1 i j k t 302 ctin dta_zfil 2 from dta_zfil 1 i j k t-1 303 ctin dta_zfil 3 from zwy_zfil 1 i j k+1 t 304 ctin dta_zfil 4 from zwy_zfil 1 i j k t 305 306 //#---------->zwy_zfil 307 ctin zwy_zfil 1 from dta_zfil 1 i j k-1 t-1 308 ctin zwy_zfil 2 from dta_zfil 1 i j k t-1 330 #ifndef FILLNOZ 331 332 #ifndef FILZNOL 333 #ifndef FZIMP 334 ctin dta_zfexp 1 from dta_lfexp 1 i j k t 335 #endif 336 #ifdef FZIMP 337 ctin dta_zfimp 1 from dta_lfexp 1 i j k t 338 #endif 339 #endif 340 341 #ifdef FILZNOL 342 #ifndef FZIMP 343 ctin dta_zfexp 1 from nu 1 i j k 344 #endif 345 #ifdef FZIMP 346 ctin dta_zfimp 1 from nu 1 i j k 347 #endif 348 #endif 349 350 #ifdef FZIMP 351 ctin dta_zfimp 2 from dta_zfimp 1 i j k+1 t 352 ctin dta_zfimp 3 from dta_zfimp_t 1 i j k t 353 354 ctin dta_zfimp_t 1 from dta_zfimp_t 1 i j k-1 t 355 ctin dta_zfimp_t 2 from dta_zfimp 1 i j k t-1 356 #endif 357 #ifndef FZIMP 358 ctin dta_zfexp 2 from dta_zfexp 1 i j k-1 t-1 359 ctin dta_zfexp 3 from dta_zfexp 1 i j k t-1 360 ctin dta_zfexp 4 from dta_zfexp 1 i j k+1 t-1 361 #endif 309 362 310 363 //#---------->ta_c 311 ctin ta_c 1 from dta_zfil 1 i j k-1 t 312 #endif 364 #ifdef FZIMP 365 ctin ta_c 1 from dta_zfimp 1 i j k t 366 #endif 367 #ifndef FZIMP 368 ctin ta_c 1 from dta_zfexp 1 i j k t 369 #endif 370 371 #endif 372 373 #ifdef FILLNOZ 374 ctin ta_c 1 from dta_lfexp 1 i j k t 375 #endif 376 377 378 #endif 379 313 380 //#ctin ta_c 1..NPCA from pca_ta 1..NPCA 1 314 381 315 // exec disp_ct_in316 exec disp_modul382 //#exec disp_ct_in 383 //exec disp_modul 317 384 318 385 … … 878 945 #ifdef FILTER 879 946 // calcul du filtre 880 947 #ifndef FILZNOL 881 948 order modinspace S3dtlf 882 order YA3 883 order YA2 YA1 884 ztuv_lfil 885 forder 886 order YA2 YA1 887 dta_lfil 888 forder 889 forder 890 forder 891 949 order YA3 YA2 YA1 950 dta_lfexp 951 forder 952 forder 953 #endif 954 #ifndef FILLNOZ 892 955 order modinspace S3dtzf 956 #ifdef FZIMP 957 order YA2 YA1 958 order YA3 959 dta_zfimp_t 960 forder 961 order YB3 962 dta_zfimp 963 forder 964 forder 965 #endif 966 #ifndef FZIMP 893 967 order YA3 YA2 YA1 894 zwy_zfil968 dta_zfexp 895 969 forder 896 order YA3 YA2 YA1 897 dta_zfil 898 forder 899 forder 970 #endif 971 forder 972 #endif 973 900 974 order modinspace S3d 901 975 order YA3 YA2 YA1 … … 1104 1178 #ifdef FILTER 1105 1179 1180 #ifndef FILZNOL 1106 1181 order spaceintraj Tlfil 1107 1182 S3dtlf 1108 1183 forder 1184 #endif 1185 #ifndef FILLNOZ 1109 1186 order spaceintraj Tzfil 1110 1187 S3dtzf 1111 1188 forder 1189 #endif 1190 1112 1191 order spaceintraj Tcst 1113 1192 S3d … … 1133 1212 #ifdef FILTER 1134 1213 insert_fct arg load_eb 1135 #endif 1136 1214 insert_fct arg init_nu 1215 insert_fct arg xset_fdt_fco 1216 #endif 1137 1217 insert_fct arg xwriteout 1138 1218 insert_fct arg xwritegrad - Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.