Changeset 53
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/Makefile
r52 r53 1 #GENOPT=-DOPTIMORDER -DSOLSORYAO -E 2 #GENOPT= -E 1 3 GENOPT=-DOPTIMORDER -E 2 #GENOPT= -E3 4 YAOPT= -p +O3 -x sinobad 4 5 … … 14 15 15 16 clean: 16 rm essai.c17 rm -f essai.c -
trunk/src/cost.dat
r52 r53 2 2 0.0000000000000000e+00 3 3 0.0000000000000000e+00 4 2.9733593674719423e+03 5 5.4561410776679122e+02 6 2.4475352252509134e+02 7 2.6358555318068841e+02 8 2.1527711430855038e+02 9 2.0204126463990215e+02 10 2.1416662011590833e+02 11 2.0207208737645496e+02 12 2.0211049147089304e+02 13 2.0235703823123197e+02 14 2.0019969413511828e+02 15 2.2286623273509434e+02 16 1.9878349444274735e+02 17 2.0070292696001030e+02 18 2.0014258993979595e+02 19 1.9972801663599338e+02 20 1.9293537153893590e+02 21 2.0814944891652880e+02 22 1.8213155756443817e+02 23 1.7950672225933866e+02 24 1.8080233872884580e+02 25 1.7876027971923725e+02 26 2.0259497236690703e+02 27 1.7881103040469617e+02 28 1.7886996041817454e+02 29 1.7907554124113310e+02 30 1.8045371934564810e+02 31 1.7569372841627006e+02 32 1.9113648527038990e+02 33 1.7516955251891332e+02 34 1.9550146370923514e+02 35 1.7455342251319595e+02 36 2.1077987977826763e+02 37 1.7473743190883036e+02 38 1.7476659805882767e+02 39 1.7491607437730161e+02 40 1.7534570209262407e+02 41 1.7146968928574532e+02 42 1.7918664114219453e+02 43 1.7311809756377912e+02 44 1.7320818032615955e+02 45 1.7322190117805096e+02 46 1.7328346667692077e+02 47 1.7390681350015083e+02 48 1.7091883954920155e+02 49 1.7074257389516592e+02 50 1.7423942813610816e+02 51 1.7069031205380722e+02 52 1.7425456057653693e+02 53 1.7425631257707835e+02 54 1.7425753342598696e+02 -
trunk/src/gcx2.h
r45 r53 17 17 } 18 18 else 19 // YS1=gcx(Yi,Yj); 19 #ifdef SOLSOR 20 YS1=gcx(Yi,Yj); 21 #else 20 22 YS1= x1; 23 #endif 21 24 // 22 25 } -
trunk/src/sinobad.d
r52 r53 1 #define SOLSORYAO1 //#define SOLSORYAO 2 2 //#define OPTIMORDER 3 3 //#============================================================================== 4 //# fichier de DESCRIPTION sinobad 1.d4 //# fichier de DESCRIPTION sinobad.d 5 5 //#Mohamed Berrada 26/02/2009 6 //#modification (#define) Julien Brajard 06/2011 6 7 //#============================================================================== 7 8 //#DEFVAL ---------------------------------------------DEFVAL … … 15 16 defval TU 2 | start time step 16 17 //#exec disp_valdef 18 #ifndef SOLSORYAO 19 defval SOLSOR 20 #endif 17 21 18 22 //#HAT_NAME -----------------------------------------HAT_NAME … … 40 44 space S3d M NX NY NZ Tcst 41 45 space S3dt M NX NY NZ Tsbd 46 #ifdef SOLSORYAO 42 47 space S3dt_b M NX NY NZ Tsbd 43 48 space Ssolsor M NX NY NMAX Tsbd 49 #endif 44 50 45 51 exec disp_space … … 196 202 modul gcb_dynspg_flt space S3dt inter YA1 YA2 input 4 output 1 tempo 197 203 modul gcx_dynspg_flt space S3dt inter YA1 YA2 input 2 output 1 tempo 198 //modul solsor_dynspg_flt space S3dt inter YA1 YA2 input array 19 output 1 tempo 204 #ifndef SOLSORYAO 205 modul solsor_dynspg_flt space S3dt inter YA1 YA2 input array 19 output 1 tempo 206 #endif 207 208 #ifdef SOLSORYAO 199 209 modul solsor_gx1_x_r space Ssolsor input 8 output 2 tempo 200 210 modul solsor_gx2_x_r space Ssolsor input 9 output 2 tempo 201 211 modul solsor_flag space Ssolsor input 4 output 2 tempo 202 modul gcx2 space S3dt_b inter YA1 YA2 input 1 output 1 tempo 203 modul spguv_dynspg_flt space S3dt_b inter YA1 YA2 input 3 output 2 tempo 204 modul ua space S3dt_b input 3 output 1 tempo 205 modul va space S3dt_b input 3 output 1 tempo 206 modul sshn space S3dt_b inter YA1 YA2 input 4 output 1 tempo 207 modul sshb space S3dt_b inter YA1 YA2 input 4 output 1 tempo cout 212 #define S3dt S3dt_b 213 #endif 214 215 216 modul gcx2 space S3dt inter YA1 YA2 input 1 output 1 tempo 217 modul spguv_dynspg_flt space S3dt inter YA1 YA2 input 3 output 2 tempo 218 modul ua space S3dt input 3 output 1 tempo 219 modul va space S3dt input 3 output 1 tempo 220 modul sshn space S3dt inter YA1 YA2 input 4 output 1 tempo 221 modul sshb space S3dt inter YA1 YA2 input 4 output 1 tempo cout 208 222 //##END_dyn_spg 209 223 210 224 //##START_dyn_nxt 211 225 //#nxt : filtre d'asselin 212 modul ub space S3dt _binput 4 output 1 tempo cout213 modul vb space S3dt _binput 4 output 1 tempo cout226 modul ub space S3dt input 4 output 1 tempo cout 227 modul vb space S3dt input 4 output 1 tempo cout 214 228 //##END_dyn_nxt 215 229 216 230 //##START_divcur 217 231 //#calcul de div et de rotationnel 218 modul hdivn space S3dt _binput 4 output 1 tempo219 modul rotn space S3dt _binput 4 output 1 tempo232 modul hdivn space S3dt input 4 output 1 tempo 233 modul rotn space S3dt input 4 output 1 tempo 220 234 //##END_divcur 221 235 222 236 //##START_wzv 223 237 //#vitesse vertical 224 modul wa space S3dt _binput 2 output 1 tempo238 modul wa space S3dt input 2 output 1 tempo 225 239 //##END_wzv 240 241 #ifdef SOLSORYAO 242 #undef S3dt 243 #endif 244 226 245 //exec disp_modul 227 246 //############################################################################################# … … 590 609 ctin sshb 3 from sshn 1 i j t 591 610 ctin sshb 4 from sshn_c 1 i j 611 612 #ifndef SOLSORYAO 592 613 //############## Ajout de ctin "virtuels" ############## 593 //#ctin solsor_dynspg_flt 1..9 from gcx_dynspg_flt 1 i%~1 j%~1 t 594 //#ctin solsor_dynspg_flt 10..18 from gcb_dynspg_flt 1 i%~1 j%~1 t 595 //#ctin solsor_dynspg_flt 19 from solsor_dynspg_flt 1 i-1 j-1 t 596 //#ctin gcx2 1 from solsor_dynspg_flt 1 i j t 597 614 ctin solsor_dynspg_flt 1..9 from gcx_dynspg_flt 1 i%~1 j%~1 t 615 ctin solsor_dynspg_flt 10..18 from gcb_dynspg_flt 1 i%~1 j%~1 t 616 ctin solsor_dynspg_flt 19 from solsor_dynspg_flt 1 i-1 j-1 t 617 ctin gcx2 1 from solsor_dynspg_flt 1 i j t 618 #endif 619 620 #ifdef SOLSORYAO 598 621 ctin solsor_flag 1 from solsor_gx2_x_r 2 i j k t 599 622 ctin solsor_flag 2 from solsor_flag 2 NX NY k-1 t … … 621 644 622 645 ctin gcx2 1 from solsor_gx2_x_r 1 i j NMAX t 646 #endif 647 623 648 //#---------->dyn_nxt 624 649 ctin ub 1 from ub 1 i j k t-1 … … 650 675 651 676 #ifdef OPTIMORDER 652 653 #ifdef SOLSORYAO654 677 655 678 //#---------->sbcgyre + bn2_rn2 + zdf + trasbc + traqsr + traadv + … … 725 748 sbcgyre_wndm 726 749 gcb_dynspg_flt 750 727 751 forder 752 #ifdef SOLSORYAO 728 753 forder 729 754 #endif 755 756 #ifndef SOLSORYAO 757 order YA1 YA2 758 solsor_dynspg_flt 759 forder 760 #endif 761 762 #ifdef SOLSORYAO 730 763 order modinspace Ssolsor 731 764 order YA3 … … 743 776 forder 744 777 forder 745 746 747 778 #endif 779 780 #ifdef SOLSORYAO 748 781 order modinspace S3dt_b 782 #endif 749 783 order YA2 YA1 750 784 gcx2 … … 757 791 ub vb 758 792 forder 759 forder793 forder 760 794 761 795 // #---------->divcur … … 766 800 order YA2 YA1 YB3 767 801 wa 768 forder 802 803 forder 804 805 769 806 forder 770 807 771 808 #endif 772 #endif773 809 774 810 #ifndef OPTIMORDER 775 #ifdef SOLSORYAO776 811 777 812 order modinspace S3dt … … 903 938 gcb_dynspg_flt gcx_dynspg_flt 904 939 forder 940 941 #ifdef SOLSORYAO 905 942 forder 906 943 #endif 944 945 #ifndef SOLSORYAO 946 order YA1 YA2 947 solsor_dynspg_flt 948 forder 949 #endif 950 951 #ifdef SOLSORYAO 907 952 order modinspace Ssolsor 908 953 order YA3 … … 920 965 forder 921 966 forder 922 967 #endif 968 969 #ifdef SOLSORYAO 923 970 order modinspace S3dt_b 971 #endif SOLSORYAO 972 924 973 order YA2 YA1 925 974 gcx2 … … 947 996 #endif 948 997 949 #endif 998 950 999 951 1000 #ifdef SOLSORYAO 952 1001 order spaceintraj Tsbd 953 1002 S3dt Ssolsor S3dt_b 1003 forder 1004 #endif 1005 1006 #ifndef SOLSORYAO 1007 order spaceintraj Tsbd 1008 S3dt 954 1009 forder 955 1010 #endif -
trunk/src/solsor_dynspg_flt.h
r46 r53 9 9 forward () 10 10 { 11 FILE * fid;11 // FILE * fid; 12 12 13 13 if(Yt==TU) … … 24 24 //initialisation de gcx 25 25 26 /*test solsor */26 /*test solsor 27 27 if (Yt==TU+1) { 28 28 29 29 fid=fopen("../data_out/test_solsor_mb","w"); 30 } 30 }*/ 31 31 32 32 … … 36 36 gcx(ji,jj)=YS_gcx_dynspg_flt(0,ji,jj,Yt); 37 37 38 /*test solsor */38 /*test solsor 39 39 if (Yt==TU+1) { 40 40 41 41 fprintf(fid,"%d\t%d\t%d\t%e\t%e\n",0,jj,ji,gcx(ji,jj),gcr(ji,jj)); 42 }42 }*/ 43 43 44 44 … … 80 80 81 81 82 /*test solsor */82 /*test solsor 83 83 if (Yt==TU+1) { 84 84 85 85 fprintf(fid,"%d\t%d\t%d\t%e\t%e\n",jn,jj,ji,gcx(ji,jj),gcr(ji,jj)); 86 86 } 87 87 */ 88 88 89 89 } … … 109 109 gcx(ji,jj) = sor * ztmp + (1.-sor) * gcx(ji,jj); 110 110 111 /*test solsor */111 /*test solsor 112 112 if (Yt==TU+1) { 113 113 114 114 fprintf(fid,"%d\t%d\t%d\t%e\t%e\n",jn,jj,ji,gcx(ji,jj),gcr(ji,jj)); 115 }115 }*/ 116 116 } 117 117 } … … 130 130 niter = jn; tniter[Yt]=jn; 131 131 ncut = 999; 132 printf("FOR=======tniter(%d)=%d\n",Yt,tniter[Yt]);132 // printf("FOR=======tniter(%d)=%d\n",Yt,tniter[Yt]); 133 133 } 134 134 } … … 151 151 /* xtest("gcx",gcx(28,3),28,3,0,Yt); 152 152 xtest("gcb",YS_gcb_dynspg_flt(0,28,3,Yt),28,3,0,Yt); */ 153 /*test solsor */153 /*test solsor 154 154 if (Yt==TU+1) { 155 155 fclose(fid); 156 156 } 157 157 */ 158 158 159 159 }
Note: See TracChangeset
for help on using the changeset viewer.