Changeset 61
- Timestamp:
- 07/26/11 11:06:10 (13 years ago)
- Location:
- trunk/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/cost.dat
r55 r61 1 1 0.0000000000000000e+00 2 0.0000000000000000e+003 0.0000000000000000e+004 2.9733593674719423e+035 5.4561410776679122e+026 2.4475352252509134e+027 2.6358555318068841e+028 2.1527711430855038e+029 2.0204126463990215e+0210 2.1416662011590833e+0211 2.0207208737645496e+0212 2.0211049147089304e+0213 2.0235703823123197e+0214 2.0019969413511828e+0215 2.2286623273509434e+0216 1.9878349444274735e+0217 2.0070292696001030e+0218 2.0014258993979595e+0219 1.9972801663599338e+0220 1.9293537153893590e+0221 2.0814944891652880e+0222 1.8213155756443817e+0223 1.7950672225933866e+0224 1.8080233872884580e+0225 1.7876027971923725e+0226 2.0259497236690703e+0227 1.7881103040469617e+0228 1.7886996041817454e+0229 1.7907554124113310e+0230 1.8045371934564810e+0231 1.7569372841627006e+0232 1.9113648527038990e+0233 1.7516955251891332e+0234 1.9550146370923514e+0235 1.7455342251319595e+0236 2.1077987977826763e+0237 1.7473743190883036e+0238 1.7476659805882767e+0239 1.7491607437730161e+0240 1.7534570209262407e+0241 1.7146968928574532e+0242 1.7918664114219453e+0243 1.7311809756377912e+0244 1.7320818032615955e+0245 1.7322190117805096e+0246 1.7328346667692077e+0247 1.7390681350015083e+0248 1.7091883954920155e+0249 1.7074257389516592e+0250 1.7423942813610816e+0251 1.7069031205380722e+0252 1.7425456057653693e+0253 1.7425631257707835e+0254 1.7425753342598696e+02 -
trunk/src/gcx2.h
-
Property
svn:mergeinfo
set to
False
/branches/branche-mb/src/gcx2.h merged eligible
r54 r61 17 17 } 18 18 else 19 #if ndef K_SOLSORYAO20 YS1=gcx(Yi,Yj);19 #ifdef K_SOLSORYAO 20 YS1= x1; 21 21 #else 22 YS1= x1;22 YS1=gcx(Yi,Yj); 23 23 #endif 24 24 // … … 30 30 backward (YREAL x) 31 31 { 32 #ifdef K_SOLSORYAO 32 33 if(Yt==TU){ 33 34 YJ1I1=0; … … 38 39 YJ1I1=1; 39 40 // 41 #endif 40 42 } 41 43 -
Property
svn:mergeinfo
set to
False
-
trunk/src/sinobad.d
-
Property
svn:mergeinfo
set to
False
/branches/branche-mb/src/sinobad.d merged eligible
r54 r61 1 //#define FILTER 1 2 //#define SOLSORYAO 2 3 //#define OPTIMORDER … … 5 6 //#Mohamed Berrada 26/02/2009 6 7 //#modification (#define) Julien Brajard 06/2011 8 //#modification (filtre) Mohamed Berrada 19/07/2011 7 9 //#============================================================================== 8 10 //#DEFVAL ---------------------------------------------DEFVAL … … 15 17 defval TA 50 |__DATE__ | number of time steps 16 18 defval TU 2 | start time step 19 #ifdef FILTER 20 defval OFTL 40 21 defval OFTZ 40 22 defval OFT 80 23 #endif 24 #ifndef FILTER 25 defval OFT 0 26 #endif 17 27 //#exec disp_valdef 28 #ifdef FILTER 29 defval K_FILTER 30 #endif 18 31 #ifdef SOLSORYAO 19 32 defval K_SOLSORYAO … … 30 43 option O_M1QN3 | M2QN1 31 44 //#option O_VARINCR 32 //#option O_GRADTEST45 option O_GRADTEST 33 46 option O_DBG_NANF 34 47 //#option O_DBG_TING 35 48 option O_EXTOBJ "../object/ncutil.o" 36 49 option O_REAL double 37 option o_parallel 1650 option o_parallel 38 51 39 52 //#TRAJECTOIRES (DIM) -----------------------------------TRAJ 40 traj Tcst M 0 1 41 traj Tsbd M TU 0 1 TA 53 #ifdef FILTER 54 traj Tcstf M 0 1 55 traj Tlfil M 1 0 1 OFTL 56 traj Tzfil M 1 OFTL 1 OFTZ 57 #endif 58 traj Tcst M 0 OFT 1 1 59 traj Tsbd M TU OFT 1 TA 42 60 exec disp_traj 43 61 62 #ifdef FILTER 63 space S3df M NX NY NZ Tcstf 64 space S3dtlf M NX NY NZ Tlfil 65 space S3dtzf M NX NY NZ Tzfil 66 #endif 44 67 45 68 space S0d M 1 Tcst … … 62 85 modul sshn_c space S3d inter YA1 YA2 noward output 1 |target 63 86 87 //#modul ta_c space S3d input array NPCA output 1 88 #ifndef FILTER 64 89 modul ta_c space S3d noward output 1 target 65 66 //#modul ta_c space S3d input array NPCA output 1 90 #endif 67 91 68 92 modul sa_c space S3d noward output 1 |target 69 93 modul ua_c space S3d noward output 1 |target 70 94 modul va_c space S3d noward output 1 |target 95 96 #ifdef FILTER 97 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 102 modul ta_c space S3d input 1 output 1 103 #endif 71 104 72 105 //#------------- … … 206 239 modul gcx_dynspg_flt space S3dt inter YA1 YA2 input 2 output 1 tempo 207 240 #ifndef SOLSORYAO 208 modul solsor_dynspg_flt space S3dt inter YA1 YA2 input array 19 output 1 tempo 241 modul solsor_dynspg_flt space S3dt inter YA1 YA2 input array 19 output 1 tempo hidjac 242 modul gcx2 space S3dt inter YA1 YA2 input 1 output 1 tempo hidjac 209 243 #endif 210 244 … … 214 248 modul solsor_flag space Ssolsor input 4 output 2 tempo 215 249 #define S3dt S3dt_b 216 #endif217 218 219 250 modul gcx2 space S3dt inter YA1 YA2 input 1 output 1 tempo 251 #endif 252 253 254 220 255 modul spguv_dynspg_flt space S3dt inter YA1 YA2 input 3 output 2 tempo 221 256 modul ua space S3dt input 3 output 1 tempo … … 246 281 #endif 247 282 248 //exec disp_modul283 exec disp_modul 249 284 //############################################################################################# 250 285 286 #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 299 300 //#---------->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 309 310 //#---------->ta_c 311 ctin ta_c 1 from dta_zfil 1 i j k-1 t 312 #endif 251 313 //#ctin ta_c 1..NPCA from pca_ta 1..NPCA 1 314 315 //exec disp_ct_in 316 exec disp_modul 317 252 318 253 319 //#---------->sbcgyre … … 674 740 ctin wa 1 from wa 1 i j k+1 t 675 741 ctin wa 2 from hdivn 1 i j k t 676 677 742 //#----------> 678 743 … … 811 876 #endif 812 877 878 #ifdef FILTER 879 // calcul du filtre 880 881 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 892 order modinspace S3dtzf 893 order YA3 YA2 YA1 894 zwy_zfil 895 forder 896 order YA3 YA2 YA1 897 dta_zfil 898 forder 899 forder 900 order modinspace S3d 901 order YA3 YA2 YA1 902 ta_c 903 forder 904 forder 905 906 #endif 907 813 908 #ifndef OPTIMORDER 814 909 815 910 order modinspace S3dt 816 911 //#---------->sbcgyre … … 1007 1102 #endif 1008 1103 1104 #ifdef FILTER 1105 1106 order spaceintraj Tlfil 1107 S3dtlf 1108 forder 1109 order spaceintraj Tzfil 1110 S3dtzf 1111 forder 1112 order spaceintraj Tcst 1113 S3d 1114 forder 1115 1116 #endif 1117 1009 1118 #ifndef SOLSORYAO 1119 1010 1120 order spaceintraj Tsbd 1011 1121 S3dt … … 1021 1131 insert_fct arg xchangesavemode 1022 1132 1133 insert_fct arg load_eb 1134 1023 1135 insert_fct arg xwriteout 1024 1136 insert_fct arg xwritegrad -
Property
svn:mergeinfo
set to
False
-
trunk/src/sinobad.h
r55 r61 164 164 void forward_before (int ctrp) 165 165 { // permet d'intervenir si besoin avant le forward 166 kt=Yt-TU; //oceanic time step 167 166 168 if(Yt==TU+1 && neuler==0) 167 169 r2dt=rdt; … … 172 174 void forward_after (int ctrp) 173 175 { // permet d'intervenir si besoin aprÚs le forward 176 printf("neuler=%d\n",neuler); 174 177 } 175 178 //_____________________________________________________________________________
Note: See TracChangeset
for help on using the changeset viewer.