Legend:
- Unmodified
- Added
- Removed
-
trunk/src/.TERM_xterm
r1 r50 8 8 ven. févr. 4 15:01:07 CET 2011 ... ariane.locean-ipsl.upmc.fr 9 9 ven. févr. 4 15:12:24 CET 2011 ... ariane.locean-ipsl.upmc.fr 10 lun. juin 27 14:52:53 CEST 2011 ... ariane.locean-ipsl.upmc.fr 11 lun. juin 27 15:44:44 CEST 2011 ... ariane.locean-ipsl.upmc.fr -
trunk/src/cost.dat
r49 r50 3 3 0.0000000000000000e+00 4 4 2.9733593674719423e+03 5 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/sinobad.d
r49 r50 1 #============================================================================== 2 # fichier de DESCRIPTION sinobad1.d 3 #Mohamed Berrada 26/02/2009 4 #============================================================================== 5 #DEFVAL ---------------------------------------------DEFVAL 6 #definition de valeur 1 #define SOLSORYAO 2 //#define OPTIMORDER 3 //#============================================================================== 4 //# fichier de DESCRIPTION sinobad1.d 5 //#Mohamed Berrada 26/02/2009 6 //#============================================================================== 7 //#DEFVAL ---------------------------------------------DEFVAL 8 //#definition de valeur 7 9 defval NPCA 15 8 10 defval NX 32 … … 10 12 defval NZ 31 11 13 defval NMAX 800 // ! maximum of iterations for the SOR solver 12 defval TA 50 | 50| number of time steps14 defval TA 50 |__DATE__ | number of time steps 13 15 defval TU 2 | start time step 14 #exec disp_valdef15 16 #HAT_NAME -----------------------------------------HAT_NAME16 //#exec disp_valdef 17 18 //#HAT_NAME -----------------------------------------HAT_NAME 17 19 hat_name sinobad 18 20 19 #OPTION ----------------------------------------------OPTION21 //#OPTION ----------------------------------------------OPTION 20 22 21 23 option O_M1QN3 | M2QN1 22 #option O_VARINCR23 #option O_GRADTEST24 #option O_DBG_NANF25 #option O_DBG_TING24 //#option O_VARINCR 25 //#option O_GRADTEST 26 option O_DBG_NANF 27 //#option O_DBG_TING 26 28 option O_EXTOBJ "../object/ncutil.o" 27 29 option O_REAL double 28 30 option o_parallel 16 29 31 30 #TRAJECTOIRES (DIM) -----------------------------------TRAJ32 //#TRAJECTOIRES (DIM) -----------------------------------TRAJ 31 33 traj Tcst M 0 1 32 34 traj Tsbd M TU 0 1 TA … … 35 37 36 38 space S0d M 1 Tcst 37 #space S3d M NX NY NZ Tcst39 //#space S3d M NX NY NZ Tcst 38 40 space S3d M NX NY NZ Tcst 39 41 space S3dt M NX NY NZ Tsbd … … 43 45 exec disp_space 44 46 45 #######################################################################################46 #----------------------------------------47 # choisir le vecteur du contrÃŽle (target)48 #----------------------------------------49 #modul pca_ta space S0d noward output NPCA target47 //####################################################################################### 48 //#---------------------------------------- 49 //# choisir le vecteur du contrÃŽle (target) 50 //#---------------------------------------- 51 //#modul pca_ta space S0d noward output NPCA target 50 52 51 53 modul sshn_c space S3d inter YA1 YA2 noward output 1 |target … … 53 55 modul ta_c space S3d noward output 1 target 54 56 55 #modul ta_c space S3d input array NPCA output 157 //#modul ta_c space S3d input array NPCA output 1 56 58 57 59 modul sa_c space S3d noward output 1 |target … … 59 61 modul va_c space S3d noward output 1 |target 60 62 61 #-------------62 # Les modules dans l'ordre du code NEMO/OPA63 #-------------64 #boucle sur kt (NEMO/OPA)65 #step(kt) ---> --->66 ##START_sbc (debut routine sbc)63 //#------------- 64 //# Les modules dans l'ordre du code NEMO/OPA 65 //#------------- 66 //#boucle sur kt (NEMO/OPA) 67 //#step(kt) ---> ---> 68 //##START_sbc (debut routine sbc) 67 69 modul sbcgyre_qsr_qns space S3dt inter YA1 YA2 input 1 output 2 tempo 68 70 modul sbcgyre_emp1 space S3dt inter YA1 YA2 input 0 output 1 tempo … … 72 74 modul sbcgyre_utau_vtau space S3dt inter YA1 YA2 input 0 output 2 tempo 73 75 modul sbcgyre_wndm space S3dt inter YA1 YA2 input 4 output 1 tempo 74 ##END_sbc (fin routine sbc)75 76 ##START_bn2 (debut routine bn2) (neos=2)76 //##END_sbc (fin routine sbc) 77 78 //##START_bn2 (debut routine bn2) (neos=2) 77 79 modul bn2_rn2 space S3dt input 4 output 1 tempo 78 ##END_bn2(fin routine bn2)79 80 ##START_zdf (n_evdm=1,nbotfr=2)81 #mélange vertical80 //##END_bn2(fin routine bn2) 81 82 //##START_zdf (n_evdm=1,nbotfr=2) 83 //#mélange vertical 82 84 modul zdf_avt_avmu_avmv space S3dt input 19 output 3 tempo 83 85 modul zdfmxl_hmld space S3dt inter YA1 YA2 input array NZ output 1 tempo 84 86 modul zdfmxl_nmln_hmlp_hmlpt space S3dt inter YA1 YA2 input array NZ output 3 tempo 85 ##END_zdf86 87 ##START_trasbc88 #température et salinté de surface87 //##END_zdf 88 89 //##START_trasbc 90 //#température et salinté de surface 89 91 modul ta_sa_trasbc space S3dt inter YA1 YA2 input 3 output 2 tempo 90 ##END_trasbc91 92 ##START_traqsr92 //#//#END_trasbc 93 94 //##START_traqsr 93 95 modul ta_traqsr space S3dt input 2 output 1 tempo 94 ##END_traqsr95 96 ##START_traadv_cen297 #advection (cen2 second order center scheme)96 //##END_traqsr 97 98 //##START_traadv_cen2 99 //#advection (cen2 second order center scheme) 98 100 modul zcent_hor_traadv_cen2 space S3dt input 5 output 2 tempo 99 101 modul zcens_hor_traadv_cen2 space S3dt clonol zcent_hor_traadv_cen2 … … 105 107 modul sa_ver_traadv_cen2 space S3dt clonol ta_ver_traadv_cen2 106 108 107 ##END_traadv_cen2108 109 ##START_traldf_lap110 #diffusion latérale (laplacian scheme)109 //##END_traadv_cen2 110 111 //##START_traldf_lap 112 //#diffusion latérale (laplacian scheme) 111 113 modul ztuv_traldf_lap space S3dt input 3 output 2 tempo 112 114 modul zsuv_traldf_lap space S3dt clonol ztuv_traldf_lap 113 115 modul ta_traldf_lap space S3dt input 5 output 1 tempo 114 116 modul sa_traldf_lap space S3dt clonol ta_traldf_lap 115 ##END_traldf_lap116 117 ##START_trazdf_imp118 #diffusion verticale (schema implicit)117 //##END_traldf_lap 118 119 //##START_trazdf_imp 120 //#diffusion verticale (schema implicit) 119 121 modul zwisd_trazdf_imp space S3dt input 2 output 3 tempo 120 122 modul zrhs_trazdf_imp space S3dt input 2 output 1 tempo … … 125 127 modul sa_de_trazdf_imp space S3dt clonol ta_de_trazdf_imp 126 128 modul sa space S3dt input 5 output 1 tempo 127 ##END_trazdf_imp128 129 ##START_tra_nxt130 #tracer next : filtre asselin129 //##END_trazdf_imp 130 131 //##START_tra_nxt 132 //#tracer next : filtre asselin 131 133 modul tb space S3dt input 4 output 1 tempo cout 132 134 modul sb space S3dt input 4 output 1 tempo cout 133 ##END_tra_nxt134 135 ##START_eos136 #equation of state, density135 //##END_tra_nxt 136 137 //##START_eos 138 //#equation of state, density 137 139 modul rhd space S3dt input 2 output 1 tempo 138 140 modul rhop space S3dt input 1 output 1 tempo 139 ##END_eos140 141 ##START_dyn_adv_cen2142 #advention141 //##END_eos 142 143 //##START_dyn_adv_cen2 144 //#advention 143 145 modul hmf_TF_dynadv_cen2 space S3dt input 6 output 4 tempo 144 146 modul zua_dhmf_dynadv_cen2 space S3dt input 4 output 1 tempo … … 147 149 modul ua_dynadv_cen2 space S3dt input 3 output 1 tempo 148 150 modul va_dynadv_cen2 space S3dt input 3 output 1 tempo 149 ##END_dyn_adv_cen2150 151 ##START_vor152 #vorticity enstrophy conservative scheme151 //##END_dyn_adv_cen2 152 153 //##START_vor 154 //#vorticity enstrophy conservative scheme 153 155 modul zwxyz_vor_ene space S3dt input 4 output 3 tempo 154 156 modul ua_vor_ene space S3dt input 7 output 1 tempo 155 157 modul va_vor_ene space S3dt input 7 output 1 tempo 156 ##END_vor157 158 ##START_dyn_ldf159 #lateral diffusion158 //##END_vor 159 160 //##START_dyn_ldf 161 //#lateral diffusion 160 162 modul ua_dyn_ldf_lap space S3dt input 5 output 1 tempo 161 163 modul va_dyn_ldf_lap space S3dt input 5 output 1 tempo 162 ##END_dyn_ldf163 164 ##START_dyn_hpg165 #hydrostratic pressure gradient164 //##END_dyn_ldf 165 166 //##START_dyn_hpg 167 //#hydrostratic pressure gradient 166 168 modul zhpij_dyn_hpg_zco space S3dt input 8 output 2 tempo 167 169 modul ua_dyn_hpg_zco space S3dt input 2 output 1 tempo 168 170 modul va_dyn_hpg_zco space S3dt clonol ua_dyn_hpg_zco 169 ##END_dyn_hpg170 171 ##START_dyn_zdf172 #vertical diffusion171 //##END_dyn_hpg 172 173 //##START_dyn_zdf 174 //#vertical diffusion 173 175 modul zwisd_ua_dynzdf_imp space S3dt input 2 output 3 tempo 174 176 modul zwisd_va_dynzdf_imp space S3dt input 2 output 3 tempo … … 183 185 modul ua_norm_dynzdf space S3dt input 2 output 1 tempo 184 186 modul va_norm_dynzdf space S3dt clonol ua_norm_dynzdf 185 ##END_dyn_zdf186 187 ##START_dyn_spg188 #surface presure gradient187 //##END_dyn_zdf 188 189 //##START_dyn_spg 190 //#surface presure gradient 189 191 modul spguv_now_dynspg space S3dt inter YA1 YA2 input 3 output 2 tempo 190 192 modul ua_1_dynspg_flt space S3dt input 3 output 1 tempo … … 204 206 modul sshn space S3dt_b inter YA1 YA2 input 4 output 1 tempo 205 207 modul sshb space S3dt_b inter YA1 YA2 input 4 output 1 tempo cout 206 ##END_dyn_spg207 208 ##START_dyn_nxt209 #nxt : filtre d'asselin208 //##END_dyn_spg 209 210 //##START_dyn_nxt 211 //#nxt : filtre d'asselin 210 212 modul ub space S3dt_b input 4 output 1 tempo cout 211 213 modul vb space S3dt_b input 4 output 1 tempo cout 212 ##END_dyn_nxt213 214 ##START_divcur215 #calcul de div et de rotationnel214 //##END_dyn_nxt 215 216 //##START_divcur 217 //#calcul de div et de rotationnel 216 218 modul hdivn space S3dt_b input 4 output 1 tempo 217 219 modul rotn space S3dt_b input 4 output 1 tempo 218 ##END_divcur219 220 ##START_wzv221 #vitesse vertical220 //##END_divcur 221 222 //##START_wzv 223 //#vitesse vertical 222 224 modul wa space S3dt_b input 2 output 1 tempo 223 ##END_wzv224 225 #############################################################################################226 227 #ctin ta_c 1..NPCA from pca_ta 1..NPCA 1228 229 #---------->sbcgyre225 //##END_wzv 226 //exec disp_modul 227 //############################################################################################# 228 229 //#ctin ta_c 1..NPCA from pca_ta 1..NPCA 1 230 231 //#---------->sbcgyre 230 232 ctin sbcgyre_qsr_qns 1 from tb 1 i j 1 t-1 231 233 … … 247 249 ctin sbcgyre_wndm 4 from sbcgyre_utau_vtau 2 i j t 248 250 249 #---------->bn2251 //#---------->bn2 250 252 ctin bn2_rn2 1 from tb 1 i j k t-1 251 253 ctin bn2_rn2 2 from tb 1 i j k-1 t-1 … … 253 255 ctin bn2_rn2 4 from sb 1 i j k-1 t-1 254 256 255 #---------->zdf257 //#---------->zdf 256 258 ctin zdf_avt_avmu_avmv 1 from bn2_rn2 1 i j k t 257 259 ctin zdf_avt_avmu_avmv 2 from bn2_rn2 1 i+1 j k t … … 281 283 ctin zdfmxl_nmln_hmlp_hmlpt 1..NZ from rhop 1 i j 1..NZ t-1 282 284 283 #---------->trasbc285 //#---------->trasbc 284 286 ctin ta_sa_trasbc 1 from sbcgyre_qsr_qns 2 i j t 285 287 ctin ta_sa_trasbc 2 from sbcgyre_emps 1 i j t 286 288 ctin ta_sa_trasbc 3 from sa 1 i j 1 t-1 287 289 288 #---------->traqsr290 //#---------->traqsr 289 291 ctin ta_traqsr 1 from sbcgyre_qsr_qns 1 i j t 290 292 ctin ta_traqsr 2 from ta_sa_trasbc 1 i j t 291 293 292 #---------->traadv_cen2294 //#---------->traadv_cen2 293 295 ctin zcent_hor_traadv_cen2 1 from ua 1 i j k t-1 294 296 ctin zcent_hor_traadv_cen2 2 from va 1 i j k t-1 … … 331 333 ctin sa_ver_traadv_cen2 3 from zcens_ver_traadv_cen2 1 i j k+1 t 332 334 333 #---------->traldf_lap335 //#---------->traldf_lap 334 336 ctin ztuv_traldf_lap 1 from tb 1 i j k t-1 335 337 ctin ztuv_traldf_lap 2 from tb 1 i+1 j k t-1 … … 352 354 ctin sa_traldf_lap 5 from zsuv_traldf_lap 2 i j-1 k t 353 355 354 #---------->trazdf_imp356 //#---------->trazdf_imp 355 357 ctin zwisd_trazdf_imp 1 from zdf_avt_avmu_avmv 1 i j k t 356 358 ctin zwisd_trazdf_imp 2 from zdf_avt_avmu_avmv 1 i j k+1 t … … 389 391 ctin sa 5 from sa_c 1 i j k 390 392 391 #---------->tra_nxt393 //#---------->tra_nxt 392 394 ctin tb 1 from tb 1 i j k t-1 393 395 ctin tb 2 from ta 1 i j k t-1 … … 400 402 ctin sb 4 from sa_c 1 i j k 401 403 402 #---------->eos404 //#---------->eos 403 405 ctin rhd 1 from tb 1 i j k t 404 406 ctin rhd 2 from sb 1 i j k t … … 407 409 408 410 409 #---------->dynadv_cen2411 //#---------->dynadv_cen2 410 412 ctin hmf_TF_dynadv_cen2 1 from ua 1 i j k t-1 411 413 ctin hmf_TF_dynadv_cen2 2 from ua 1 i+1 j k t-1 … … 441 443 ctin va_dynadv_cen2 3 from zva_dhmf_dynadv_cen2 1 i j k t 442 444 443 #---------->vor_ene445 //#---------->vor_ene 444 446 ctin zwxyz_vor_ene 1 from ua 1 i j k t-1 445 447 ctin zwxyz_vor_ene 2 from ua 1 i j+1 k t-1 … … 463 465 ctin va_vor_ene 7 from zwxyz_vor_ene 1 i j+1 k t 464 466 465 #---------->dyn_ldf_lap467 //#---------->dyn_ldf_lap 466 468 ctin ua_dyn_ldf_lap 1 from ua_vor_ene 1 i j k t 467 469 ctin ua_dyn_ldf_lap 2 from rotn 1 i j-1 k t-2 … … 476 478 ctin va_dyn_ldf_lap 5 from hdivn 1 i j+1 k t-2 477 479 478 #---------->dyn__hpg_zco480 //#---------->dyn__hpg_zco 479 481 ctin zhpij_dyn_hpg_zco 1 from rhd 1 i+1 j k t 480 482 ctin zhpij_dyn_hpg_zco 2 from rhd 1 i j+1 k t … … 492 494 ctin va_dyn_hpg_zco 2 from zhpij_dyn_hpg_zco 2 i j k t 493 495 494 #---------->dynzdf_imp496 //#---------->dynzdf_imp 495 497 ctin zwisd_ua_dynzdf_imp 1 from zdf_avt_avmu_avmv 2 i j k t 496 498 ctin zwisd_ua_dynzdf_imp 2 from zdf_avt_avmu_avmv 2 i j k+1 t … … 543 545 ctin va_norm_dynzdf 2 from vb 1 i j k t-1 544 546 545 #---------->ddynspg_flt547 //#---------->ddynspg_flt 546 548 ctin spguv_now_dynspg 1 from sshn 1 i j t-1 547 549 ctin spguv_now_dynspg 2 from sshn 1 i j+1 t-1 … … 588 590 ctin sshb 3 from sshn 1 i j t 589 591 ctin sshb 4 from sshn_c 1 i j 590 ############## Ajout de ctin "virtuels" ##############591 #ctin solsor_dynspg_flt 1..9 from gcx_dynspg_flt 1 i%~1 j%~1 t592 #ctin solsor_dynspg_flt 10..18 from gcb_dynspg_flt 1 i%~1 j%~1 t593 #ctin solsor_dynspg_flt 19 from solsor_dynspg_flt 1 i-1 j-1 t594 #ctin gcx2 1 from solsor_dynspg_flt 1 i j t592 //############## 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 595 597 596 598 ctin solsor_flag 1 from solsor_gx2_x_r 2 i j k t … … 619 621 620 622 ctin gcx2 1 from solsor_gx2_x_r 1 i j NMAX t 621 #---------->dyn_nxt623 //#---------->dyn_nxt 622 624 ctin ub 1 from ub 1 i j k t-1 623 625 ctin ub 2 from ua 1 i j k t-1 … … 630 632 ctin vb 4 from va_c 1 i j k 631 633 632 #---------->divcur634 //#---------->divcur 633 635 ctin hdivn 1 from ua 1 i j k t 634 636 ctin hdivn 2 from ua 1 i-1 j k t … … 641 643 ctin rotn 4 from ua 1 i j k t 642 644 643 #---------->wzv645 //#---------->wzv 644 646 ctin wa 1 from wa 1 i j k+1 t 645 647 ctin wa 2 from hdivn 1 i j k t 646 648 647 #----------> 648 649 650 651 652 653 #ORDER----- 654 #ORDER----- 655 #order modinspace S3d 656 # order YA3 YA2 YA1 657 # ta_c 658 # forder 659 #forder 660 661 order modinspace S3dt 662 #---------->sbcgyre 663 order YA2 YA1 664 sbcgyre_qsr_qns sbcgyre_emp1 sbcgyre_zsumemp_zsurf 665 forder 666 order YA2 YA1 667 sbcgyre_emp sbcgyre_emps sbcgyre_utau_vtau sbcgyre_wndm 668 forder 669 670 #---------->sbcgyre + bn2_rn2 + zdf + trasbc + traqsr + traadv + 671 # traldf + trazdf + tra_nxt// 672 # order YA1 YA2 673 # sbcgyre_qsr_qns sbcgyre_emp1 674 # order YA3 675 # bn2_rn2 zcent_hor_traadv_cen2 zcens_hor_traadv_cen2 676 # zcent_ver_traadv_cen2 zcens_ver_traadv_cen2 649 //#----------> 650 651 #ifdef OPTIMORDER 652 653 #ifdef SOLSORYAO 654 655 //#---------->sbcgyre + bn2_rn2 + zdf + trasbc + traqsr + traadv + 656 //# traldf + trazdf + tra_nxt + eos + dynadv_cen2 + vor_ene 657 //# +dyn_ldf + dyn__hpg_zco +dynzdf_imp(-> gcx_dynspg_flt) // 658 659 660 order modinspace S3dt 661 order YA1 YA2 662 sbcgyre_qsr_qns sbcgyre_emp1 663 spguv_now_dynspg 664 gcx_dynspg_flt 665 order YA3 666 bn2_rn2 zcent_hor_traadv_cen2 zcens_hor_traadv_cen2 667 zcent_ver_traadv_cen2 zcens_ver_traadv_cen2 677 668 ztuv_traldf_lap zsuv_traldf_lap 678 # forder 679 # forder 680 681 # #NO PARALLEL 682 # order YA2 YA1 683 # sbcgyre_zsum3emp_zsurf 684 # 685 686 # forder 687 # order YA1 YA2 688 # order YB3 689 # zdf_avt_avmu_avmv 690 # zwisd_trazdf_imp 691 # forder 692 # sbcgyre_emp sbcgyre_emps sbcgyre_utau_vtau 693 # zdfmxl_hmld zdfmxl_nmln_hmlp_hmlpt ta_sa_trasbc 694 # ta_traqsr 669 hmf_TF_dynadv_cen2 zfuv_UW_dynadv_cen2 670 forder 671 forder 672 673 order YA3 674 order YA1 YA2 675 zua_dhmf_dynadv_cen2 zva_dhmf_dynadv_cen2 zwxyz_vor_ene 676 forder 677 forder 678 679 //#NO PARALLEL 680 order YA2 YA1 681 sbcgyre_zsumemp_zsurf 682 forder 683 order YA1 YA2 695 684 order YB3 696 # ta_hor_traadv_cen2 sa_hor_traadv_cen2 685 zdf_avt_avmu_avmv 686 zwisd_trazdf_imp 687 zwisd_ua_dynzdf_imp zwisd_va_dynzdf_imp 688 forder 689 sbcgyre_emp sbcgyre_emps sbcgyre_utau_vtau 690 zdfmxl_hmld zdfmxl_nmln_hmlp_hmlpt ta_sa_trasbc 691 order YB3 692 ta_traqsr 693 ua_dynadv_cen2 va_dynadv_cen2 694 ua_vor_ene va_vor_ene 695 ua_dyn_ldf_lap va_dyn_ldf_lap 696 ta_hor_traadv_cen2 sa_hor_traadv_cen2 697 697 ta_ver_traadv_cen2 sa_ver_traadv_cen2 698 698 ta_traldf_lap sa_traldf_lap 699 699 zrhs_trazdf_imp zrhs_sa_trazdf_imp 700 #forder700 forder 701 701 order YA3 702 702 zwt_trazdf_imp ta_de_trazdf_imp sa_de_trazdf_imp 703 zwt_ua_dynzdf_imp zwt_va_dynzdf_imp 703 704 forder 704 705 order YB3 705 706 ta sa tb sb rhd rhop 706 707 forder 707 # forder 708 709 710 # order YA1 YA2 711 # sbcgyre_wndm 712 # forder 713 714 #---------->bn2 708 forder 709 order YA1 YA2 710 order YA3 711 zhpij_dyn_hpg_zco 712 ua_dyn_hpg_zco va_dyn_hpg_zco 713 zrhs_ua_dynzdf_imp zrhs_va_dynzdf_imp 714 ua_de_dynzdf_imp va_de_dynzdf_imp 715 forder 716 order YB3 717 ua_dynzdf_imp va_dynzdf_imp 718 ua_norm_dynzdf va_norm_dynzdf 719 ua_1_dynspg_flt va_1_dynspg_flt 720 forder 721 sum_spgu_dynspg_flt sum_spgv_dynspg_flt 722 forder 723 724 order YA1 YA2 725 sbcgyre_wndm 726 forder 727 forder 728 729 order modinspace Ssolsor 730 order YA3 731 order YA2 YA1 732 solsor_gx1_x_r 733 forder 734 735 order YA2 YA1 736 solsor_gx2_x_r 737 forder 738 739 order YA1 YA2 740 solsor_flag 741 forder 742 forder 743 forder 744 745 order modinspace S3dt_b 746 order YA2 YA1 747 gcx2 748 forder 749 order YA2 YA1 750 spguv_dynspg_flt 751 752 forder 753 order YA3 YA2 YA1 754 ua va 755 forder 756 order YA2 YA1 757 sshn sshb 758 forder 759 //#---------->dyn_nxt 760 order YA3 YA2 YA1 761 ub vb 762 forder 763 //#---------->divcur 764 order YA3 YA2 YA1 765 hdivn rotn 766 forder 767 //#---------->wzv 768 order YB3 YA2 YA1 769 wa 770 forder 771 forder 772 773 #endif 774 #endif 775 776 #ifndef OPTIMORDER 777 #ifdef SOLSORYAO 778 779 order modinspace S3dt 780 //#---------->sbcgyre 781 order YA2 YA1 782 sbcgyre_qsr_qns sbcgyre_emp1 sbcgyre_zsumemp_zsurf 783 forder 784 order YA2 YA1 785 sbcgyre_emp sbcgyre_emps sbcgyre_utau_vtau sbcgyre_wndm 786 forder 787 788 789 //#---------->bn2 715 790 order YA3 YA2 YA1 716 791 bn2_rn2 717 792 forder 718 793 719 #---------->zdf794 //#---------->zdf 720 795 order YA3 YA2 YA1 721 796 zdf_avt_avmu_avmv … … 724 799 zdfmxl_hmld zdfmxl_nmln_hmlp_hmlpt 725 800 forder 726 #---------->trasbc801 //#---------->trasbc 727 802 order YA2 YA1 728 803 ta_sa_trasbc 729 804 forder 730 #---------->traqsr805 //#---------->traqsr 731 806 order YA3 YA2 YA1 732 807 ta_traqsr 733 808 forder 734 #------> traadv_cen2809 //#------> traadv_cen2 735 810 order YA3 736 811 order YA2 YA1 … … 749 824 forder 750 825 751 #------> traldf_lap826 //#------> traldf_lap 752 827 order YA3 YA2 YA1 753 828 ztuv_traldf_lap zsuv_traldf_lap 754 829 ta_traldf_lap sa_traldf_lap 755 830 forder 756 #------> trazdf_imp831 //#------> trazdf_imp 757 832 order YA3 YA2 YA1 758 833 zwisd_trazdf_imp zrhs_trazdf_imp zrhs_sa_trazdf_imp … … 764 839 ta sa 765 840 forder 766 #---------->tra_nxt841 //#---------->tra_nxt 767 842 order YA3 YA2 YA1 768 843 tb sb 769 844 forder 770 #---------->eos845 //#---------->eos 771 846 order YA3 YA2 YA1 772 847 rhd rhop 773 848 forder 774 #------> dynadv_cen2849 //#------> dynadv_cen2 775 850 order YA3 776 851 order YA2 YA1 … … 788 863 ua_dynadv_cen2 va_dynadv_cen2 789 864 forder 790 #------> vor_ene && dyn_ldf_lap865 //#------> vor_ene && dyn_ldf_lap 791 866 order YA3 792 867 order YA2 YA1 … … 798 873 forder 799 874 forder 800 #---------->dyn__hpg_zco875 //#---------->dyn__hpg_zco 801 876 order YA3 YA2 YA1 802 877 zhpij_dyn_hpg_zco ua_dyn_hpg_zco va_dyn_hpg_zco 803 878 forder 804 #---------->dynzdf_imp879 //#---------->dynzdf_imp 805 880 order YA3 YA2 YA1 806 881 zwisd_ua_dynzdf_imp zwisd_va_dynzdf_imp … … 817 892 ua_norm_dynzdf va_norm_dynzdf 818 893 forder 819 #---------->dynspg_flt894 //#---------->dynspg_flt 820 895 order YA2 YA1 821 896 spguv_now_dynspg … … 854 929 order YA2 YA1 855 930 spguv_dynspg_flt 856 forder 857 order YA3 YA2 YA1 858 ua va 859 forder 860 order YA2 YA1 861 sshn sshb 862 forder 863 #---------->dyn_nxt 864 order YA3 YA2 YA1 865 ub vb 866 forder 867 #---------->divcur 868 order YA3 YA2 YA1 869 hdivn rotn 870 forder 871 #---------->wzv 872 order YB3 YA2 YA1 873 wa 931 sshn sshb 932 order YA3 933 ua va 934 forder 935 forder 936 // #---------->dyn_nxt 937 order YA3 YA2 YA1 938 ub vb 939 forder 940 // #---------->divcur 941 order YA3 YA2 YA1 942 hdivn rotn 943 forder 944 // #---------->wzv 945 order YB3 YA2 YA1 946 wa 874 947 forder 875 948 forder 876 877 #order spaceintraj Tcst 878 # S3d879 #forder 880 949 #endif 950 951 #endif 952 953 #ifdef SOLSORYAO 881 954 order spaceintraj Tsbd 882 955 S3dt Ssolsor S3dt_b 883 956 forder 884 885 #USER FUNCTIONS ---------------------------------INSERT_FCT 957 #endif 958 959 //#USER FUNCTIONS ---------------------------------INSERT_FCT 886 960 insert_fct xdisplay 887 961 insert_fct xcomparYF … … 894 968 insert_fct arg xwritegrad 895 969 insert_fct arg xinitnc 896 #insert_fct arg load_shape_func897 #insert_fct arg load_stdev_pca898 #insert_fct arg load_mean970 //#insert_fct arg load_shape_func 971 //#insert_fct arg load_stdev_pca 972 //#insert_fct arg load_mean
Note: See TracChangeset
for help on using the changeset viewer.