Changeset 789
- Timestamp:
- 2008-01-11T19:04:56+01:00 (16 years ago)
- Location:
- trunk
- Files:
-
- 8 deleted
- 32 edited
-
CONFIG/GYRE/scripts/BB_make (modified) (57 diffs)
-
CONFIG/ORCA2_LIM/scripts/BB_make (modified) (57 diffs)
-
NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) (5 diffs)
-
NEMO/OPA_SRC/DYN/dynhpg_jki.F90 (deleted)
-
NEMO/OPA_SRC/DYN/dynspg.F90 (modified) (5 diffs)
-
NEMO/OPA_SRC/DYN/dynspg_exp.F90 (modified) (1 diff)
-
NEMO/OPA_SRC/DYN/dynspg_exp_jki.F90 (deleted)
-
NEMO/OPA_SRC/DYN/dynspg_flt.F90 (modified) (1 diff)
-
NEMO/OPA_SRC/DYN/dynspg_flt_jki.F90 (deleted)
-
NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) (1 diff)
-
NEMO/OPA_SRC/DYN/dynspg_ts_jki.F90 (deleted)
-
NEMO/OPA_SRC/DYN/dynvor.F90 (modified) (4 diffs)
-
NEMO/OPA_SRC/DYN/dynzad.F90 (modified) (3 diffs)
-
NEMO/OPA_SRC/DYN/dynzdf.F90 (modified) (6 diffs)
-
NEMO/OPA_SRC/DYN/dynzdf_imp_jki.F90 (deleted)
-
NEMO/OPA_SRC/DYN/wzvmod.F90 (modified) (2 diffs)
-
NEMO/OPA_SRC/LDF/ldfeiv.F90 (modified) (4 diffs)
-
NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) (16 diffs)
-
NEMO/OPA_SRC/SBC/flxblk.F90 (modified) (1 diff)
-
NEMO/OPA_SRC/TRA/traadv.F90 (modified) (5 diffs)
-
NEMO/OPA_SRC/TRA/traadv_cen2.F90 (modified) (1 diff)
-
NEMO/OPA_SRC/TRA/traadv_cen2_jki.F90 (deleted)
-
NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) (2 diffs)
-
NEMO/OPA_SRC/TRA/trabbc.F90 (modified) (2 diffs)
-
NEMO/OPA_SRC/TRA/trabbl.F90 (modified) (18 diffs)
-
NEMO/OPA_SRC/TRA/trabbl_adv.h90 (modified) (15 diffs)
-
NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) (2 diffs)
-
NEMO/OPA_SRC/TRA/trazdf.F90 (modified) (6 diffs)
-
NEMO/OPA_SRC/TRA/trazdf_exp.F90 (modified) (1 diff)
-
NEMO/OPA_SRC/TRA/trazdf_imp.F90 (modified) (2 diffs)
-
NEMO/OPA_SRC/TRA/trazdf_imp_jki.F90 (deleted)
-
NEMO/OPA_SRC/TRA/zpshde.F90 (modified) (4 diffs)
-
NEMO/OPA_SRC/ZDF/zdfbfr.F90 (modified) (8 diffs)
-
NEMO/OPA_SRC/ZDF/zdfevd.F90 (modified) (2 diffs)
-
NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) (2 diffs)
-
NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) (1 diff)
-
NEMO/OPA_SRC/ZDF/zdftke_jki.F90 (deleted)
-
NEMO/OPA_SRC/eosbn2.F90 (modified) (4 diffs)
-
NEMO/OPA_SRC/par_oce.F90 (modified) (1 diff)
-
NEMO/OPA_SRC/step.F90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/CONFIG/GYRE/scripts/BB_make
r784 r789 120 120 key_mpp_dyndist \ 121 121 key_mpp_mpi \ 122 key_mpp_omp \123 122 key_mpp_shmem \ 124 123 key_noslip_accurate \ … … 208 207 $(MODEL_LIB)(dyncor1d.o)\ 209 208 $(MODEL_LIB)(dynhpg.o)\ 210 $(MODEL_LIB)(dynhpg_jki.o)\211 209 $(MODEL_LIB)(dynkeg.o)\ 212 210 $(MODEL_LIB)(dynldf.o)\ … … 219 217 $(MODEL_LIB)(dynspg.o)\ 220 218 $(MODEL_LIB)(dynspg_exp.o)\ 221 $(MODEL_LIB)(dynspg_exp_jki.o)\222 219 $(MODEL_LIB)(dynspg_flt.o)\ 223 $(MODEL_LIB)(dynspg_flt_jki.o)\224 220 $(MODEL_LIB)(dynspg_oce.o)\ 225 221 $(MODEL_LIB)(dynspg_rl.o)\ 226 222 $(MODEL_LIB)(dynspg_ts.o)\ 227 $(MODEL_LIB)(dynspg_ts_jki.o)\228 223 $(MODEL_LIB)(dynvor.o)\ 229 224 $(MODEL_LIB)(dynzad.o)\ … … 231 226 $(MODEL_LIB)(dynzdf_exp.o)\ 232 227 $(MODEL_LIB)(dynzdf_imp.o)\ 233 $(MODEL_LIB)(dynzdf_imp_jki.o)\234 228 $(MODEL_LIB)(eosbn2.o)\ 235 229 $(MODEL_LIB)(flo4rk.o)\ … … 325 319 $(MODEL_LIB)(traadv.o)\ 326 320 $(MODEL_LIB)(traadv_cen2.o)\ 327 $(MODEL_LIB)(traadv_cen2_jki.o)\328 321 $(MODEL_LIB)(traadv_eiv.o)\ 329 322 $(MODEL_LIB)(traadv_muscl.o)\ … … 347 340 $(MODEL_LIB)(trazdf_exp.o)\ 348 341 $(MODEL_LIB)(trazdf_imp.o)\ 349 $(MODEL_LIB)(trazdf_imp_jki.o)\350 342 $(MODEL_LIB)(trc_oce.o)\ 351 343 $(MODEL_LIB)(trcstp.o)\ … … 369 361 $(MODEL_LIB)(zdfric.o)\ 370 362 $(MODEL_LIB)(zdftke.o)\ 371 $(MODEL_LIB)(zdftke_jki.o)\372 363 $(MODEL_LIB)(zpshde.o) 373 364 … … 2477 2468 $(MODEL_LIB)(dom_oce.o) \ 2478 2469 $(MODEL_LIB)(in_out_manager.o) \ 2479 $(MODEL_LIB)(lbclnk.o) \2480 2470 $(MODEL_LIB)(ldftra_oce.o) \ 2481 2471 $(MODEL_LIB)(lib_mpp.o) \ … … 2496 2486 dom_oce.F90 \ 2497 2487 in_out_manager.F90 \ 2498 lbclnk.F90 \2499 2488 ldftra_oce.F90 \ 2500 2489 lib_mpp.F90 \ … … 2514 2503 zdf_oce.F90 \ 2515 2504 $(MODEL_LIB)(dom_oce.o) \ 2516 $(MODEL_LIB)(dynhpg_jki.o) \2517 2505 $(MODEL_LIB)(in_out_manager.o) \ 2518 2506 $(MODEL_LIB)(lbclnk.o) \ … … 2523 2511 $(MODEL_LIB)(trdmod_oce.o) \ 2524 2512 dom_oce.F90 \ 2525 dynhpg_jki.F90 \2526 2513 in_out_manager.F90 \ 2527 2514 lbclnk.F90 \ … … 2535 2522 KEY_CPP \ 2536 2523 dynhpg.F90 2537 $(MODEL_LIB)(dynhpg_jki.o) : \2538 $(MODEL_LIB)(dom_oce.o) \2539 $(MODEL_LIB)(in_out_manager.o) \2540 $(MODEL_LIB)(lib_mpp.o) \2541 $(MODEL_LIB)(lib_print.o) \2542 $(MODEL_LIB)(oce.o) \2543 $(MODEL_LIB)(par_kind.o) \2544 $(MODEL_LIB)(par_oce.o) \2545 dom_oce.F90 \2546 in_out_manager.F90 \2547 lib_mpp.F90 \2548 lib_print.f90 \2549 oce.F90 \2550 par_kind.F90 \2551 par_oce.F90 \2552 $(MODEL_LIB)(dom_oce.o) \2553 $(MODEL_LIB)(in_out_manager.o) \2554 $(MODEL_LIB)(lbclnk.o) \2555 $(MODEL_LIB)(oce.o) \2556 $(MODEL_LIB)(phycst.o) \2557 dom_oce.F90 \2558 in_out_manager.F90 \2559 lbclnk.F90 \2560 oce.F90 \2561 phycst.F90 \2562 domzgr_substitute.h90 \2563 vectopt_loop_substitute.h90 \2564 KEY_CPP \2565 dynhpg_jki.F902566 2524 $(MODEL_LIB)(dynkeg.o) : \ 2567 2525 $(MODEL_LIB)(dom_oce.o) \ … … 3051 3009 $(MODEL_LIB)(dom_oce.o) \ 3052 3010 $(MODEL_LIB)(domvvl.o) \ 3053 $(MODEL_LIB)(dynspg_exp.o) \3054 $(MODEL_LIB)(dynspg_flt.o) \3055 3011 $(MODEL_LIB)(dynspg_oce.o) \ 3056 $(MODEL_LIB)(dynspg_ts.o) \3057 3012 $(MODEL_LIB)(dynvor.o) \ 3058 3013 $(MODEL_LIB)(flxrnf.o) \ … … 3097 3052 dom_oce.F90 \ 3098 3053 domvvl.F90 \ 3099 dynspg_exp.F90 \3100 dynspg_flt.F90 \3101 3054 dynspg_oce.F90 \ 3102 dynspg_ts.F90 \3103 3055 dynvor.F90 \ 3104 3056 flxrnf.F90 \ … … 3141 3093 $(MODEL_LIB)(dom_oce.o) \ 3142 3094 $(MODEL_LIB)(dynspg_exp.o) \ 3143 $(MODEL_LIB)(dynspg_exp_jki.o) \3144 3095 $(MODEL_LIB)(dynspg_flt.o) \ 3145 $(MODEL_LIB)(dynspg_flt_jki.o) \3146 3096 $(MODEL_LIB)(dynspg_oce.o) \ 3147 3097 $(MODEL_LIB)(dynspg_rl.o) \ 3148 3098 $(MODEL_LIB)(dynspg_ts.o) \ 3149 $(MODEL_LIB)(dynspg_ts_jki.o) \3150 3099 $(MODEL_LIB)(in_out_manager.o) \ 3151 3100 $(MODEL_LIB)(obc_oce.o) \ … … 3156 3105 dom_oce.F90 \ 3157 3106 dynspg_exp.F90 \ 3158 dynspg_exp_jki.F90 \3159 3107 dynspg_flt.F90 \ 3160 dynspg_flt_jki.F90 \3161 3108 dynspg_oce.F90 \ 3162 3109 dynspg_rl.F90 \ 3163 3110 dynspg_ts.F90 \ 3164 dynspg_ts_jki.F90 \3165 3111 in_out_manager.F90 \ 3166 3112 obc_oce.F90 \ … … 3278 3224 KEY_CPP \ 3279 3225 dynspg_exp.F90 3280 $(MODEL_LIB)(dynspg_exp_jki.o) : \3281 $(MODEL_LIB)(blk_oce.o) \3282 $(MODEL_LIB)(cpl_oce.o) \3283 $(MODEL_LIB)(daymod.o) \3284 $(MODEL_LIB)(dom_oce.o) \3285 $(MODEL_LIB)(dtasal.o) \3286 $(MODEL_LIB)(dtasss.o) \3287 $(MODEL_LIB)(dtasst.o) \3288 $(MODEL_LIB)(dtatem.o) \3289 $(MODEL_LIB)(dynspg_oce.o) \3290 $(MODEL_LIB)(eosbn2.o) \3291 $(MODEL_LIB)(flx_oce.o) \3292 $(MODEL_LIB)(flxmod.o) \3293 $(MODEL_LIB)(flxrnf.o) \3294 $(MODEL_LIB)(ice_oce.o) \3295 $(MODEL_LIB)(in_out_manager.o) \3296 $(MODEL_LIB)(ini1d.o) \3297 $(MODEL_LIB)(iom.o) \3298 $(MODEL_LIB)(lbclnk.o) \3299 $(MODEL_LIB)(lib_mpp.o) \3300 $(MODEL_LIB)(lib_print.o) \3301 $(MODEL_LIB)(obc_oce.o) \3302 $(MODEL_LIB)(obc_par.o) \3303 $(MODEL_LIB)(obccli.o) \3304 $(MODEL_LIB)(obcdta.o) \3305 $(MODEL_LIB)(oce.o) \3306 $(MODEL_LIB)(ocesbc.o) \3307 $(MODEL_LIB)(ocfzpt.o) \3308 $(MODEL_LIB)(par_kind.o) \3309 $(MODEL_LIB)(par_oce.o) \3310 $(MODEL_LIB)(phycst.o) \3311 $(MODEL_LIB)(prtctl.o) \3312 $(MODEL_LIB)(restart.o) \3313 $(MODEL_LIB)(taumod.o) \3314 $(MODEL_LIB)(tradmp.o) \3315 $(MODEL_LIB)(trdmld_oce.o) \3316 $(MODEL_LIB)(zpshde.o) \3317 blk_oce.F90 \3318 cpl_oce.F90 \3319 daymod.F90 \3320 dom_oce.F90 \3321 dtasal.F90 \3322 dtasss.F90 \3323 dtasst.F90 \3324 dtatem.F90 \3325 dynspg_oce.F90 \3326 eosbn2.F90 \3327 flx_oce.F90 \3328 flxmod.F90 \3329 flxrnf.F90 \3330 ice_oce.F90 \3331 in_out_manager.F90 \3332 ini1d.F90 \3333 iom.F90 \3334 lbclnk.F90 \3335 lib_mpp.F90 \3336 lib_print.f90 \3337 obc_oce.F90 \3338 obc_par.F90 \3339 obccli.F90 \3340 obcdta.F90 \3341 oce.F90 \3342 ocesbc.F90 \3343 ocfzpt.F90 \3344 par_kind.F90 \3345 par_oce.F90 \3346 phycst.F90 \3347 prtctl.F90 \3348 restart.F90 \3349 taumod.F90 \3350 tradmp.F90 \3351 trdmld_oce.F90 \3352 zpshde.F90 \3353 $(MODEL_LIB)(dom_oce.o) \3354 $(MODEL_LIB)(dynspg_exp.o) \3355 $(MODEL_LIB)(in_out_manager.o) \3356 $(MODEL_LIB)(lbclnk.o) \3357 $(MODEL_LIB)(lib_mpp.o) \3358 $(MODEL_LIB)(obc_oce.o) \3359 $(MODEL_LIB)(obc_par.o) \3360 $(MODEL_LIB)(obcdta.o) \3361 $(MODEL_LIB)(oce.o) \3362 $(MODEL_LIB)(ocesbc.o) \3363 $(MODEL_LIB)(phycst.o) \3364 $(MODEL_LIB)(prtctl.o) \3365 $(MODEL_LIB)(restart.o) \3366 dom_oce.F90 \3367 dynspg_exp.F90 \3368 in_out_manager.F90 \3369 lbclnk.F90 \3370 lib_mpp.F90 \3371 obc_oce.F90 \3372 obc_par.F90 \3373 obcdta.F90 \3374 oce.F90 \3375 ocesbc.F90 \3376 phycst.F90 \3377 prtctl.F90 \3378 restart.F90 \3379 domzgr_substitute.h90 \3380 vectopt_loop_substitute.h90 \3381 KEY_CPP \3382 dynspg_exp_jki.F903383 3226 $(MODEL_LIB)(dynspg_flt.o) : \ 3384 3227 $(MODEL_LIB)(blk_oce.o) \ … … 3531 3374 KEY_CPP \ 3532 3375 dynspg_flt.F90 3533 $(MODEL_LIB)(dynspg_flt_jki.o) : \3534 $(MODEL_LIB)(agrif_opa_interp.o) \3535 $(MODEL_LIB)(blk_oce.o) \3536 $(MODEL_LIB)(cla_dynspg.o) \3537 $(MODEL_LIB)(cpl_oce.o) \3538 $(MODEL_LIB)(daymod.o) \3539 $(MODEL_LIB)(dom_oce.o) \3540 $(MODEL_LIB)(domvvl.o) \3541 $(MODEL_LIB)(dtasal.o) \3542 $(MODEL_LIB)(dtasss.o) \3543 $(MODEL_LIB)(dtasst.o) \3544 $(MODEL_LIB)(dtatem.o) \3545 $(MODEL_LIB)(dynspg_oce.o) \3546 $(MODEL_LIB)(eosbn2.o) \3547 $(MODEL_LIB)(flx_oce.o) \3548 $(MODEL_LIB)(flxmod.o) \3549 $(MODEL_LIB)(flxrnf.o) \3550 $(MODEL_LIB)(ice_oce.o) \3551 $(MODEL_LIB)(in_out_manager.o) \3552 $(MODEL_LIB)(ini1d.o) \3553 $(MODEL_LIB)(iom.o) \3554 $(MODEL_LIB)(iom_def.o) \3555 $(MODEL_LIB)(iom_ioipsl.o) \3556 $(MODEL_LIB)(iom_nf90.o) \3557 $(MODEL_LIB)(iom_rstdimg.o) \3558 $(MODEL_LIB)(lbclnk.o) \3559 $(MODEL_LIB)(lib_feti.o) \3560 $(MODEL_LIB)(lib_mpp.o) \3561 $(MODEL_LIB)(lib_print.o) \3562 $(MODEL_LIB)(obc_oce.o) \3563 $(MODEL_LIB)(obc_par.o) \3564 $(MODEL_LIB)(obccli.o) \3565 $(MODEL_LIB)(obcdyn.o) \3566 $(MODEL_LIB)(obcvol.o) \3567 $(MODEL_LIB)(oce.o) \3568 $(MODEL_LIB)(ocesbc.o) \3569 $(MODEL_LIB)(ocfzpt.o) \3570 $(MODEL_LIB)(par_kind.o) \3571 $(MODEL_LIB)(par_oce.o) \3572 $(MODEL_LIB)(phycst.o) \3573 $(MODEL_LIB)(prtctl.o) \3574 $(MODEL_LIB)(restart.o) \3575 $(MODEL_LIB)(sol_oce.o) \3576 $(MODEL_LIB)(solfet.o) \3577 $(MODEL_LIB)(solisl.o) \3578 $(MODEL_LIB)(solmat.o) \3579 $(MODEL_LIB)(solpcg.o) \3580 $(MODEL_LIB)(solsor.o) \3581 $(MODEL_LIB)(solver.o) \3582 $(MODEL_LIB)(taumod.o) \3583 $(MODEL_LIB)(tradmp.o) \3584 $(MODEL_LIB)(trdmld_oce.o) \3585 $(MODEL_LIB)(zdf_oce.o) \3586 $(MODEL_LIB)(zpshde.o) \3587 agrif_opa_interp.F90 \3588 blk_oce.F90 \3589 cla_dynspg.F90 \3590 cpl_oce.F90 \3591 daymod.F90 \3592 dom_oce.F90 \3593 domvvl.F90 \3594 dtasal.F90 \3595 dtasss.F90 \3596 dtasst.F90 \3597 dtatem.F90 \3598 dynspg_oce.F90 \3599 eosbn2.F90 \3600 flx_oce.F90 \3601 flxmod.F90 \3602 flxrnf.F90 \3603 ice_oce.F90 \3604 in_out_manager.F90 \3605 ini1d.F90 \3606 iom.F90 \3607 iom_def.F90 \3608 iom_ioipsl.F90 \3609 iom_nf90.F90 \3610 iom_rstdimg.F90 \3611 lbclnk.F90 \3612 lib_feti.F90 \3613 lib_mpp.F90 \3614 lib_print.f90 \3615 obc_oce.F90 \3616 obc_par.F90 \3617 obccli.F90 \3618 obcdyn.F90 \3619 obcvol.F90 \3620 oce.F90 \3621 ocesbc.F90 \3622 ocfzpt.F90 \3623 par_kind.F90 \3624 par_oce.F90 \3625 phycst.F90 \3626 prtctl.F90 \3627 restart.F90 \3628 sol_oce.F90 \3629 solfet.F90 \3630 solisl.F90 \3631 solmat.F90 \3632 solpcg.F90 \3633 solsor.F90 \3634 solver.F90 \3635 taumod.F90 \3636 tradmp.F90 \3637 trdmld_oce.F90 \3638 zdf_oce.F90 \3639 zpshde.F90 \3640 $(MODEL_LIB)(agrif_opa_interp.o) \3641 $(MODEL_LIB)(cla_dynspg.o) \3642 $(MODEL_LIB)(dom_oce.o) \3643 $(MODEL_LIB)(dynspg_flt.o) \3644 $(MODEL_LIB)(flxrnf.o) \3645 $(MODEL_LIB)(in_out_manager.o) \3646 $(MODEL_LIB)(iom.o) \3647 $(MODEL_LIB)(lbclnk.o) \3648 $(MODEL_LIB)(lib_mpp.o) \3649 $(MODEL_LIB)(obc_oce.o) \3650 $(MODEL_LIB)(obcdyn.o) \3651 $(MODEL_LIB)(obcvol.o) \3652 $(MODEL_LIB)(oce.o) \3653 $(MODEL_LIB)(ocesbc.o) \3654 $(MODEL_LIB)(phycst.o) \3655 $(MODEL_LIB)(prtctl.o) \3656 $(MODEL_LIB)(restart.o) \3657 $(MODEL_LIB)(sol_oce.o) \3658 $(MODEL_LIB)(solfet.o) \3659 $(MODEL_LIB)(solmat.o) \3660 $(MODEL_LIB)(solpcg.o) \3661 $(MODEL_LIB)(solsor.o) \3662 $(MODEL_LIB)(solver.o) \3663 $(MODEL_LIB)(zdf_oce.o) \3664 agrif_opa_interp.F90 \3665 cla_dynspg.F90 \3666 dom_oce.F90 \3667 dynspg_flt.F90 \3668 flxrnf.F90 \3669 in_out_manager.F90 \3670 iom.F90 \3671 lbclnk.F90 \3672 lib_mpp.F90 \3673 obc_oce.F90 \3674 obcdyn.F90 \3675 obcvol.F90 \3676 oce.F90 \3677 ocesbc.F90 \3678 phycst.F90 \3679 prtctl.F90 \3680 restart.F90 \3681 sol_oce.F90 \3682 solfet.F90 \3683 solmat.F90 \3684 solpcg.F90 \3685 solsor.F90 \3686 solver.F90 \3687 zdf_oce.F90 \3688 domzgr_substitute.h90 \3689 $(AGRIF_LIB) \3690 KEY_CPP \3691 dynspg_flt_jki.F903692 3376 $(MODEL_LIB)(dynspg_oce.o) : \ 3693 3377 $(MODEL_LIB)(par_kind.o) \ … … 3926 3610 KEY_CPP \ 3927 3611 dynspg_ts.F90 3928 $(MODEL_LIB)(dynspg_ts_jki.o) : \3929 $(MODEL_LIB)(blk_oce.o) \3930 $(MODEL_LIB)(cpl_oce.o) \3931 $(MODEL_LIB)(daymod.o) \3932 $(MODEL_LIB)(dom_oce.o) \3933 $(MODEL_LIB)(domvvl.o) \3934 $(MODEL_LIB)(dtasal.o) \3935 $(MODEL_LIB)(dtasss.o) \3936 $(MODEL_LIB)(dtasst.o) \3937 $(MODEL_LIB)(dtatem.o) \3938 $(MODEL_LIB)(dynadv.o) \3939 $(MODEL_LIB)(dynspg_oce.o) \3940 $(MODEL_LIB)(dynvor.o) \3941 $(MODEL_LIB)(eosbn2.o) \3942 $(MODEL_LIB)(flx_oce.o) \3943 $(MODEL_LIB)(flxmod.o) \3944 $(MODEL_LIB)(flxrnf.o) \3945 $(MODEL_LIB)(ice_oce.o) \3946 $(MODEL_LIB)(in_out_manager.o) \3947 $(MODEL_LIB)(ini1d.o) \3948 $(MODEL_LIB)(iom.o) \3949 $(MODEL_LIB)(iom_def.o) \3950 $(MODEL_LIB)(iom_ioipsl.o) \3951 $(MODEL_LIB)(iom_nf90.o) \3952 $(MODEL_LIB)(iom_rstdimg.o) \3953 $(MODEL_LIB)(lbclnk.o) \3954 $(MODEL_LIB)(lib_mpp.o) \3955 $(MODEL_LIB)(lib_print.o) \3956 $(MODEL_LIB)(obc_oce.o) \3957 $(MODEL_LIB)(obc_par.o) \3958 $(MODEL_LIB)(obccli.o) \3959 $(MODEL_LIB)(obcdta.o) \3960 $(MODEL_LIB)(obcfla.o) \3961 $(MODEL_LIB)(oce.o) \3962 $(MODEL_LIB)(ocesbc.o) \3963 $(MODEL_LIB)(ocfzpt.o) \3964 $(MODEL_LIB)(par_kind.o) \3965 $(MODEL_LIB)(par_oce.o) \3966 $(MODEL_LIB)(phycst.o) \3967 $(MODEL_LIB)(prtctl.o) \3968 $(MODEL_LIB)(restart.o) \3969 $(MODEL_LIB)(taumod.o) \3970 $(MODEL_LIB)(tradmp.o) \3971 $(MODEL_LIB)(trdmld_oce.o) \3972 $(MODEL_LIB)(trdmod.o) \3973 $(MODEL_LIB)(trdmod_oce.o) \3974 $(MODEL_LIB)(zpshde.o) \3975 blk_oce.F90 \3976 cpl_oce.F90 \3977 daymod.F90 \3978 dom_oce.F90 \3979 domvvl.F90 \3980 dtasal.F90 \3981 dtasss.F90 \3982 dtasst.F90 \3983 dtatem.F90 \3984 dynadv.F90 \3985 dynspg_oce.F90 \3986 dynvor.F90 \3987 eosbn2.F90 \3988 flx_oce.F90 \3989 flxmod.F90 \3990 flxrnf.F90 \3991 ice_oce.F90 \3992 in_out_manager.F90 \3993 ini1d.F90 \3994 iom.F90 \3995 iom_def.F90 \3996 iom_ioipsl.F90 \3997 iom_nf90.F90 \3998 iom_rstdimg.F90 \3999 lbclnk.F90 \4000 lib_mpp.F90 \4001 lib_print.f90 \4002 obc_oce.F90 \4003 obc_par.F90 \4004 obccli.F90 \4005 obcdta.F90 \4006 obcfla.F90 \4007 oce.F90 \4008 ocesbc.F90 \4009 ocfzpt.F90 \4010 par_kind.F90 \4011 par_oce.F90 \4012 phycst.F90 \4013 prtctl.F90 \4014 restart.F90 \4015 taumod.F90 \4016 tradmp.F90 \4017 trdmld_oce.F90 \4018 trdmod.F90 \4019 trdmod_oce.F90 \4020 zpshde.F90 \4021 $(MODEL_LIB)(dom_oce.o) \4022 $(MODEL_LIB)(dynspg_oce.o) \4023 $(MODEL_LIB)(dynspg_ts.o) \4024 $(MODEL_LIB)(dynvor.o) \4025 $(MODEL_LIB)(in_out_manager.o) \4026 $(MODEL_LIB)(iom.o) \4027 $(MODEL_LIB)(lbclnk.o) \4028 $(MODEL_LIB)(lib_mpp.o) \4029 $(MODEL_LIB)(obc_oce.o) \4030 $(MODEL_LIB)(obc_par.o) \4031 $(MODEL_LIB)(obcdta.o) \4032 $(MODEL_LIB)(obcfla.o) \4033 $(MODEL_LIB)(oce.o) \4034 $(MODEL_LIB)(ocesbc.o) \4035 $(MODEL_LIB)(phycst.o) \4036 $(MODEL_LIB)(prtctl.o) \4037 $(MODEL_LIB)(restart.o) \4038 dom_oce.F90 \4039 dynspg_oce.F90 \4040 dynspg_ts.F90 \4041 dynvor.F90 \4042 in_out_manager.F90 \4043 iom.F90 \4044 lbclnk.F90 \4045 lib_mpp.F90 \4046 obc_oce.F90 \4047 obc_par.F90 \4048 obcdta.F90 \4049 obcfla.F90 \4050 oce.F90 \4051 ocesbc.F90 \4052 phycst.F90 \4053 prtctl.F90 \4054 restart.F90 \4055 domzgr_substitute.h90 \4056 vectopt_loop_substitute.h90 \4057 KEY_CPP \4058 dynspg_ts_jki.F904059 3612 $(MODEL_LIB)(dynvor.o) : \ 4060 3613 $(MODEL_LIB)(dom_oce.o) \ … … 4239 3792 $(MODEL_LIB)(dynzdf_exp.o) \ 4240 3793 $(MODEL_LIB)(dynzdf_imp.o) \ 4241 $(MODEL_LIB)(dynzdf_imp_jki.o) \4242 3794 $(MODEL_LIB)(in_out_manager.o) \ 4243 3795 $(MODEL_LIB)(ldfdyn_oce.o) \ … … 4252 3804 dynzdf_exp.F90 \ 4253 3805 dynzdf_imp.F90 \ 4254 dynzdf_imp_jki.F90 \4255 3806 in_out_manager.F90 \ 4256 3807 ldfdyn_oce.F90 \ … … 4349 3900 KEY_CPP \ 4350 3901 dynzdf_imp.F90 4351 $(MODEL_LIB)(dynzdf_imp_jki.o) : \4352 $(MODEL_LIB)(cpl_oasis3.o) \4353 $(MODEL_LIB)(cpl_oasis4.o) \4354 $(MODEL_LIB)(daymod.o) \4355 $(MODEL_LIB)(dom_oce.o) \4356 $(MODEL_LIB)(geo2ocean.o) \4357 $(MODEL_LIB)(ice.o) \4358 $(MODEL_LIB)(in_out_manager.o) \4359 $(MODEL_LIB)(lbclnk.o) \4360 $(MODEL_LIB)(lib_print.o) \4361 $(MODEL_LIB)(par_kind.o) \4362 $(MODEL_LIB)(par_oce.o) \4363 $(MODEL_LIB)(phycst.o) \4364 cpl_oasis3.F90 \4365 cpl_oasis4.F90 \4366 daymod.F90 \4367 dom_oce.F90 \4368 geo2ocean.F90 \4369 ice.F90 \4370 in_out_manager.F90 \4371 lbclnk.F90 \4372 lib_print.f90 \4373 par_kind.F90 \4374 par_oce.F90 \4375 phycst.F90 \4376 $(MODEL_LIB)(dom_oce.o) \4377 $(MODEL_LIB)(in_out_manager.o) \4378 $(MODEL_LIB)(oce.o) \4379 $(MODEL_LIB)(phycst.o) \4380 $(MODEL_LIB)(taumod.o) \4381 $(MODEL_LIB)(zdf_oce.o) \4382 dom_oce.F90 \4383 in_out_manager.F90 \4384 oce.F90 \4385 phycst.F90 \4386 taumod.F90 \4387 zdf_oce.F90 \4388 domzgr_substitute.h90 \4389 vectopt_loop_substitute.h90 \4390 KEY_CPP \4391 dynzdf_imp_jki.F904392 3902 $(MODEL_LIB)(eosbn2.o) : \ 4393 3903 $(MODEL_LIB)(dom_oce.o) \ … … 5366 4876 $(MODEL_LIB)(domvvl.o) \ 5367 4877 $(MODEL_LIB)(dynspg_exp.o) \ 5368 $(MODEL_LIB)(dynspg_exp_jki.o) \5369 4878 $(MODEL_LIB)(dynspg_flt.o) \ 5370 $(MODEL_LIB)(dynspg_flt_jki.o) \5371 4879 $(MODEL_LIB)(dynspg_oce.o) \ 5372 4880 $(MODEL_LIB)(dynspg_rl.o) \ 5373 4881 $(MODEL_LIB)(dynspg_ts.o) \ 5374 $(MODEL_LIB)(dynspg_ts_jki.o) \5375 4882 $(MODEL_LIB)(dynvor.o) \ 5376 4883 $(MODEL_LIB)(eosbn2.o) \ … … 5420 4927 domvvl.F90 \ 5421 4928 dynspg_exp.F90 \ 5422 dynspg_exp_jki.F90 \5423 4929 dynspg_flt.F90 \ 5424 dynspg_flt_jki.F90 \5425 4930 dynspg_oce.F90 \ 5426 4931 dynspg_rl.F90 \ 5427 4932 dynspg_ts.F90 \ 5428 dynspg_ts_jki.F90 \5429 4933 dynvor.F90 \ 5430 4934 eosbn2.F90 \ … … 7429 6933 $(MODEL_LIB)(zdfric.o) \ 7430 6934 $(MODEL_LIB)(zdftke.o) \ 7431 $(MODEL_LIB)(zdftke_jki.o) \7432 6935 $(MODEL_LIB)(zpshde.o) \ 7433 6936 agrif_opa_sponge.F90 \ … … 7550 7053 zdfric.F90 \ 7551 7054 zdftke.F90 \ 7552 zdftke_jki.F90 \7553 7055 zpshde.F90 \ 7554 7056 $(MODEL_LIB)(cpl.o) \ … … 8008 7510 $(MODEL_LIB)(dynadv_cen2.o) \ 8009 7511 $(MODEL_LIB)(dynadv_ubs.o) \ 8010 $(MODEL_LIB)(dynhpg_jki.o) \8011 7512 $(MODEL_LIB)(dynkeg.o) \ 8012 7513 $(MODEL_LIB)(dynldf_bilap.o) \ … … 8015 7516 $(MODEL_LIB)(dynldf_lap.o) \ 8016 7517 $(MODEL_LIB)(dynspg_exp.o) \ 8017 $(MODEL_LIB)(dynspg_exp_jki.o) \8018 7518 $(MODEL_LIB)(dynspg_flt.o) \ 8019 $(MODEL_LIB)(dynspg_flt_jki.o) \8020 7519 $(MODEL_LIB)(dynspg_oce.o) \ 8021 7520 $(MODEL_LIB)(dynspg_rl.o) \ 8022 7521 $(MODEL_LIB)(dynspg_ts.o) \ 8023 $(MODEL_LIB)(dynspg_ts_jki.o) \8024 7522 $(MODEL_LIB)(dynzad.o) \ 8025 7523 $(MODEL_LIB)(dynzdf_exp.o) \ 8026 7524 $(MODEL_LIB)(dynzdf_imp.o) \ 8027 $(MODEL_LIB)(dynzdf_imp_jki.o) \8028 7525 $(MODEL_LIB)(eosbn2.o) \ 8029 7526 $(MODEL_LIB)(flo4rk.o) \ … … 8081 7578 $(MODEL_LIB)(taumod.o) \ 8082 7579 $(MODEL_LIB)(traadv_cen2.o) \ 8083 $(MODEL_LIB)(traadv_cen2_jki.o) \8084 7580 $(MODEL_LIB)(traadv_eiv.o) \ 8085 7581 $(MODEL_LIB)(traadv_muscl.o) \ … … 8098 7594 $(MODEL_LIB)(trazdf_exp.o) \ 8099 7595 $(MODEL_LIB)(trazdf_imp.o) \ 8100 $(MODEL_LIB)(trazdf_imp_jki.o) \8101 7596 $(MODEL_LIB)(trc_oce.o) \ 8102 7597 $(MODEL_LIB)(trdicp_oce.o) \ … … 8134 7629 dynadv_cen2.F90 \ 8135 7630 dynadv_ubs.F90 \ 8136 dynhpg_jki.F90 \8137 7631 dynkeg.F90 \ 8138 7632 dynldf_bilap.F90 \ … … 8141 7635 dynldf_lap.F90 \ 8142 7636 dynspg_exp.F90 \ 8143 dynspg_exp_jki.F90 \8144 7637 dynspg_flt.F90 \ 8145 dynspg_flt_jki.F90 \8146 7638 dynspg_oce.F90 \ 8147 7639 dynspg_rl.F90 \ 8148 7640 dynspg_ts.F90 \ 8149 dynspg_ts_jki.F90 \8150 7641 dynzad.F90 \ 8151 7642 dynzdf_exp.F90 \ 8152 7643 dynzdf_imp.F90 \ 8153 dynzdf_imp_jki.F90 \8154 7644 eosbn2.F90 \ 8155 7645 flo4rk.F90 \ … … 8207 7697 taumod.F90 \ 8208 7698 traadv_cen2.F90 \ 8209 traadv_cen2_jki.F90 \8210 7699 traadv_eiv.F90 \ 8211 7700 traadv_muscl.F90 \ … … 8224 7713 trazdf_exp.F90 \ 8225 7714 trazdf_imp.F90 \ 8226 trazdf_imp_jki.F90 \8227 7715 trc_oce.F90 \ 8228 7716 trdicp_oce.F90 \ … … 8319 7807 $(MODEL_LIB)(zdfric.o) \ 8320 7808 $(MODEL_LIB)(zdftke.o) \ 8321 $(MODEL_LIB)(zdftke_jki.o) \8322 7809 $(MODEL_LIB)(zpshde.o) \ 8323 7810 agrif_opa_sponge.F90 \ … … 8402 7889 zdfric.F90 \ 8403 7890 zdftke.F90 \ 8404 zdftke_jki.F90 \8405 7891 zpshde.F90 \ 8406 7892 domzgr_substitute.h90 \ … … 8432 7918 $(MODEL_LIB)(dynzdf_exp.o) \ 8433 7919 $(MODEL_LIB)(dynzdf_imp.o) \ 8434 $(MODEL_LIB)(dynzdf_imp_jki.o) \8435 7920 $(MODEL_LIB)(eosbn2.o) \ 8436 7921 $(MODEL_LIB)(flx_oce.o) \ … … 8469 7954 $(MODEL_LIB)(trazdf_exp.o) \ 8470 7955 $(MODEL_LIB)(trazdf_imp.o) \ 8471 $(MODEL_LIB)(trazdf_imp_jki.o) \8472 7956 $(MODEL_LIB)(trc_oce.o) \ 8473 7957 $(MODEL_LIB)(trdmld_oce.o) \ … … 8502 7986 dynzdf_exp.F90 \ 8503 7987 dynzdf_imp.F90 \ 8504 dynzdf_imp_jki.F90 \8505 7988 eosbn2.F90 \ 8506 7989 flx_oce.F90 \ … … 8539 8022 trazdf_exp.F90 \ 8540 8023 trazdf_imp.F90 \ 8541 trazdf_imp_jki.F90 \8542 8024 trc_oce.F90 \ 8543 8025 trdmld_oce.F90 \ … … 8825 8307 $(MODEL_LIB)(prtctl.o) \ 8826 8308 $(MODEL_LIB)(traadv_cen2.o) \ 8827 $(MODEL_LIB)(traadv_cen2_jki.o) \8828 8309 $(MODEL_LIB)(traadv_eiv.o) \ 8829 8310 $(MODEL_LIB)(traadv_muscl.o) \ … … 8839 8320 prtctl.F90 \ 8840 8321 traadv_cen2.F90 \ 8841 traadv_cen2_jki.F90 \8842 8322 traadv_eiv.F90 \ 8843 8323 traadv_muscl.F90 \ … … 8932 8412 KEY_CPP \ 8933 8413 traadv_cen2.F90 8934 $(MODEL_LIB)(traadv_cen2_jki.o) : \ 8414 $(MODEL_LIB)(traadv_eiv.o) : \ 8415 $(MODEL_LIB)(dom_oce.o) \ 8416 $(MODEL_LIB)(in_out_manager.o) \ 8417 $(MODEL_LIB)(lbclnk.o) \ 8418 $(MODEL_LIB)(ldfdyn_oce.o) \ 8419 $(MODEL_LIB)(ldftra_oce.o) \ 8420 $(MODEL_LIB)(lib_print.o) \ 8421 $(MODEL_LIB)(oce.o) \ 8422 $(MODEL_LIB)(par_kind.o) \ 8423 $(MODEL_LIB)(par_oce.o) \ 8424 $(MODEL_LIB)(phycst.o) \ 8425 $(MODEL_LIB)(prtctl.o) \ 8426 $(MODEL_LIB)(zdfmxl.o) \ 8427 dom_oce.F90 \ 8428 in_out_manager.F90 \ 8429 lbclnk.F90 \ 8430 ldfdyn_oce.F90 \ 8431 ldftra_oce.F90 \ 8432 lib_print.f90 \ 8433 oce.F90 \ 8434 par_kind.F90 \ 8435 par_oce.F90 \ 8436 phycst.F90 \ 8437 prtctl.F90 \ 8438 zdfmxl.F90 \ 8439 $(MODEL_LIB)(dom_oce.o) \ 8440 $(MODEL_LIB)(in_out_manager.o) \ 8441 $(MODEL_LIB)(ldfslp.o) \ 8442 $(MODEL_LIB)(ldftra_oce.o) \ 8443 $(MODEL_LIB)(oce.o) \ 8444 dom_oce.F90 \ 8445 in_out_manager.F90 \ 8446 ldfslp.F90 \ 8447 ldftra_oce.F90 \ 8448 oce.F90 \ 8449 domzgr_substitute.h90 \ 8450 ldfeiv_substitute.h90 \ 8451 ldftra_substitute.h90 \ 8452 vectopt_loop_substitute.h90 \ 8453 KEY_CPP \ 8454 traadv_eiv.F90 8455 $(MODEL_LIB)(traadv_muscl.o) : \ 8935 8456 $(MODEL_LIB)(daymod.o) \ 8936 8457 $(MODEL_LIB)(dianam.o) \ … … 8986 8507 $(MODEL_LIB)(dom_oce.o) \ 8987 8508 $(MODEL_LIB)(dynspg_oce.o) \ 8988 $(MODEL_LIB)(flxrnf.o) \ 8989 $(MODEL_LIB)(in_out_manager.o) \ 8990 $(MODEL_LIB)(lbclnk.o) \ 8991 $(MODEL_LIB)(lib_mpp.o) \ 8992 $(MODEL_LIB)(oce.o) \ 8993 $(MODEL_LIB)(ocfzpt.o) \ 8509 $(MODEL_LIB)(in_out_manager.o) \ 8510 $(MODEL_LIB)(lbclnk.o) \ 8511 $(MODEL_LIB)(lib_mpp.o) \ 8512 $(MODEL_LIB)(oce.o) \ 8994 8513 $(MODEL_LIB)(prtctl.o) \ 8995 8514 $(MODEL_LIB)(trabbl.o) \ … … 8999 8518 dom_oce.F90 \ 9000 8519 dynspg_oce.F90 \ 9001 flxrnf.F90 \ 9002 in_out_manager.F90 \ 9003 lbclnk.F90 \ 9004 lib_mpp.F90 \ 9005 oce.F90 \ 9006 ocfzpt.F90 \ 8520 in_out_manager.F90 \ 8521 lbclnk.F90 \ 8522 lib_mpp.F90 \ 8523 oce.F90 \ 9007 8524 prtctl.F90 \ 9008 8525 trabbl.F90 \ … … 9012 8529 vectopt_loop_substitute.h90 \ 9013 8530 KEY_CPP \ 9014 traadv_cen2_jki.F90 9015 $(MODEL_LIB)(traadv_eiv.o) : \ 9016 $(MODEL_LIB)(dom_oce.o) \ 9017 $(MODEL_LIB)(in_out_manager.o) \ 9018 $(MODEL_LIB)(lbclnk.o) \ 9019 $(MODEL_LIB)(ldfdyn_oce.o) \ 9020 $(MODEL_LIB)(ldftra_oce.o) \ 9021 $(MODEL_LIB)(lib_print.o) \ 9022 $(MODEL_LIB)(oce.o) \ 9023 $(MODEL_LIB)(par_kind.o) \ 9024 $(MODEL_LIB)(par_oce.o) \ 9025 $(MODEL_LIB)(phycst.o) \ 9026 $(MODEL_LIB)(prtctl.o) \ 9027 $(MODEL_LIB)(zdfmxl.o) \ 9028 dom_oce.F90 \ 9029 in_out_manager.F90 \ 9030 lbclnk.F90 \ 9031 ldfdyn_oce.F90 \ 9032 ldftra_oce.F90 \ 9033 lib_print.f90 \ 9034 oce.F90 \ 9035 par_kind.F90 \ 9036 par_oce.F90 \ 9037 phycst.F90 \ 9038 prtctl.F90 \ 9039 zdfmxl.F90 \ 9040 $(MODEL_LIB)(dom_oce.o) \ 9041 $(MODEL_LIB)(in_out_manager.o) \ 9042 $(MODEL_LIB)(ldfslp.o) \ 9043 $(MODEL_LIB)(ldftra_oce.o) \ 9044 $(MODEL_LIB)(oce.o) \ 9045 dom_oce.F90 \ 9046 in_out_manager.F90 \ 9047 ldfslp.F90 \ 9048 ldftra_oce.F90 \ 9049 oce.F90 \ 9050 domzgr_substitute.h90 \ 9051 ldfeiv_substitute.h90 \ 9052 ldftra_substitute.h90 \ 9053 vectopt_loop_substitute.h90 \ 9054 KEY_CPP \ 9055 traadv_eiv.F90 9056 $(MODEL_LIB)(traadv_muscl.o) : \ 8531 traadv_muscl.F90 8532 $(MODEL_LIB)(traadv_muscl2.o) : \ 9057 8533 $(MODEL_LIB)(daymod.o) \ 9058 8534 $(MODEL_LIB)(dianam.o) \ … … 9130 8606 vectopt_loop_substitute.h90 \ 9131 8607 KEY_CPP \ 9132 traadv_muscl .F909133 $(MODEL_LIB)(traadv_ muscl2.o) : \8608 traadv_muscl2.F90 8609 $(MODEL_LIB)(traadv_qck.o) : \ 9134 8610 $(MODEL_LIB)(daymod.o) \ 9135 8611 $(MODEL_LIB)(dianam.o) \ … … 9185 8661 $(MODEL_LIB)(dom_oce.o) \ 9186 8662 $(MODEL_LIB)(dynspg_oce.o) \ 9187 $(MODEL_LIB)(in_out_manager.o) \ 9188 $(MODEL_LIB)(lbclnk.o) \ 9189 $(MODEL_LIB)(lib_mpp.o) \ 9190 $(MODEL_LIB)(oce.o) \ 8663 $(MODEL_LIB)(flxrnf.o) \ 8664 $(MODEL_LIB)(in_out_manager.o) \ 8665 $(MODEL_LIB)(lbclnk.o) \ 8666 $(MODEL_LIB)(lib_mpp.o) \ 8667 $(MODEL_LIB)(oce.o) \ 8668 $(MODEL_LIB)(ocfzpt.o) \ 9191 8669 $(MODEL_LIB)(prtctl.o) \ 9192 8670 $(MODEL_LIB)(trabbl.o) \ … … 9196 8674 dom_oce.F90 \ 9197 8675 dynspg_oce.F90 \ 9198 in_out_manager.F90 \ 9199 lbclnk.F90 \ 9200 lib_mpp.F90 \ 9201 oce.F90 \ 8676 flxrnf.F90 \ 8677 in_out_manager.F90 \ 8678 lbclnk.F90 \ 8679 lib_mpp.F90 \ 8680 oce.F90 \ 8681 ocfzpt.F90 \ 9202 8682 prtctl.F90 \ 9203 8683 trabbl.F90 \ … … 9207 8687 vectopt_loop_substitute.h90 \ 9208 8688 KEY_CPP \ 9209 traadv_ muscl2.F909210 $(MODEL_LIB)(traadv_ qck.o) : \8689 traadv_qck.F90 8690 $(MODEL_LIB)(traadv_tvd.o) : \ 9211 8691 $(MODEL_LIB)(daymod.o) \ 9212 8692 $(MODEL_LIB)(dianam.o) \ … … 9262 8742 $(MODEL_LIB)(dom_oce.o) \ 9263 8743 $(MODEL_LIB)(dynspg_oce.o) \ 9264 $(MODEL_LIB)(flxrnf.o) \9265 $(MODEL_LIB)(in_out_manager.o) \9266 $(MODEL_LIB)(lbclnk.o) \9267 $(MODEL_LIB)(lib_mpp.o) \9268 $(MODEL_LIB)(oce.o) \9269 $(MODEL_LIB)(ocfzpt.o) \9270 $(MODEL_LIB)(prtctl.o) \9271 $(MODEL_LIB)(trabbl.o) \9272 $(MODEL_LIB)(trdmod.o) \9273 $(MODEL_LIB)(trdmod_oce.o) \9274 diaptr.F90 \9275 dom_oce.F90 \9276 dynspg_oce.F90 \9277 flxrnf.F90 \9278 in_out_manager.F90 \9279 lbclnk.F90 \9280 lib_mpp.F90 \9281 oce.F90 \9282 ocfzpt.F90 \9283 prtctl.F90 \9284 trabbl.F90 \9285 trdmod.F90 \9286 trdmod_oce.F90 \9287 domzgr_substitute.h90 \9288 vectopt_loop_substitute.h90 \9289 KEY_CPP \9290 traadv_qck.F909291 $(MODEL_LIB)(traadv_tvd.o) : \9292 $(MODEL_LIB)(daymod.o) \9293 $(MODEL_LIB)(dianam.o) \9294 $(MODEL_LIB)(dom_oce.o) \9295 $(MODEL_LIB)(eosbn2.o) \9296 $(MODEL_LIB)(in_out_manager.o) \9297 $(MODEL_LIB)(iom.o) \9298 $(MODEL_LIB)(lbclnk.o) \9299 $(MODEL_LIB)(ldftra_oce.o) \9300 $(MODEL_LIB)(lib_mpp.o) \9301 $(MODEL_LIB)(lib_print.o) \9302 $(MODEL_LIB)(oce.o) \9303 $(MODEL_LIB)(par_kind.o) \9304 $(MODEL_LIB)(par_oce.o) \9305 $(MODEL_LIB)(phycst.o) \9306 $(MODEL_LIB)(prtctl.o) \9307 $(MODEL_LIB)(taumod.o) \9308 $(MODEL_LIB)(trdicp.o) \9309 $(MODEL_LIB)(trdicp_oce.o) \9310 $(MODEL_LIB)(trdmld.o) \9311 $(MODEL_LIB)(trdmld_oce.o) \9312 $(MODEL_LIB)(trdmod.o) \9313 $(MODEL_LIB)(trdmod_oce.o) \9314 $(MODEL_LIB)(trdvor.o) \9315 $(MODEL_LIB)(trdvor_oce.o) \9316 $(MODEL_LIB)(zdf_oce.o) \9317 daymod.F90 \9318 dianam.F90 \9319 dom_oce.F90 \9320 eosbn2.F90 \9321 in_out_manager.F90 \9322 iom.F90 \9323 lbclnk.F90 \9324 ldftra_oce.F90 \9325 lib_mpp.F90 \9326 lib_print.f90 \9327 oce.F90 \9328 par_kind.F90 \9329 par_oce.F90 \9330 phycst.F90 \9331 prtctl.F90 \9332 taumod.F90 \9333 trdicp.F90 \9334 trdicp_oce.F90 \9335 trdmld.F90 \9336 trdmld_oce.F90 \9337 trdmod.F90 \9338 trdmod_oce.F90 \9339 trdvor.F90 \9340 trdvor_oce.F90 \9341 zdf_oce.F90 \9342 $(MODEL_LIB)(diaptr.o) \9343 $(MODEL_LIB)(dom_oce.o) \9344 $(MODEL_LIB)(dynspg_oce.o) \9345 8744 $(MODEL_LIB)(in_out_manager.o) \ 9346 8745 $(MODEL_LIB)(lbclnk.o) \ … … 9670 9069 $(MODEL_LIB)(trazdf_exp.o) \ 9671 9070 $(MODEL_LIB)(trazdf_imp.o) \ 9672 $(MODEL_LIB)(trazdf_imp_jki.o) \9673 9071 $(MODEL_LIB)(trdicp.o) \ 9674 9072 $(MODEL_LIB)(trdicp_oce.o) \ … … 9703 9101 trazdf_exp.F90 \ 9704 9102 trazdf_imp.F90 \ 9705 trazdf_imp_jki.F90 \9706 9103 trdicp.F90 \ 9707 9104 trdicp_oce.F90 \ … … 10501 9898 $(MODEL_LIB)(trazdf_exp.o) \ 10502 9899 $(MODEL_LIB)(trazdf_imp.o) \ 10503 $(MODEL_LIB)(trazdf_imp_jki.o) \10504 9900 $(MODEL_LIB)(trdmod.o) \ 10505 9901 $(MODEL_LIB)(trdmod_oce.o) \ … … 10519 9915 trazdf_exp.F90 \ 10520 9916 trazdf_imp.F90 \ 10521 trazdf_imp_jki.F90 \10522 9917 trdmod.F90 \ 10523 9918 trdmod_oce.F90 \ … … 10670 10065 KEY_CPP \ 10671 10066 trazdf_imp.F90 10672 $(MODEL_LIB)(trazdf_imp_jki.o) : \10673 $(MODEL_LIB)(dom_oce.o) \10674 $(MODEL_LIB)(in_out_manager.o) \10675 $(MODEL_LIB)(lbclnk.o) \10676 $(MODEL_LIB)(ldfdyn_oce.o) \10677 $(MODEL_LIB)(ldftra_oce.o) \10678 $(MODEL_LIB)(lib_mpp.o) \10679 $(MODEL_LIB)(lib_print.o) \10680 $(MODEL_LIB)(oce.o) \10681 $(MODEL_LIB)(par_kind.o) \10682 $(MODEL_LIB)(par_oce.o) \10683 $(MODEL_LIB)(phycst.o) \10684 $(MODEL_LIB)(prtctl.o) \10685 $(MODEL_LIB)(taumod.o) \10686 $(MODEL_LIB)(trdicp.o) \10687 $(MODEL_LIB)(trdicp_oce.o) \10688 $(MODEL_LIB)(trdmld.o) \10689 $(MODEL_LIB)(trdmld_oce.o) \10690 $(MODEL_LIB)(trdmod_oce.o) \10691 $(MODEL_LIB)(trdvor.o) \10692 $(MODEL_LIB)(trdvor_oce.o) \10693 $(MODEL_LIB)(zdf_oce.o) \10694 $(MODEL_LIB)(zdfmxl.o) \10695 dom_oce.F90 \10696 in_out_manager.F90 \10697 lbclnk.F90 \10698 ldfdyn_oce.F90 \10699 ldftra_oce.F90 \10700 lib_mpp.F90 \10701 lib_print.f90 \10702 oce.F90 \10703 par_kind.F90 \10704 par_oce.F90 \10705 phycst.F90 \10706 prtctl.F90 \10707 taumod.F90 \10708 trdicp.F90 \10709 trdicp_oce.F90 \10710 trdmld.F90 \10711 trdmld_oce.F90 \10712 trdmod_oce.F90 \10713 trdvor.F90 \10714 trdvor_oce.F90 \10715 zdf_oce.F90 \10716 zdfmxl.F90 \10717 $(MODEL_LIB)(dom_oce.o) \10718 $(MODEL_LIB)(in_out_manager.o) \10719 $(MODEL_LIB)(lbclnk.o) \10720 $(MODEL_LIB)(ldfslp.o) \10721 $(MODEL_LIB)(ldftra_oce.o) \10722 $(MODEL_LIB)(oce.o) \10723 $(MODEL_LIB)(prtctl.o) \10724 $(MODEL_LIB)(trdmod.o) \10725 $(MODEL_LIB)(trdmod_oce.o) \10726 $(MODEL_LIB)(zdf_oce.o) \10727 $(MODEL_LIB)(zdfddm.o) \10728 dom_oce.F90 \10729 in_out_manager.F90 \10730 lbclnk.F90 \10731 ldfslp.F90 \10732 ldftra_oce.F90 \10733 oce.F90 \10734 prtctl.F90 \10735 trdmod.F90 \10736 trdmod_oce.F90 \10737 zdf_oce.F90 \10738 zdfddm.F90 \10739 domzgr_substitute.h90 \10740 ldftra_substitute.h90 \10741 zdf.matrixsolver.h90 \10742 zdfddm_substitute.h90 \10743 KEY_CPP \10744 trazdf_imp_jki.F9010745 10067 $(MODEL_LIB)(trc_oce.o) : \ 10746 10068 $(MODEL_LIB)(par_kind.o) \ … … 11630 10952 KEY_CPP \ 11631 10953 zdftke.F90 11632 $(MODEL_LIB)(zdftke_jki.o) : \11633 $(MODEL_LIB)(blk_oce.o) \11634 $(MODEL_LIB)(cpl_oasis3.o) \11635 $(MODEL_LIB)(cpl_oasis4.o) \11636 $(MODEL_LIB)(cpl_oce.o) \11637 $(MODEL_LIB)(daymod.o) \11638 $(MODEL_LIB)(dom_oce.o) \11639 $(MODEL_LIB)(dynzdf_exp.o) \11640 $(MODEL_LIB)(eosbn2.o) \11641 $(MODEL_LIB)(geo2ocean.o) \11642 $(MODEL_LIB)(ice.o) \11643 $(MODEL_LIB)(ice_oce.o) \11644 $(MODEL_LIB)(in_out_manager.o) \11645 $(MODEL_LIB)(ini1d.o) \11646 $(MODEL_LIB)(iom.o) \11647 $(MODEL_LIB)(lbclnk.o) \11648 $(MODEL_LIB)(lib_mpp.o) \11649 $(MODEL_LIB)(lib_print.o) \11650 $(MODEL_LIB)(oce.o) \11651 $(MODEL_LIB)(par_kind.o) \11652 $(MODEL_LIB)(par_oce.o) \11653 $(MODEL_LIB)(phycst.o) \11654 $(MODEL_LIB)(prtctl.o) \11655 $(MODEL_LIB)(restart.o) \11656 $(MODEL_LIB)(taumod.o) \11657 $(MODEL_LIB)(trazdf_exp.o) \11658 $(MODEL_LIB)(trdmld_oce.o) \11659 $(MODEL_LIB)(zdf_oce.o) \11660 $(MODEL_LIB)(zpshde.o) \11661 blk_oce.F90 \11662 cpl_oasis3.F90 \11663 cpl_oasis4.F90 \11664 cpl_oce.F90 \11665 daymod.F90 \11666 dom_oce.F90 \11667 dynzdf_exp.F90 \11668 eosbn2.F90 \11669 geo2ocean.F90 \11670 ice.F90 \11671 ice_oce.F90 \11672 in_out_manager.F90 \11673 ini1d.F90 \11674 iom.F90 \11675 lbclnk.F90 \11676 lib_mpp.F90 \11677 lib_print.f90 \11678 oce.F90 \11679 par_kind.F90 \11680 par_oce.F90 \11681 phycst.F90 \11682 prtctl.F90 \11683 restart.F90 \11684 taumod.F90 \11685 trazdf_exp.F90 \11686 trdmld_oce.F90 \11687 zdf_oce.F90 \11688 zpshde.F90 \11689 $(MODEL_LIB)(dom_oce.o) \11690 $(MODEL_LIB)(in_out_manager.o) \11691 $(MODEL_LIB)(lbclnk.o) \11692 $(MODEL_LIB)(oce.o) \11693 $(MODEL_LIB)(phycst.o) \11694 $(MODEL_LIB)(prtctl.o) \11695 $(MODEL_LIB)(restart.o) \11696 $(MODEL_LIB)(taumod.o) \11697 $(MODEL_LIB)(zdf_oce.o) \11698 $(MODEL_LIB)(zdftke.o) \11699 dom_oce.F90 \11700 in_out_manager.F90 \11701 lbclnk.F90 \11702 oce.F90 \11703 phycst.F90 \11704 prtctl.F90 \11705 restart.F90 \11706 taumod.F90 \11707 zdf_oce.F90 \11708 zdftke.F90 \11709 domzgr_substitute.h90 \11710 vectopt_loop_substitute.h90 \11711 KEY_CPP \11712 zdftke_jki.F9011713 10954 $(MODEL_LIB)(zpshde.o) : \ 11714 10955 $(MODEL_LIB)(dom_oce.o) \ -
trunk/CONFIG/ORCA2_LIM/scripts/BB_make
r784 r789 120 120 key_mpp_dyndist \ 121 121 key_mpp_mpi \ 122 key_mpp_omp \123 122 key_mpp_shmem \ 124 123 key_noslip_accurate \ … … 213 212 $(MODEL_LIB)(dyncor1d.o)\ 214 213 $(MODEL_LIB)(dynhpg.o)\ 215 $(MODEL_LIB)(dynhpg_jki.o)\216 214 $(MODEL_LIB)(dynkeg.o)\ 217 215 $(MODEL_LIB)(dynldf.o)\ … … 224 222 $(MODEL_LIB)(dynspg.o)\ 225 223 $(MODEL_LIB)(dynspg_exp.o)\ 226 $(MODEL_LIB)(dynspg_exp_jki.o)\227 224 $(MODEL_LIB)(dynspg_flt.o)\ 228 $(MODEL_LIB)(dynspg_flt_jki.o)\229 225 $(MODEL_LIB)(dynspg_oce.o)\ 230 226 $(MODEL_LIB)(dynspg_rl.o)\ 231 227 $(MODEL_LIB)(dynspg_ts.o)\ 232 $(MODEL_LIB)(dynspg_ts_jki.o)\233 228 $(MODEL_LIB)(dynvor.o)\ 234 229 $(MODEL_LIB)(dynzad.o)\ … … 236 231 $(MODEL_LIB)(dynzdf_exp.o)\ 237 232 $(MODEL_LIB)(dynzdf_imp.o)\ 238 $(MODEL_LIB)(dynzdf_imp_jki.o)\239 233 $(MODEL_LIB)(eosbn2.o)\ 240 234 $(MODEL_LIB)(flo4rk.o)\ … … 330 324 $(MODEL_LIB)(traadv.o)\ 331 325 $(MODEL_LIB)(traadv_cen2.o)\ 332 $(MODEL_LIB)(traadv_cen2_jki.o)\333 326 $(MODEL_LIB)(traadv_eiv.o)\ 334 327 $(MODEL_LIB)(traadv_muscl.o)\ … … 352 345 $(MODEL_LIB)(trazdf_exp.o)\ 353 346 $(MODEL_LIB)(trazdf_imp.o)\ 354 $(MODEL_LIB)(trazdf_imp_jki.o)\355 347 $(MODEL_LIB)(trc_oce.o)\ 356 348 $(MODEL_LIB)(trcstp.o)\ … … 374 366 $(MODEL_LIB)(zdfric.o)\ 375 367 $(MODEL_LIB)(zdftke.o)\ 376 $(MODEL_LIB)(zdftke_jki.o)\377 368 $(MODEL_LIB)(zpshde.o) 378 369 … … 2772 2763 $(MODEL_LIB)(dom_oce.o) \ 2773 2764 $(MODEL_LIB)(in_out_manager.o) \ 2774 $(MODEL_LIB)(lbclnk.o) \2775 2765 $(MODEL_LIB)(ldftra_oce.o) \ 2776 2766 $(MODEL_LIB)(lib_mpp.o) \ … … 2791 2781 dom_oce.F90 \ 2792 2782 in_out_manager.F90 \ 2793 lbclnk.F90 \2794 2783 ldftra_oce.F90 \ 2795 2784 lib_mpp.F90 \ … … 2809 2798 zdf_oce.F90 \ 2810 2799 $(MODEL_LIB)(dom_oce.o) \ 2811 $(MODEL_LIB)(dynhpg_jki.o) \2812 2800 $(MODEL_LIB)(in_out_manager.o) \ 2813 2801 $(MODEL_LIB)(lbclnk.o) \ … … 2818 2806 $(MODEL_LIB)(trdmod_oce.o) \ 2819 2807 dom_oce.F90 \ 2820 dynhpg_jki.F90 \2821 2808 in_out_manager.F90 \ 2822 2809 lbclnk.F90 \ … … 2830 2817 KEY_CPP \ 2831 2818 dynhpg.F90 2832 $(MODEL_LIB)(dynhpg_jki.o) : \2833 $(MODEL_LIB)(dom_oce.o) \2834 $(MODEL_LIB)(in_out_manager.o) \2835 $(MODEL_LIB)(lib_mpp.o) \2836 $(MODEL_LIB)(lib_print.o) \2837 $(MODEL_LIB)(oce.o) \2838 $(MODEL_LIB)(par_kind.o) \2839 $(MODEL_LIB)(par_oce.o) \2840 dom_oce.F90 \2841 in_out_manager.F90 \2842 lib_mpp.F90 \2843 lib_print.f90 \2844 oce.F90 \2845 par_kind.F90 \2846 par_oce.F90 \2847 $(MODEL_LIB)(dom_oce.o) \2848 $(MODEL_LIB)(in_out_manager.o) \2849 $(MODEL_LIB)(lbclnk.o) \2850 $(MODEL_LIB)(oce.o) \2851 $(MODEL_LIB)(phycst.o) \2852 dom_oce.F90 \2853 in_out_manager.F90 \2854 lbclnk.F90 \2855 oce.F90 \2856 phycst.F90 \2857 domzgr_substitute.h90 \2858 vectopt_loop_substitute.h90 \2859 KEY_CPP \2860 dynhpg_jki.F902861 2819 $(MODEL_LIB)(dynkeg.o) : \ 2862 2820 $(MODEL_LIB)(dom_oce.o) \ … … 3358 3316 $(MODEL_LIB)(dom_oce.o) \ 3359 3317 $(MODEL_LIB)(domvvl.o) \ 3360 $(MODEL_LIB)(dynspg_exp.o) \3361 $(MODEL_LIB)(dynspg_flt.o) \3362 3318 $(MODEL_LIB)(dynspg_oce.o) \ 3363 $(MODEL_LIB)(dynspg_ts.o) \3364 3319 $(MODEL_LIB)(dynvor.o) \ 3365 3320 $(MODEL_LIB)(flxrnf.o) \ … … 3404 3359 dom_oce.F90 \ 3405 3360 domvvl.F90 \ 3406 dynspg_exp.F90 \3407 dynspg_flt.F90 \3408 3361 dynspg_oce.F90 \ 3409 dynspg_ts.F90 \3410 3362 dynvor.F90 \ 3411 3363 flxrnf.F90 \ … … 3448 3400 $(MODEL_LIB)(dom_oce.o) \ 3449 3401 $(MODEL_LIB)(dynspg_exp.o) \ 3450 $(MODEL_LIB)(dynspg_exp_jki.o) \3451 3402 $(MODEL_LIB)(dynspg_flt.o) \ 3452 $(MODEL_LIB)(dynspg_flt_jki.o) \3453 3403 $(MODEL_LIB)(dynspg_oce.o) \ 3454 3404 $(MODEL_LIB)(dynspg_rl.o) \ 3455 3405 $(MODEL_LIB)(dynspg_ts.o) \ 3456 $(MODEL_LIB)(dynspg_ts_jki.o) \3457 3406 $(MODEL_LIB)(in_out_manager.o) \ 3458 3407 $(MODEL_LIB)(obc_oce.o) \ … … 3463 3412 dom_oce.F90 \ 3464 3413 dynspg_exp.F90 \ 3465 dynspg_exp_jki.F90 \3466 3414 dynspg_flt.F90 \ 3467 dynspg_flt_jki.F90 \3468 3415 dynspg_oce.F90 \ 3469 3416 dynspg_rl.F90 \ 3470 3417 dynspg_ts.F90 \ 3471 dynspg_ts_jki.F90 \3472 3418 in_out_manager.F90 \ 3473 3419 obc_oce.F90 \ … … 3585 3531 KEY_CPP \ 3586 3532 dynspg_exp.F90 3587 $(MODEL_LIB)(dynspg_exp_jki.o) : \3588 $(MODEL_LIB)(blk_oce.o) \3589 $(MODEL_LIB)(cpl_oce.o) \3590 $(MODEL_LIB)(daymod.o) \3591 $(MODEL_LIB)(dom_oce.o) \3592 $(MODEL_LIB)(dtasal.o) \3593 $(MODEL_LIB)(dtasss.o) \3594 $(MODEL_LIB)(dtasst.o) \3595 $(MODEL_LIB)(dtatem.o) \3596 $(MODEL_LIB)(dynspg_oce.o) \3597 $(MODEL_LIB)(eosbn2.o) \3598 $(MODEL_LIB)(flx_oce.o) \3599 $(MODEL_LIB)(flxmod.o) \3600 $(MODEL_LIB)(flxrnf.o) \3601 $(MODEL_LIB)(ice_oce.o) \3602 $(MODEL_LIB)(in_out_manager.o) \3603 $(MODEL_LIB)(ini1d.o) \3604 $(MODEL_LIB)(iom.o) \3605 $(MODEL_LIB)(lbclnk.o) \3606 $(MODEL_LIB)(lib_mpp.o) \3607 $(MODEL_LIB)(lib_print.o) \3608 $(MODEL_LIB)(obc_oce.o) \3609 $(MODEL_LIB)(obc_par.o) \3610 $(MODEL_LIB)(obccli.o) \3611 $(MODEL_LIB)(obcdta.o) \3612 $(MODEL_LIB)(oce.o) \3613 $(MODEL_LIB)(ocesbc.o) \3614 $(MODEL_LIB)(ocfzpt.o) \3615 $(MODEL_LIB)(par_kind.o) \3616 $(MODEL_LIB)(par_oce.o) \3617 $(MODEL_LIB)(phycst.o) \3618 $(MODEL_LIB)(prtctl.o) \3619 $(MODEL_LIB)(restart.o) \3620 $(MODEL_LIB)(taumod.o) \3621 $(MODEL_LIB)(tradmp.o) \3622 $(MODEL_LIB)(trdmld_oce.o) \3623 $(MODEL_LIB)(zpshde.o) \3624 blk_oce.F90 \3625 cpl_oce.F90 \3626 daymod.F90 \3627 dom_oce.F90 \3628 dtasal.F90 \3629 dtasss.F90 \3630 dtasst.F90 \3631 dtatem.F90 \3632 dynspg_oce.F90 \3633 eosbn2.F90 \3634 flx_oce.F90 \3635 flxmod.F90 \3636 flxrnf.F90 \3637 ice_oce.F90 \3638 in_out_manager.F90 \3639 ini1d.F90 \3640 iom.F90 \3641 lbclnk.F90 \3642 lib_mpp.F90 \3643 lib_print.f90 \3644 obc_oce.F90 \3645 obc_par.F90 \3646 obccli.F90 \3647 obcdta.F90 \3648 oce.F90 \3649 ocesbc.F90 \3650 ocfzpt.F90 \3651 par_kind.F90 \3652 par_oce.F90 \3653 phycst.F90 \3654 prtctl.F90 \3655 restart.F90 \3656 taumod.F90 \3657 tradmp.F90 \3658 trdmld_oce.F90 \3659 zpshde.F90 \3660 $(MODEL_LIB)(dom_oce.o) \3661 $(MODEL_LIB)(dynspg_exp.o) \3662 $(MODEL_LIB)(in_out_manager.o) \3663 $(MODEL_LIB)(lbclnk.o) \3664 $(MODEL_LIB)(lib_mpp.o) \3665 $(MODEL_LIB)(obc_oce.o) \3666 $(MODEL_LIB)(obc_par.o) \3667 $(MODEL_LIB)(obcdta.o) \3668 $(MODEL_LIB)(oce.o) \3669 $(MODEL_LIB)(ocesbc.o) \3670 $(MODEL_LIB)(phycst.o) \3671 $(MODEL_LIB)(prtctl.o) \3672 $(MODEL_LIB)(restart.o) \3673 dom_oce.F90 \3674 dynspg_exp.F90 \3675 in_out_manager.F90 \3676 lbclnk.F90 \3677 lib_mpp.F90 \3678 obc_oce.F90 \3679 obc_par.F90 \3680 obcdta.F90 \3681 oce.F90 \3682 ocesbc.F90 \3683 phycst.F90 \3684 prtctl.F90 \3685 restart.F90 \3686 domzgr_substitute.h90 \3687 vectopt_loop_substitute.h90 \3688 KEY_CPP \3689 dynspg_exp_jki.F903690 3533 $(MODEL_LIB)(dynspg_flt.o) : \ 3691 3534 $(MODEL_LIB)(agrif_oce.o) \ … … 3840 3683 KEY_CPP \ 3841 3684 dynspg_flt.F90 3842 $(MODEL_LIB)(dynspg_flt_jki.o) : \3843 $(MODEL_LIB)(agrif_oce.o) \3844 $(MODEL_LIB)(agrif_opa_interp.o) \3845 $(MODEL_LIB)(blk_oce.o) \3846 $(MODEL_LIB)(cla_dynspg.o) \3847 $(MODEL_LIB)(cpl_oce.o) \3848 $(MODEL_LIB)(daymod.o) \3849 $(MODEL_LIB)(dom_oce.o) \3850 $(MODEL_LIB)(domvvl.o) \3851 $(MODEL_LIB)(dtasal.o) \3852 $(MODEL_LIB)(dtasss.o) \3853 $(MODEL_LIB)(dtasst.o) \3854 $(MODEL_LIB)(dtatem.o) \3855 $(MODEL_LIB)(dynspg_oce.o) \3856 $(MODEL_LIB)(eosbn2.o) \3857 $(MODEL_LIB)(flx_oce.o) \3858 $(MODEL_LIB)(flxmod.o) \3859 $(MODEL_LIB)(flxrnf.o) \3860 $(MODEL_LIB)(ice_oce.o) \3861 $(MODEL_LIB)(in_out_manager.o) \3862 $(MODEL_LIB)(ini1d.o) \3863 $(MODEL_LIB)(iom.o) \3864 $(MODEL_LIB)(iom_def.o) \3865 $(MODEL_LIB)(iom_ioipsl.o) \3866 $(MODEL_LIB)(iom_nf90.o) \3867 $(MODEL_LIB)(iom_rstdimg.o) \3868 $(MODEL_LIB)(lbclnk.o) \3869 $(MODEL_LIB)(lib_feti.o) \3870 $(MODEL_LIB)(lib_mpp.o) \3871 $(MODEL_LIB)(lib_print.o) \3872 $(MODEL_LIB)(obc_oce.o) \3873 $(MODEL_LIB)(obc_par.o) \3874 $(MODEL_LIB)(obccli.o) \3875 $(MODEL_LIB)(obcdyn.o) \3876 $(MODEL_LIB)(obcvol.o) \3877 $(MODEL_LIB)(oce.o) \3878 $(MODEL_LIB)(ocesbc.o) \3879 $(MODEL_LIB)(ocfzpt.o) \3880 $(MODEL_LIB)(par_kind.o) \3881 $(MODEL_LIB)(par_oce.o) \3882 $(MODEL_LIB)(phycst.o) \3883 $(MODEL_LIB)(prtctl.o) \3884 $(MODEL_LIB)(restart.o) \3885 $(MODEL_LIB)(sol_oce.o) \3886 $(MODEL_LIB)(solfet.o) \3887 $(MODEL_LIB)(solisl.o) \3888 $(MODEL_LIB)(solmat.o) \3889 $(MODEL_LIB)(solpcg.o) \3890 $(MODEL_LIB)(solsor.o) \3891 $(MODEL_LIB)(solver.o) \3892 $(MODEL_LIB)(taumod.o) \3893 $(MODEL_LIB)(tradmp.o) \3894 $(MODEL_LIB)(trdmld_oce.o) \3895 $(MODEL_LIB)(zdf_oce.o) \3896 $(MODEL_LIB)(zpshde.o) \3897 agrif_oce.F90 \3898 agrif_opa_interp.F90 \3899 blk_oce.F90 \3900 cla_dynspg.F90 \3901 cpl_oce.F90 \3902 daymod.F90 \3903 dom_oce.F90 \3904 domvvl.F90 \3905 dtasal.F90 \3906 dtasss.F90 \3907 dtasst.F90 \3908 dtatem.F90 \3909 dynspg_oce.F90 \3910 eosbn2.F90 \3911 flx_oce.F90 \3912 flxmod.F90 \3913 flxrnf.F90 \3914 ice_oce.F90 \3915 in_out_manager.F90 \3916 ini1d.F90 \3917 iom.F90 \3918 iom_def.F90 \3919 iom_ioipsl.F90 \3920 iom_nf90.F90 \3921 iom_rstdimg.F90 \3922 lbclnk.F90 \3923 lib_feti.F90 \3924 lib_mpp.F90 \3925 lib_print.f90 \3926 obc_oce.F90 \3927 obc_par.F90 \3928 obccli.F90 \3929 obcdyn.F90 \3930 obcvol.F90 \3931 oce.F90 \3932 ocesbc.F90 \3933 ocfzpt.F90 \3934 par_kind.F90 \3935 par_oce.F90 \3936 phycst.F90 \3937 prtctl.F90 \3938 restart.F90 \3939 sol_oce.F90 \3940 solfet.F90 \3941 solisl.F90 \3942 solmat.F90 \3943 solpcg.F90 \3944 solsor.F90 \3945 solver.F90 \3946 taumod.F90 \3947 tradmp.F90 \3948 trdmld_oce.F90 \3949 zdf_oce.F90 \3950 zpshde.F90 \3951 $(MODEL_LIB)(agrif_opa_interp.o) \3952 $(MODEL_LIB)(cla_dynspg.o) \3953 $(MODEL_LIB)(dom_oce.o) \3954 $(MODEL_LIB)(dynspg_flt.o) \3955 $(MODEL_LIB)(flxrnf.o) \3956 $(MODEL_LIB)(in_out_manager.o) \3957 $(MODEL_LIB)(iom.o) \3958 $(MODEL_LIB)(lbclnk.o) \3959 $(MODEL_LIB)(lib_mpp.o) \3960 $(MODEL_LIB)(obc_oce.o) \3961 $(MODEL_LIB)(obcdyn.o) \3962 $(MODEL_LIB)(obcvol.o) \3963 $(MODEL_LIB)(oce.o) \3964 $(MODEL_LIB)(ocesbc.o) \3965 $(MODEL_LIB)(phycst.o) \3966 $(MODEL_LIB)(prtctl.o) \3967 $(MODEL_LIB)(restart.o) \3968 $(MODEL_LIB)(sol_oce.o) \3969 $(MODEL_LIB)(solfet.o) \3970 $(MODEL_LIB)(solmat.o) \3971 $(MODEL_LIB)(solpcg.o) \3972 $(MODEL_LIB)(solsor.o) \3973 $(MODEL_LIB)(solver.o) \3974 $(MODEL_LIB)(zdf_oce.o) \3975 agrif_opa_interp.F90 \3976 cla_dynspg.F90 \3977 dom_oce.F90 \3978 dynspg_flt.F90 \3979 flxrnf.F90 \3980 in_out_manager.F90 \3981 iom.F90 \3982 lbclnk.F90 \3983 lib_mpp.F90 \3984 obc_oce.F90 \3985 obcdyn.F90 \3986 obcvol.F90 \3987 oce.F90 \3988 ocesbc.F90 \3989 phycst.F90 \3990 prtctl.F90 \3991 restart.F90 \3992 sol_oce.F90 \3993 solfet.F90 \3994 solmat.F90 \3995 solpcg.F90 \3996 solsor.F90 \3997 solver.F90 \3998 zdf_oce.F90 \3999 domzgr_substitute.h90 \4000 $(AGRIF_LIB) \4001 KEY_CPP \4002 dynspg_flt_jki.F904003 3685 $(MODEL_LIB)(dynspg_oce.o) : \ 4004 3686 $(MODEL_LIB)(par_kind.o) \ … … 4237 3919 KEY_CPP \ 4238 3920 dynspg_ts.F90 4239 $(MODEL_LIB)(dynspg_ts_jki.o) : \4240 $(MODEL_LIB)(blk_oce.o) \4241 $(MODEL_LIB)(cpl_oce.o) \4242 $(MODEL_LIB)(daymod.o) \4243 $(MODEL_LIB)(dom_oce.o) \4244 $(MODEL_LIB)(domvvl.o) \4245 $(MODEL_LIB)(dtasal.o) \4246 $(MODEL_LIB)(dtasss.o) \4247 $(MODEL_LIB)(dtasst.o) \4248 $(MODEL_LIB)(dtatem.o) \4249 $(MODEL_LIB)(dynadv.o) \4250 $(MODEL_LIB)(dynspg_oce.o) \4251 $(MODEL_LIB)(dynvor.o) \4252 $(MODEL_LIB)(eosbn2.o) \4253 $(MODEL_LIB)(flx_oce.o) \4254 $(MODEL_LIB)(flxmod.o) \4255 $(MODEL_LIB)(flxrnf.o) \4256 $(MODEL_LIB)(ice_oce.o) \4257 $(MODEL_LIB)(in_out_manager.o) \4258 $(MODEL_LIB)(ini1d.o) \4259 $(MODEL_LIB)(iom.o) \4260 $(MODEL_LIB)(iom_def.o) \4261 $(MODEL_LIB)(iom_ioipsl.o) \4262 $(MODEL_LIB)(iom_nf90.o) \4263 $(MODEL_LIB)(iom_rstdimg.o) \4264 $(MODEL_LIB)(lbclnk.o) \4265 $(MODEL_LIB)(lib_mpp.o) \4266 $(MODEL_LIB)(lib_print.o) \4267 $(MODEL_LIB)(obc_oce.o) \4268 $(MODEL_LIB)(obc_par.o) \4269 $(MODEL_LIB)(obccli.o) \4270 $(MODEL_LIB)(obcdta.o) \4271 $(MODEL_LIB)(obcfla.o) \4272 $(MODEL_LIB)(oce.o) \4273 $(MODEL_LIB)(ocesbc.o) \4274 $(MODEL_LIB)(ocfzpt.o) \4275 $(MODEL_LIB)(par_kind.o) \4276 $(MODEL_LIB)(par_oce.o) \4277 $(MODEL_LIB)(phycst.o) \4278 $(MODEL_LIB)(prtctl.o) \4279 $(MODEL_LIB)(restart.o) \4280 $(MODEL_LIB)(taumod.o) \4281 $(MODEL_LIB)(tradmp.o) \4282 $(MODEL_LIB)(trdmld_oce.o) \4283 $(MODEL_LIB)(trdmod.o) \4284 $(MODEL_LIB)(trdmod_oce.o) \4285 $(MODEL_LIB)(zpshde.o) \4286 blk_oce.F90 \4287 cpl_oce.F90 \4288 daymod.F90 \4289 dom_oce.F90 \4290 domvvl.F90 \4291 dtasal.F90 \4292 dtasss.F90 \4293 dtasst.F90 \4294 dtatem.F90 \4295 dynadv.F90 \4296 dynspg_oce.F90 \4297 dynvor.F90 \4298 eosbn2.F90 \4299 flx_oce.F90 \4300 flxmod.F90 \4301 flxrnf.F90 \4302 ice_oce.F90 \4303 in_out_manager.F90 \4304 ini1d.F90 \4305 iom.F90 \4306 iom_def.F90 \4307 iom_ioipsl.F90 \4308 iom_nf90.F90 \4309 iom_rstdimg.F90 \4310 lbclnk.F90 \4311 lib_mpp.F90 \4312 lib_print.f90 \4313 obc_oce.F90 \4314 obc_par.F90 \4315 obccli.F90 \4316 obcdta.F90 \4317 obcfla.F90 \4318 oce.F90 \4319 ocesbc.F90 \4320 ocfzpt.F90 \4321 par_kind.F90 \4322 par_oce.F90 \4323 phycst.F90 \4324 prtctl.F90 \4325 restart.F90 \4326 taumod.F90 \4327 tradmp.F90 \4328 trdmld_oce.F90 \4329 trdmod.F90 \4330 trdmod_oce.F90 \4331 zpshde.F90 \4332 $(MODEL_LIB)(dom_oce.o) \4333 $(MODEL_LIB)(dynspg_oce.o) \4334 $(MODEL_LIB)(dynspg_ts.o) \4335 $(MODEL_LIB)(dynvor.o) \4336 $(MODEL_LIB)(in_out_manager.o) \4337 $(MODEL_LIB)(iom.o) \4338 $(MODEL_LIB)(lbclnk.o) \4339 $(MODEL_LIB)(lib_mpp.o) \4340 $(MODEL_LIB)(obc_oce.o) \4341 $(MODEL_LIB)(obc_par.o) \4342 $(MODEL_LIB)(obcdta.o) \4343 $(MODEL_LIB)(obcfla.o) \4344 $(MODEL_LIB)(oce.o) \4345 $(MODEL_LIB)(ocesbc.o) \4346 $(MODEL_LIB)(phycst.o) \4347 $(MODEL_LIB)(prtctl.o) \4348 $(MODEL_LIB)(restart.o) \4349 dom_oce.F90 \4350 dynspg_oce.F90 \4351 dynspg_ts.F90 \4352 dynvor.F90 \4353 in_out_manager.F90 \4354 iom.F90 \4355 lbclnk.F90 \4356 lib_mpp.F90 \4357 obc_oce.F90 \4358 obc_par.F90 \4359 obcdta.F90 \4360 obcfla.F90 \4361 oce.F90 \4362 ocesbc.F90 \4363 phycst.F90 \4364 prtctl.F90 \4365 restart.F90 \4366 domzgr_substitute.h90 \4367 vectopt_loop_substitute.h90 \4368 KEY_CPP \4369 dynspg_ts_jki.F904370 3921 $(MODEL_LIB)(dynvor.o) : \ 4371 3922 $(MODEL_LIB)(dom_oce.o) \ … … 4550 4101 $(MODEL_LIB)(dynzdf_exp.o) \ 4551 4102 $(MODEL_LIB)(dynzdf_imp.o) \ 4552 $(MODEL_LIB)(dynzdf_imp_jki.o) \4553 4103 $(MODEL_LIB)(in_out_manager.o) \ 4554 4104 $(MODEL_LIB)(ldfdyn_oce.o) \ … … 4563 4113 dynzdf_exp.F90 \ 4564 4114 dynzdf_imp.F90 \ 4565 dynzdf_imp_jki.F90 \4566 4115 in_out_manager.F90 \ 4567 4116 ldfdyn_oce.F90 \ … … 4660 4209 KEY_CPP \ 4661 4210 dynzdf_imp.F90 4662 $(MODEL_LIB)(dynzdf_imp_jki.o) : \4663 $(MODEL_LIB)(cpl_oasis3.o) \4664 $(MODEL_LIB)(cpl_oasis4.o) \4665 $(MODEL_LIB)(daymod.o) \4666 $(MODEL_LIB)(dom_oce.o) \4667 $(MODEL_LIB)(geo2ocean.o) \4668 $(MODEL_LIB)(ice.o) \4669 $(MODEL_LIB)(in_out_manager.o) \4670 $(MODEL_LIB)(lbclnk.o) \4671 $(MODEL_LIB)(lib_print.o) \4672 $(MODEL_LIB)(par_kind.o) \4673 $(MODEL_LIB)(par_oce.o) \4674 $(MODEL_LIB)(phycst.o) \4675 cpl_oasis3.F90 \4676 cpl_oasis4.F90 \4677 daymod.F90 \4678 dom_oce.F90 \4679 geo2ocean.F90 \4680 ice.F90 \4681 in_out_manager.F90 \4682 lbclnk.F90 \4683 lib_print.f90 \4684 par_kind.F90 \4685 par_oce.F90 \4686 phycst.F90 \4687 $(MODEL_LIB)(dom_oce.o) \4688 $(MODEL_LIB)(in_out_manager.o) \4689 $(MODEL_LIB)(oce.o) \4690 $(MODEL_LIB)(phycst.o) \4691 $(MODEL_LIB)(taumod.o) \4692 $(MODEL_LIB)(zdf_oce.o) \4693 dom_oce.F90 \4694 in_out_manager.F90 \4695 oce.F90 \4696 phycst.F90 \4697 taumod.F90 \4698 zdf_oce.F90 \4699 domzgr_substitute.h90 \4700 vectopt_loop_substitute.h90 \4701 KEY_CPP \4702 dynzdf_imp_jki.F904703 4211 $(MODEL_LIB)(eosbn2.o) : \ 4704 4212 $(MODEL_LIB)(dom_oce.o) \ … … 5677 5185 $(MODEL_LIB)(domvvl.o) \ 5678 5186 $(MODEL_LIB)(dynspg_exp.o) \ 5679 $(MODEL_LIB)(dynspg_exp_jki.o) \5680 5187 $(MODEL_LIB)(dynspg_flt.o) \ 5681 $(MODEL_LIB)(dynspg_flt_jki.o) \5682 5188 $(MODEL_LIB)(dynspg_oce.o) \ 5683 5189 $(MODEL_LIB)(dynspg_rl.o) \ 5684 5190 $(MODEL_LIB)(dynspg_ts.o) \ 5685 $(MODEL_LIB)(dynspg_ts_jki.o) \5686 5191 $(MODEL_LIB)(dynvor.o) \ 5687 5192 $(MODEL_LIB)(eosbn2.o) \ … … 5731 5236 domvvl.F90 \ 5732 5237 dynspg_exp.F90 \ 5733 dynspg_exp_jki.F90 \5734 5238 dynspg_flt.F90 \ 5735 dynspg_flt_jki.F90 \5736 5239 dynspg_oce.F90 \ 5737 5240 dynspg_rl.F90 \ 5738 5241 dynspg_ts.F90 \ 5739 dynspg_ts_jki.F90 \5740 5242 dynvor.F90 \ 5741 5243 eosbn2.F90 \ … … 7740 7242 $(MODEL_LIB)(zdfric.o) \ 7741 7243 $(MODEL_LIB)(zdftke.o) \ 7742 $(MODEL_LIB)(zdftke_jki.o) \7743 7244 $(MODEL_LIB)(zpshde.o) \ 7744 7245 agrif_opa_sponge.F90 \ … … 7861 7362 zdfric.F90 \ 7862 7363 zdftke.F90 \ 7863 zdftke_jki.F90 \7864 7364 zpshde.F90 \ 7865 7365 $(MODEL_LIB)(cpl.o) \ … … 8320 7820 $(MODEL_LIB)(dynadv_cen2.o) \ 8321 7821 $(MODEL_LIB)(dynadv_ubs.o) \ 8322 $(MODEL_LIB)(dynhpg_jki.o) \8323 7822 $(MODEL_LIB)(dynkeg.o) \ 8324 7823 $(MODEL_LIB)(dynldf_bilap.o) \ … … 8327 7826 $(MODEL_LIB)(dynldf_lap.o) \ 8328 7827 $(MODEL_LIB)(dynspg_exp.o) \ 8329 $(MODEL_LIB)(dynspg_exp_jki.o) \8330 7828 $(MODEL_LIB)(dynspg_flt.o) \ 8331 $(MODEL_LIB)(dynspg_flt_jki.o) \8332 7829 $(MODEL_LIB)(dynspg_oce.o) \ 8333 7830 $(MODEL_LIB)(dynspg_rl.o) \ 8334 7831 $(MODEL_LIB)(dynspg_ts.o) \ 8335 $(MODEL_LIB)(dynspg_ts_jki.o) \8336 7832 $(MODEL_LIB)(dynzad.o) \ 8337 7833 $(MODEL_LIB)(dynzdf_exp.o) \ 8338 7834 $(MODEL_LIB)(dynzdf_imp.o) \ 8339 $(MODEL_LIB)(dynzdf_imp_jki.o) \8340 7835 $(MODEL_LIB)(eosbn2.o) \ 8341 7836 $(MODEL_LIB)(flo4rk.o) \ … … 8393 7888 $(MODEL_LIB)(taumod.o) \ 8394 7889 $(MODEL_LIB)(traadv_cen2.o) \ 8395 $(MODEL_LIB)(traadv_cen2_jki.o) \8396 7890 $(MODEL_LIB)(traadv_eiv.o) \ 8397 7891 $(MODEL_LIB)(traadv_muscl.o) \ … … 8410 7904 $(MODEL_LIB)(trazdf_exp.o) \ 8411 7905 $(MODEL_LIB)(trazdf_imp.o) \ 8412 $(MODEL_LIB)(trazdf_imp_jki.o) \8413 7906 $(MODEL_LIB)(trc_oce.o) \ 8414 7907 $(MODEL_LIB)(trdicp_oce.o) \ … … 8447 7940 dynadv_cen2.F90 \ 8448 7941 dynadv_ubs.F90 \ 8449 dynhpg_jki.F90 \8450 7942 dynkeg.F90 \ 8451 7943 dynldf_bilap.F90 \ … … 8454 7946 dynldf_lap.F90 \ 8455 7947 dynspg_exp.F90 \ 8456 dynspg_exp_jki.F90 \8457 7948 dynspg_flt.F90 \ 8458 dynspg_flt_jki.F90 \8459 7949 dynspg_oce.F90 \ 8460 7950 dynspg_rl.F90 \ 8461 7951 dynspg_ts.F90 \ 8462 dynspg_ts_jki.F90 \8463 7952 dynzad.F90 \ 8464 7953 dynzdf_exp.F90 \ 8465 7954 dynzdf_imp.F90 \ 8466 dynzdf_imp_jki.F90 \8467 7955 eosbn2.F90 \ 8468 7956 flo4rk.F90 \ … … 8520 8008 taumod.F90 \ 8521 8009 traadv_cen2.F90 \ 8522 traadv_cen2_jki.F90 \8523 8010 traadv_eiv.F90 \ 8524 8011 traadv_muscl.F90 \ … … 8537 8024 trazdf_exp.F90 \ 8538 8025 trazdf_imp.F90 \ 8539 trazdf_imp_jki.F90 \8540 8026 trc_oce.F90 \ 8541 8027 trdicp_oce.F90 \ … … 8632 8118 $(MODEL_LIB)(zdfric.o) \ 8633 8119 $(MODEL_LIB)(zdftke.o) \ 8634 $(MODEL_LIB)(zdftke_jki.o) \8635 8120 $(MODEL_LIB)(zpshde.o) \ 8636 8121 agrif_opa_sponge.F90 \ … … 8715 8200 zdfric.F90 \ 8716 8201 zdftke.F90 \ 8717 zdftke_jki.F90 \8718 8202 zpshde.F90 \ 8719 8203 domzgr_substitute.h90 \ … … 8745 8229 $(MODEL_LIB)(dynzdf_exp.o) \ 8746 8230 $(MODEL_LIB)(dynzdf_imp.o) \ 8747 $(MODEL_LIB)(dynzdf_imp_jki.o) \8748 8231 $(MODEL_LIB)(eosbn2.o) \ 8749 8232 $(MODEL_LIB)(flx_oce.o) \ … … 8782 8265 $(MODEL_LIB)(trazdf_exp.o) \ 8783 8266 $(MODEL_LIB)(trazdf_imp.o) \ 8784 $(MODEL_LIB)(trazdf_imp_jki.o) \8785 8267 $(MODEL_LIB)(trc_oce.o) \ 8786 8268 $(MODEL_LIB)(trdmld_oce.o) \ … … 8815 8297 dynzdf_exp.F90 \ 8816 8298 dynzdf_imp.F90 \ 8817 dynzdf_imp_jki.F90 \8818 8299 eosbn2.F90 \ 8819 8300 flx_oce.F90 \ … … 8852 8333 trazdf_exp.F90 \ 8853 8334 trazdf_imp.F90 \ 8854 trazdf_imp_jki.F90 \8855 8335 trc_oce.F90 \ 8856 8336 trdmld_oce.F90 \ … … 9138 8618 $(MODEL_LIB)(prtctl.o) \ 9139 8619 $(MODEL_LIB)(traadv_cen2.o) \ 9140 $(MODEL_LIB)(traadv_cen2_jki.o) \9141 8620 $(MODEL_LIB)(traadv_eiv.o) \ 9142 8621 $(MODEL_LIB)(traadv_muscl.o) \ … … 9152 8631 prtctl.F90 \ 9153 8632 traadv_cen2.F90 \ 9154 traadv_cen2_jki.F90 \9155 8633 traadv_eiv.F90 \ 9156 8634 traadv_muscl.F90 \ … … 9245 8723 KEY_CPP \ 9246 8724 traadv_cen2.F90 9247 $(MODEL_LIB)(traadv_cen2_jki.o) : \ 8725 $(MODEL_LIB)(traadv_eiv.o) : \ 8726 $(MODEL_LIB)(dom_oce.o) \ 8727 $(MODEL_LIB)(in_out_manager.o) \ 8728 $(MODEL_LIB)(lbclnk.o) \ 8729 $(MODEL_LIB)(ldfdyn_oce.o) \ 8730 $(MODEL_LIB)(ldftra_oce.o) \ 8731 $(MODEL_LIB)(lib_print.o) \ 8732 $(MODEL_LIB)(oce.o) \ 8733 $(MODEL_LIB)(par_kind.o) \ 8734 $(MODEL_LIB)(par_oce.o) \ 8735 $(MODEL_LIB)(phycst.o) \ 8736 $(MODEL_LIB)(prtctl.o) \ 8737 $(MODEL_LIB)(zdfmxl.o) \ 8738 dom_oce.F90 \ 8739 in_out_manager.F90 \ 8740 lbclnk.F90 \ 8741 ldfdyn_oce.F90 \ 8742 ldftra_oce.F90 \ 8743 lib_print.f90 \ 8744 oce.F90 \ 8745 par_kind.F90 \ 8746 par_oce.F90 \ 8747 phycst.F90 \ 8748 prtctl.F90 \ 8749 zdfmxl.F90 \ 8750 $(MODEL_LIB)(dom_oce.o) \ 8751 $(MODEL_LIB)(in_out_manager.o) \ 8752 $(MODEL_LIB)(ldfslp.o) \ 8753 $(MODEL_LIB)(ldftra_oce.o) \ 8754 $(MODEL_LIB)(oce.o) \ 8755 dom_oce.F90 \ 8756 in_out_manager.F90 \ 8757 ldfslp.F90 \ 8758 ldftra_oce.F90 \ 8759 oce.F90 \ 8760 domzgr_substitute.h90 \ 8761 ldfeiv_substitute.h90 \ 8762 ldftra_substitute.h90 \ 8763 vectopt_loop_substitute.h90 \ 8764 KEY_CPP \ 8765 traadv_eiv.F90 8766 $(MODEL_LIB)(traadv_muscl.o) : \ 9248 8767 $(MODEL_LIB)(daymod.o) \ 9249 8768 $(MODEL_LIB)(dianam.o) \ … … 9299 8818 $(MODEL_LIB)(dom_oce.o) \ 9300 8819 $(MODEL_LIB)(dynspg_oce.o) \ 9301 $(MODEL_LIB)(flxrnf.o) \ 9302 $(MODEL_LIB)(in_out_manager.o) \ 9303 $(MODEL_LIB)(lbclnk.o) \ 9304 $(MODEL_LIB)(lib_mpp.o) \ 9305 $(MODEL_LIB)(oce.o) \ 9306 $(MODEL_LIB)(ocfzpt.o) \ 8820 $(MODEL_LIB)(in_out_manager.o) \ 8821 $(MODEL_LIB)(lbclnk.o) \ 8822 $(MODEL_LIB)(lib_mpp.o) \ 8823 $(MODEL_LIB)(oce.o) \ 9307 8824 $(MODEL_LIB)(prtctl.o) \ 9308 8825 $(MODEL_LIB)(trabbl.o) \ … … 9312 8829 dom_oce.F90 \ 9313 8830 dynspg_oce.F90 \ 9314 flxrnf.F90 \ 9315 in_out_manager.F90 \ 9316 lbclnk.F90 \ 9317 lib_mpp.F90 \ 9318 oce.F90 \ 9319 ocfzpt.F90 \ 8831 in_out_manager.F90 \ 8832 lbclnk.F90 \ 8833 lib_mpp.F90 \ 8834 oce.F90 \ 9320 8835 prtctl.F90 \ 9321 8836 trabbl.F90 \ … … 9325 8840 vectopt_loop_substitute.h90 \ 9326 8841 KEY_CPP \ 9327 traadv_cen2_jki.F90 9328 $(MODEL_LIB)(traadv_eiv.o) : \ 9329 $(MODEL_LIB)(dom_oce.o) \ 9330 $(MODEL_LIB)(in_out_manager.o) \ 9331 $(MODEL_LIB)(lbclnk.o) \ 9332 $(MODEL_LIB)(ldfdyn_oce.o) \ 9333 $(MODEL_LIB)(ldftra_oce.o) \ 9334 $(MODEL_LIB)(lib_print.o) \ 9335 $(MODEL_LIB)(oce.o) \ 9336 $(MODEL_LIB)(par_kind.o) \ 9337 $(MODEL_LIB)(par_oce.o) \ 9338 $(MODEL_LIB)(phycst.o) \ 9339 $(MODEL_LIB)(prtctl.o) \ 9340 $(MODEL_LIB)(zdfmxl.o) \ 9341 dom_oce.F90 \ 9342 in_out_manager.F90 \ 9343 lbclnk.F90 \ 9344 ldfdyn_oce.F90 \ 9345 ldftra_oce.F90 \ 9346 lib_print.f90 \ 9347 oce.F90 \ 9348 par_kind.F90 \ 9349 par_oce.F90 \ 9350 phycst.F90 \ 9351 prtctl.F90 \ 9352 zdfmxl.F90 \ 9353 $(MODEL_LIB)(dom_oce.o) \ 9354 $(MODEL_LIB)(in_out_manager.o) \ 9355 $(MODEL_LIB)(ldfslp.o) \ 9356 $(MODEL_LIB)(ldftra_oce.o) \ 9357 $(MODEL_LIB)(oce.o) \ 9358 dom_oce.F90 \ 9359 in_out_manager.F90 \ 9360 ldfslp.F90 \ 9361 ldftra_oce.F90 \ 9362 oce.F90 \ 9363 domzgr_substitute.h90 \ 9364 ldfeiv_substitute.h90 \ 9365 ldftra_substitute.h90 \ 9366 vectopt_loop_substitute.h90 \ 9367 KEY_CPP \ 9368 traadv_eiv.F90 9369 $(MODEL_LIB)(traadv_muscl.o) : \ 8842 traadv_muscl.F90 8843 $(MODEL_LIB)(traadv_muscl2.o) : \ 9370 8844 $(MODEL_LIB)(daymod.o) \ 9371 8845 $(MODEL_LIB)(dianam.o) \ … … 9443 8917 vectopt_loop_substitute.h90 \ 9444 8918 KEY_CPP \ 9445 traadv_muscl .F909446 $(MODEL_LIB)(traadv_ muscl2.o) : \8919 traadv_muscl2.F90 8920 $(MODEL_LIB)(traadv_qck.o) : \ 9447 8921 $(MODEL_LIB)(daymod.o) \ 9448 8922 $(MODEL_LIB)(dianam.o) \ … … 9498 8972 $(MODEL_LIB)(dom_oce.o) \ 9499 8973 $(MODEL_LIB)(dynspg_oce.o) \ 9500 $(MODEL_LIB)(in_out_manager.o) \ 9501 $(MODEL_LIB)(lbclnk.o) \ 9502 $(MODEL_LIB)(lib_mpp.o) \ 9503 $(MODEL_LIB)(oce.o) \ 8974 $(MODEL_LIB)(flxrnf.o) \ 8975 $(MODEL_LIB)(in_out_manager.o) \ 8976 $(MODEL_LIB)(lbclnk.o) \ 8977 $(MODEL_LIB)(lib_mpp.o) \ 8978 $(MODEL_LIB)(oce.o) \ 8979 $(MODEL_LIB)(ocfzpt.o) \ 9504 8980 $(MODEL_LIB)(prtctl.o) \ 9505 8981 $(MODEL_LIB)(trabbl.o) \ … … 9509 8985 dom_oce.F90 \ 9510 8986 dynspg_oce.F90 \ 9511 in_out_manager.F90 \ 9512 lbclnk.F90 \ 9513 lib_mpp.F90 \ 9514 oce.F90 \ 8987 flxrnf.F90 \ 8988 in_out_manager.F90 \ 8989 lbclnk.F90 \ 8990 lib_mpp.F90 \ 8991 oce.F90 \ 8992 ocfzpt.F90 \ 9515 8993 prtctl.F90 \ 9516 8994 trabbl.F90 \ … … 9520 8998 vectopt_loop_substitute.h90 \ 9521 8999 KEY_CPP \ 9522 traadv_ muscl2.F909523 $(MODEL_LIB)(traadv_ qck.o) : \9000 traadv_qck.F90 9001 $(MODEL_LIB)(traadv_tvd.o) : \ 9524 9002 $(MODEL_LIB)(daymod.o) \ 9525 9003 $(MODEL_LIB)(dianam.o) \ … … 9575 9053 $(MODEL_LIB)(dom_oce.o) \ 9576 9054 $(MODEL_LIB)(dynspg_oce.o) \ 9577 $(MODEL_LIB)(flxrnf.o) \9578 $(MODEL_LIB)(in_out_manager.o) \9579 $(MODEL_LIB)(lbclnk.o) \9580 $(MODEL_LIB)(lib_mpp.o) \9581 $(MODEL_LIB)(oce.o) \9582 $(MODEL_LIB)(ocfzpt.o) \9583 $(MODEL_LIB)(prtctl.o) \9584 $(MODEL_LIB)(trabbl.o) \9585 $(MODEL_LIB)(trdmod.o) \9586 $(MODEL_LIB)(trdmod_oce.o) \9587 diaptr.F90 \9588 dom_oce.F90 \9589 dynspg_oce.F90 \9590 flxrnf.F90 \9591 in_out_manager.F90 \9592 lbclnk.F90 \9593 lib_mpp.F90 \9594 oce.F90 \9595 ocfzpt.F90 \9596 prtctl.F90 \9597 trabbl.F90 \9598 trdmod.F90 \9599 trdmod_oce.F90 \9600 domzgr_substitute.h90 \9601 vectopt_loop_substitute.h90 \9602 KEY_CPP \9603 traadv_qck.F909604 $(MODEL_LIB)(traadv_tvd.o) : \9605 $(MODEL_LIB)(daymod.o) \9606 $(MODEL_LIB)(dianam.o) \9607 $(MODEL_LIB)(dom_oce.o) \9608 $(MODEL_LIB)(eosbn2.o) \9609 $(MODEL_LIB)(in_out_manager.o) \9610 $(MODEL_LIB)(iom.o) \9611 $(MODEL_LIB)(lbclnk.o) \9612 $(MODEL_LIB)(ldftra_oce.o) \9613 $(MODEL_LIB)(lib_mpp.o) \9614 $(MODEL_LIB)(lib_print.o) \9615 $(MODEL_LIB)(oce.o) \9616 $(MODEL_LIB)(par_kind.o) \9617 $(MODEL_LIB)(par_oce.o) \9618 $(MODEL_LIB)(phycst.o) \9619 $(MODEL_LIB)(prtctl.o) \9620 $(MODEL_LIB)(taumod.o) \9621 $(MODEL_LIB)(trdicp.o) \9622 $(MODEL_LIB)(trdicp_oce.o) \9623 $(MODEL_LIB)(trdmld.o) \9624 $(MODEL_LIB)(trdmld_oce.o) \9625 $(MODEL_LIB)(trdmod.o) \9626 $(MODEL_LIB)(trdmod_oce.o) \9627 $(MODEL_LIB)(trdvor.o) \9628 $(MODEL_LIB)(trdvor_oce.o) \9629 $(MODEL_LIB)(zdf_oce.o) \9630 daymod.F90 \9631 dianam.F90 \9632 dom_oce.F90 \9633 eosbn2.F90 \9634 in_out_manager.F90 \9635 iom.F90 \9636 lbclnk.F90 \9637 ldftra_oce.F90 \9638 lib_mpp.F90 \9639 lib_print.f90 \9640 oce.F90 \9641 par_kind.F90 \9642 par_oce.F90 \9643 phycst.F90 \9644 prtctl.F90 \9645 taumod.F90 \9646 trdicp.F90 \9647 trdicp_oce.F90 \9648 trdmld.F90 \9649 trdmld_oce.F90 \9650 trdmod.F90 \9651 trdmod_oce.F90 \9652 trdvor.F90 \9653 trdvor_oce.F90 \9654 zdf_oce.F90 \9655 $(MODEL_LIB)(diaptr.o) \9656 $(MODEL_LIB)(dom_oce.o) \9657 $(MODEL_LIB)(dynspg_oce.o) \9658 9055 $(MODEL_LIB)(in_out_manager.o) \ 9659 9056 $(MODEL_LIB)(lbclnk.o) \ … … 9983 9380 $(MODEL_LIB)(trazdf_exp.o) \ 9984 9381 $(MODEL_LIB)(trazdf_imp.o) \ 9985 $(MODEL_LIB)(trazdf_imp_jki.o) \9986 9382 $(MODEL_LIB)(trdicp.o) \ 9987 9383 $(MODEL_LIB)(trdicp_oce.o) \ … … 10016 9412 trazdf_exp.F90 \ 10017 9413 trazdf_imp.F90 \ 10018 trazdf_imp_jki.F90 \10019 9414 trdicp.F90 \ 10020 9415 trdicp_oce.F90 \ … … 10824 10219 $(MODEL_LIB)(trazdf_exp.o) \ 10825 10220 $(MODEL_LIB)(trazdf_imp.o) \ 10826 $(MODEL_LIB)(trazdf_imp_jki.o) \10827 10221 $(MODEL_LIB)(trdmod.o) \ 10828 10222 $(MODEL_LIB)(trdmod_oce.o) \ … … 10842 10236 trazdf_exp.F90 \ 10843 10237 trazdf_imp.F90 \ 10844 trazdf_imp_jki.F90 \10845 10238 trdmod.F90 \ 10846 10239 trdmod_oce.F90 \ … … 10993 10386 KEY_CPP \ 10994 10387 trazdf_imp.F90 10995 $(MODEL_LIB)(trazdf_imp_jki.o) : \10996 $(MODEL_LIB)(dom_oce.o) \10997 $(MODEL_LIB)(in_out_manager.o) \10998 $(MODEL_LIB)(lbclnk.o) \10999 $(MODEL_LIB)(ldfdyn_oce.o) \11000 $(MODEL_LIB)(ldftra_oce.o) \11001 $(MODEL_LIB)(lib_mpp.o) \11002 $(MODEL_LIB)(lib_print.o) \11003 $(MODEL_LIB)(oce.o) \11004 $(MODEL_LIB)(par_kind.o) \11005 $(MODEL_LIB)(par_oce.o) \11006 $(MODEL_LIB)(phycst.o) \11007 $(MODEL_LIB)(prtctl.o) \11008 $(MODEL_LIB)(taumod.o) \11009 $(MODEL_LIB)(trdicp.o) \11010 $(MODEL_LIB)(trdicp_oce.o) \11011 $(MODEL_LIB)(trdmld.o) \11012 $(MODEL_LIB)(trdmld_oce.o) \11013 $(MODEL_LIB)(trdmod_oce.o) \11014 $(MODEL_LIB)(trdvor.o) \11015 $(MODEL_LIB)(trdvor_oce.o) \11016 $(MODEL_LIB)(zdf_oce.o) \11017 $(MODEL_LIB)(zdfmxl.o) \11018 dom_oce.F90 \11019 in_out_manager.F90 \11020 lbclnk.F90 \11021 ldfdyn_oce.F90 \11022 ldftra_oce.F90 \11023 lib_mpp.F90 \11024 lib_print.f90 \11025 oce.F90 \11026 par_kind.F90 \11027 par_oce.F90 \11028 phycst.F90 \11029 prtctl.F90 \11030 taumod.F90 \11031 trdicp.F90 \11032 trdicp_oce.F90 \11033 trdmld.F90 \11034 trdmld_oce.F90 \11035 trdmod_oce.F90 \11036 trdvor.F90 \11037 trdvor_oce.F90 \11038 zdf_oce.F90 \11039 zdfmxl.F90 \11040 $(MODEL_LIB)(dom_oce.o) \11041 $(MODEL_LIB)(in_out_manager.o) \11042 $(MODEL_LIB)(lbclnk.o) \11043 $(MODEL_LIB)(ldfslp.o) \11044 $(MODEL_LIB)(ldftra_oce.o) \11045 $(MODEL_LIB)(oce.o) \11046 $(MODEL_LIB)(prtctl.o) \11047 $(MODEL_LIB)(trdmod.o) \11048 $(MODEL_LIB)(trdmod_oce.o) \11049 $(MODEL_LIB)(zdf_oce.o) \11050 $(MODEL_LIB)(zdfddm.o) \11051 dom_oce.F90 \11052 in_out_manager.F90 \11053 lbclnk.F90 \11054 ldfslp.F90 \11055 ldftra_oce.F90 \11056 oce.F90 \11057 prtctl.F90 \11058 trdmod.F90 \11059 trdmod_oce.F90 \11060 zdf_oce.F90 \11061 zdfddm.F90 \11062 domzgr_substitute.h90 \11063 ldftra_substitute.h90 \11064 zdf.matrixsolver.h90 \11065 zdfddm_substitute.h90 \11066 KEY_CPP \11067 trazdf_imp_jki.F9011068 10388 $(MODEL_LIB)(trc_oce.o) : \ 11069 10389 $(MODEL_LIB)(par_kind.o) \ … … 11953 11273 KEY_CPP \ 11954 11274 zdftke.F90 11955 $(MODEL_LIB)(zdftke_jki.o) : \11956 $(MODEL_LIB)(blk_oce.o) \11957 $(MODEL_LIB)(cpl_oasis3.o) \11958 $(MODEL_LIB)(cpl_oasis4.o) \11959 $(MODEL_LIB)(cpl_oce.o) \11960 $(MODEL_LIB)(daymod.o) \11961 $(MODEL_LIB)(dom_oce.o) \11962 $(MODEL_LIB)(dynzdf_exp.o) \11963 $(MODEL_LIB)(eosbn2.o) \11964 $(MODEL_LIB)(geo2ocean.o) \11965 $(MODEL_LIB)(ice.o) \11966 $(MODEL_LIB)(ice_oce.o) \11967 $(MODEL_LIB)(in_out_manager.o) \11968 $(MODEL_LIB)(ini1d.o) \11969 $(MODEL_LIB)(iom.o) \11970 $(MODEL_LIB)(lbclnk.o) \11971 $(MODEL_LIB)(lib_mpp.o) \11972 $(MODEL_LIB)(lib_print.o) \11973 $(MODEL_LIB)(oce.o) \11974 $(MODEL_LIB)(par_kind.o) \11975 $(MODEL_LIB)(par_oce.o) \11976 $(MODEL_LIB)(phycst.o) \11977 $(MODEL_LIB)(prtctl.o) \11978 $(MODEL_LIB)(restart.o) \11979 $(MODEL_LIB)(taumod.o) \11980 $(MODEL_LIB)(trazdf_exp.o) \11981 $(MODEL_LIB)(trdmld_oce.o) \11982 $(MODEL_LIB)(zdf_oce.o) \11983 $(MODEL_LIB)(zpshde.o) \11984 blk_oce.F90 \11985 cpl_oasis3.F90 \11986 cpl_oasis4.F90 \11987 cpl_oce.F90 \11988 daymod.F90 \11989 dom_oce.F90 \11990 dynzdf_exp.F90 \11991 eosbn2.F90 \11992 geo2ocean.F90 \11993 ice.F90 \11994 ice_oce.F90 \11995 in_out_manager.F90 \11996 ini1d.F90 \11997 iom.F90 \11998 lbclnk.F90 \11999 lib_mpp.F90 \12000 lib_print.f90 \12001 oce.F90 \12002 par_kind.F90 \12003 par_oce.F90 \12004 phycst.F90 \12005 prtctl.F90 \12006 restart.F90 \12007 taumod.F90 \12008 trazdf_exp.F90 \12009 trdmld_oce.F90 \12010 zdf_oce.F90 \12011 zpshde.F90 \12012 $(MODEL_LIB)(dom_oce.o) \12013 $(MODEL_LIB)(in_out_manager.o) \12014 $(MODEL_LIB)(lbclnk.o) \12015 $(MODEL_LIB)(oce.o) \12016 $(MODEL_LIB)(phycst.o) \12017 $(MODEL_LIB)(prtctl.o) \12018 $(MODEL_LIB)(restart.o) \12019 $(MODEL_LIB)(taumod.o) \12020 $(MODEL_LIB)(zdf_oce.o) \12021 $(MODEL_LIB)(zdftke.o) \12022 dom_oce.F90 \12023 in_out_manager.F90 \12024 lbclnk.F90 \12025 oce.F90 \12026 phycst.F90 \12027 prtctl.F90 \12028 restart.F90 \12029 taumod.F90 \12030 zdf_oce.F90 \12031 zdftke.F90 \12032 domzgr_substitute.h90 \12033 vectopt_loop_substitute.h90 \12034 KEY_CPP \12035 zdftke_jki.F9012036 11275 $(MODEL_LIB)(zpshde.o) : \ 12037 11276 $(MODEL_LIB)(dom_oce.o) \ -
trunk/NEMO/OPA_SRC/DYN/dynhpg.F90
r719 r789 18 18 !! dyn_hpg : update the momentum trend with the now horizontal 19 19 !! gradient of the hydrostatic pressure 20 !! default case : k-j-i loops (vector opt. available)21 20 !! hpg_ctl : initialisation and control of options 22 21 !! hpg_zco : z-coordinate scheme … … 30 29 USE oce ! ocean dynamics and tracers 31 30 USE dom_oce ! ocean space and time domain 32 USE dynhpg_jki !33 31 USE phycst ! physical constants 34 32 USE in_out_manager ! I/O manager … … 42 40 43 41 PUBLIC dyn_hpg ! routine called by step module 44 45 #if defined key_mpp_omp46 !!----------------------------------------------------------------------47 !! 'key_mpp_omp' : j-k-i loop (j-slab)48 !!----------------------------------------------------------------------49 LOGICAL, PUBLIC, PARAMETER :: lk_dynhpg_jki = .TRUE. !: OpenMP hpg flag50 LOGICAL, PUBLIC, PARAMETER :: lk_dynhpg = .FALSE. !: vector hpg flag51 #else52 !!----------------------------------------------------------------------53 !! default case : k-j-i loop (vector opt.)54 !!----------------------------------------------------------------------55 LOGICAL, PUBLIC, PARAMETER :: lk_dynhpg_jki = .FALSE. !: OpenMP hpg flag56 LOGICAL, PUBLIC, PARAMETER :: lk_dynhpg = .TRUE. !: vector hpg flag57 #endif58 42 59 43 !!* Namelist nam_dynhpg : Choice of horizontal pressure gradient computation … … 111 95 CASE ( 5 ) ; CALL hpg_djc ( kt ) ! s-coordinate (Density Jacobian with Cubic polynomial) 112 96 CASE ( 6 ) ; CALL hpg_rot ( kt ) ! s-coordinate (ROTated axes scheme) 113 CASE ( 10 ) ; CALL hpg_zco_jki( kt ) ! z-coordinate (k-j-i)114 CASE ( 11 ) ; CALL hpg_zps_jki( kt ) ! z-coordinate plus partial steps (interpolation) (k-j-i)115 CASE ( 12 ) ; CALL hpg_sco_jki( kt ) ! s-coordinate (standard jacobian formulation) (k-j-i)116 97 END SELECT 117 98 … … 186 167 IF ( ioptio /= 1 ) CALL ctl_stop( ' NO or several hydrostatic pressure gradient options used' ) 187 168 188 IF( lk_dynhpg_jki ) THEN189 nhpg = nhpg + 10190 IF(lwp) WRITE(numout,*)191 IF(lwp) WRITE(numout,*) ' Autotasking or OPENMP: use j-k-i loops (i.e. _jki routines)'192 ENDIF193 169 ! 194 170 END SUBROUTINE hpg_ctl -
trunk/NEMO/OPA_SRC/DYN/dynspg.F90
r719 r789 20 20 USE dynspg_flt ! surface pressure gradient (dyn_spg_flt routine) 21 21 USE dynspg_rl ! surface pressure gradient (dyn_spg_rl routine) 22 USE dynspg_exp_jki ! surface pressure gradient (dyn_spg_exp_jki routine)23 USE dynspg_ts_jki ! surface pressure gradient (dyn_spg_ts_jki routine)24 USE dynspg_flt_jki ! surface pressure gradient (dyn_spg_flt_jki routine)25 22 USE trdmod ! ocean dynamics trends 26 23 USE trdmod_oce ! ocean variables trends … … 68 65 69 66 SELECT CASE ( nspg ) ! compute surf. pressure gradient trend and add it to the general trend 70 ! ! k-j-i loops67 ! 71 68 CASE ( 0 ) ; CALL dyn_spg_exp ( kt ) ! explicit 72 69 CASE ( 1 ) ; CALL dyn_spg_ts ( kt ) ! time-splitting 73 70 CASE ( 2 ) ; CALL dyn_spg_flt ( kt, kindic ) ! filtered 74 71 CASE ( 3 ) ; CALL dyn_spg_rl ( kt, kindic ) ! rigid lid 75 ! ! j-k-i loops 76 CASE ( 10 ) ; CALL dyn_spg_exp_jki( kt ) ! explicit with j-k-i loop 77 CASE ( 11 ) ; CALL dyn_spg_ts_jki ( kt ) ! time-splitting with j-k-i loop 78 CASE ( 12 ) ; CALL dyn_spg_flt_jki( kt, kindic ) ! filtered with j-k-i loop 79 ! 72 ! 80 73 CASE ( -1 ) ! esopa: test all possibility with control print 81 74 ; CALL dyn_spg_exp ( kt ) … … 87 80 ; CALL dyn_spg_flt ( kt, kindic ) 88 81 ; CALL prt_ctl( tab3d_1=ua, clinfo1=' spg2 - Ua: ', mask1=umask, & 89 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' )90 ; CALL dyn_spg_exp_jki( kt )91 ; CALL prt_ctl( tab3d_1=ua, clinfo1=' spg10- Ua: ', mask1=umask, &92 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' )93 ; CALL dyn_spg_ts_jki ( kt )94 ; CALL prt_ctl( tab3d_1=ua, clinfo1=' spg12- Ua: ', mask1=umask, &95 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' )96 ; CALL dyn_spg_flt_jki( kt, kindic )97 ; CALL prt_ctl( tab3d_1=ua, clinfo1=' spg13- Ua: ', mask1=umask, &98 82 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' ) 99 83 END SELECT … … 159 143 IF( lk_dynspg_flt) nspg = 2 160 144 IF( lk_dynspg_rl ) nspg = 3 161 IF( lk_jki ) nspg = nspg + 10162 145 IF( nspg == 13 ) nspg = 3 163 146 … … 171 154 IF( nspg == 2 ) WRITE(numout,*) ' filtered free surface' 172 155 IF( nspg == 3 ) WRITE(numout,*) ' rigid-lid' 173 IF( nspg == 10 ) WRITE(numout,*) ' explicit free surface with j-k-i loop'174 IF( nspg == 11 ) WRITE(numout,*) ' time splitting free surface with j-k-i loop'175 IF( nspg == 12 ) WRITE(numout,*) ' filtered free surface with j-k-i loop'176 156 ENDIF 177 157 -
trunk/NEMO/OPA_SRC/DYN/dynspg_exp.F90
r746 r789 33 33 !! * Accessibility 34 34 PUBLIC dyn_spg_exp ! routine called by step.F90 35 PUBLIC exp_rst ! routine called j-k-i subroutine36 35 37 36 !! * Substitutions -
trunk/NEMO/OPA_SRC/DYN/dynspg_flt.F90
r784 r789 51 51 52 52 PUBLIC dyn_spg_flt ! routine called by step.F90 53 PUBLIC flt_rst ! routine called by j-k-i subroutine54 53 55 54 !! * Substitutions -
trunk/NEMO/OPA_SRC/DYN/dynspg_ts.F90
r788 r789 41 41 42 42 PUBLIC dyn_spg_ts ! routine called by step.F90 43 PUBLIC ts_rst ! routine called by j-k-i subroutine44 43 45 44 REAL(wp), DIMENSION(jpi,jpj) :: ftnw, ftne, & ! triad of coriolis parameter -
trunk/NEMO/OPA_SRC/DYN/dynvor.F90
r719 r789 226 226 227 227 !CDIR PARALLEL DO PRIVATE( zwx, zwy, zwz ) 228 !$OMP PARALLEL DO PRIVATE( zwx, zwy, zwz )229 228 ! ! =============== 230 229 DO jk = 1, jpkm1 ! Horizontal slab … … 333 332 334 333 !CDIR PARALLEL DO PRIVATE( zwx, zwy, zwz, zww ) 335 !$OMP PARALLEL DO PRIVATE( zwx, zwy, zwz, zww )336 334 ! ! =============== 337 335 DO jk = 1, jpkm1 ! Horizontal slab … … 444 442 445 443 !CDIR PARALLEL DO PRIVATE( zwx, zwy, zwz ) 446 !$OMP PARALLEL DO PRIVATE( zwx, zwy, zwz )447 444 ! ! =============== 448 445 DO jk = 1, jpkm1 ! Horizontal slab … … 567 564 568 565 !CDIR PARALLEL DO PRIVATE( zwx, zwy, zwz, ztnw, ztne, ztsw, ztse ) 569 !$OMP PARALLEL DO PRIVATE( zwx, zwy, zwz, ztnw, ztne, ztsw, ztse )570 566 ! ! =============== 571 567 DO jk = 1, jpkm1 ! Horizontal slab -
trunk/NEMO/OPA_SRC/DYN/dynzad.F90
r719 r789 38 38 CONTAINS 39 39 40 #if defined key_mpp_omp41 !!----------------------------------------------------------------------42 !! 'key_mpp_omp' OpenMP / NEC autotasking: j-k-i loops (j-slab)43 !!----------------------------------------------------------------------44 45 SUBROUTINE dyn_zad( kt )46 !!----------------------------------------------------------------------47 !! *** ROUTINE dynzad ***48 !!49 !! ** Purpose : Compute the now vertical momentum advection trend and50 !! add it to the general trend of momentum equation.51 !!52 !! ** Method : Use j-slab (j-k-i loops) for OpenMP / NEC autotasking53 !! The now vertical advection of momentum is given by:54 !! w dz(u) = ua + 1/(e1u*e2u*e3u) mk+1[ mi(e1t*e2t*wn) dk(un) ]55 !! w dz(v) = va + 1/(e1v*e2v*e3v) mk+1[ mj(e1t*e2t*wn) dk(vn) ]56 !! Add this trend to the general trend (ua,va):57 !! (ua,va) = (ua,va) + w dz(u,v)58 !!59 !! ** Action : - Update (ua,va) with the vert. momentum advection trends60 !! - Save the trends in (ztrdu,ztrdv) ('key_trddyn')61 !!----------------------------------------------------------------------62 USE oce, ONLY: zwuw => ta ! use ta as 3D workspace63 USE oce, ONLY: zwvw => sa ! use sa as 3D workspace64 !!65 INTEGER, INTENT(in) :: kt ! ocean time-step inedx66 !!67 INTEGER :: ji, jj, jk ! dummy loop indices68 REAL(wp) :: zvn, zua, zva ! temporary scalars69 REAL(wp), DIMENSION(jpi) :: zww ! 1D workspace70 REAL(wp), DIMENSION(jpi,jpj,jpk) :: ztrdu, ztrdv ! 3D workspace71 !!----------------------------------------------------------------------72 73 IF( kt == nit000 ) THEN74 IF(lwp) WRITE(numout,*)75 IF(lwp) WRITE(numout,*) 'dyn_zad : arakawa advection scheme'76 IF(lwp) WRITE(numout,*) '~~~~~~~ Auto-tasking case, j-slab, no vector opt.'77 ENDIF78 79 IF( l_trddyn ) THEN ! Save ua and va trends80 ztrdu(:,:,:) = ua(:,:,:)81 ztrdv(:,:,:) = va(:,:,:)82 ENDIF83 84 ! ! ===============85 DO jj = 2, jpjm1 ! Vertical slab86 ! ! ===============87 DO jk = 2, jpkm1 ! Vertical momentum advection at uw and vw-pts88 DO ji = 2, jpi ! vertical fluxes89 zww(ji) = 0.25 * e1t(ji,jj) * e2t(ji,jj) * wn(ji,jj,jk)90 END DO91 DO ji = 2, jpim1 ! vertical momentum advection at w-point92 zvn = 0.25 * e1t(ji,jj+1) * e2t(ji,jj+1) * wn(ji,jj+1,jk)93 zwuw(ji,jj,jk) = ( zww(ji+1) + zww(ji) ) * ( un(ji,jj,jk-1)-un(ji,jj,jk) )94 zwvw(ji,jj,jk) = ( zvn + zww(ji) ) * ( vn(ji,jj,jk-1)-vn(ji,jj,jk) )95 END DO96 END DO97 DO ji = 2, jpim1 ! Surface and bottom values set to zero98 zwuw(ji,jj, 1 ) = 0.e099 zwvw(ji,jj, 1 ) = 0.e0100 zwuw(ji,jj,jpk) = 0.e0101 zwvw(ji,jj,jpk) = 0.e0102 END DO103 !104 DO jk = 1, jpkm1 ! Vertical momentum advection at u- and v-points105 DO ji = 2, jpim1106 ! ! vertical momentum advective trends107 zua = - ( zwuw(ji,jj,jk) + zwuw(ji,jj,jk+1) ) / ( e1u(ji,jj) * e2u(ji,jj) * fse3u(ji,jj,jk) )108 zva = - ( zwvw(ji,jj,jk) + zwvw(ji,jj,jk+1) ) / ( e1v(ji,jj) * e2v(ji,jj) * fse3v(ji,jj,jk) )109 ! ! add the trends to the general momentum trends110 ua(ji,jj,jk) = ua(ji,jj,jk) + zua111 va(ji,jj,jk) = va(ji,jj,jk) + zva112 END DO113 END DO114 ! ! ===============115 END DO ! End of slab116 ! ! ===============117 !118 IF( l_trddyn ) THEN ! save the vertical advection trends for diagnostic119 ztrdu(:,:,:) = ua(:,:,:) - ztrdu(:,:,:)120 ztrdv(:,:,:) = va(:,:,:) - ztrdv(:,:,:)121 CALL trd_mod( ztrdu, ztrdv, jpdyn_trd_zad, 'DYN', kt )122 ENDIF123 ! ! Control print124 IF(ln_ctl) CALL prt_ctl( tab3d_1=ua, clinfo1=' zad - Ua: ', mask1=umask, &125 & tab3d_2=va, clinfo2=' Va: ', mask2=vmask, clinfo3='dyn' )126 !127 END SUBROUTINE dyn_zad128 129 #else130 !!----------------------------------------------------------------------131 !! Default option k-j-i loop (vector opt.)132 !!----------------------------------------------------------------------133 134 40 SUBROUTINE dyn_zad ( kt ) 135 41 !!---------------------------------------------------------------------- … … 162 68 IF(lwp)WRITE(numout,*) 163 69 IF(lwp)WRITE(numout,*) 'dyn_zad : arakawa advection scheme' 164 IF(lwp)WRITE(numout,*) '~~~~~~~ vector optimization k-j-i loop'165 70 ENDIF 166 71 … … 215 120 ! 216 121 END SUBROUTINE dyn_zad 217 #endif218 122 219 123 !!====================================================================== -
trunk/NEMO/OPA_SRC/DYN/dynzdf.F90
r719 r789 17 17 USE dynzdf_exp ! vertical diffusion: explicit (dyn_zdf_exp routine) 18 18 USE dynzdf_imp ! vertical diffusion: implicit (dyn_zdf_imp routine) 19 USE dynzdf_imp_jki ! vertical diffusion implicit (dyn_zdf_imp_jki routine)20 19 21 20 USE ldfdyn_oce ! ocean dynamics: lateral physics … … 74 73 ! 75 74 CASE ( 0 ) ; CALL dyn_zdf_exp ( kt, r2dt ) ! explicit scheme 76 CASE ( 1 ) ; CALL dyn_zdf_imp ( kt, r2dt ) ! implicit scheme (k-j-i loop) 77 CASE ( 2 ) ; CALL dyn_zdf_imp_jki( kt, r2dt ) ! implicit scheme (j-k-i loop) 75 CASE ( 1 ) ; CALL dyn_zdf_imp ( kt, r2dt ) ! implicit scheme 78 76 ! 79 77 CASE ( -1 ) ! esopa: test all possibility with control print … … 83 81 CALL dyn_zdf_imp ( kt, r2dt ) 84 82 CALL prt_ctl( tab3d_1=ua, clinfo1=' zdf1 - Ua: ', mask1=umask, & 85 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' )86 CALL dyn_zdf_imp_jki( kt, r2dt )87 CALL prt_ctl( tab3d_1=ua, clinfo1=' zdf2 - Ua: ', mask1=umask, &88 83 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' ) 89 84 END SELECT … … 109 104 !! ** Method : implicit (euler backward) scheme (default) 110 105 !! explicit (time-splitting) scheme if ln_zdfexp=T 111 !! OpenMP / NEC autotasking: use j-k-i loops112 106 !!---------------------------------------------------------------------- 113 107 USE zdftke … … 125 119 IF( ln_dynldf_hor .AND. ln_sco ) nzdf = 1 ! horizontal lateral physics in s-coordinate 126 120 127 ! OpenMP / NEC autotasking128 #if defined key_mpp_omp129 IF( nzdf == 1 ) nzdf = 2 ! j-k-i loop130 #endif131 132 121 IF( lk_esopa ) nzdf = -1 ! Esopa key: All schemes used 133 122 … … 139 128 IF( nzdf == 0 ) WRITE(numout,*) ' Explicit time-splitting scheme' 140 129 IF( nzdf == 1 ) WRITE(numout,*) ' Implicit (euler backward) scheme' 141 IF( nzdf == 2 ) WRITE(numout,*) ' Implicit (euler backward) scheme with j-k-i loops'142 130 ENDIF 143 131 ! -
trunk/NEMO/OPA_SRC/DYN/wzvmod.F90
r719 r789 36 36 37 37 CONTAINS 38 39 #if defined key_mpp_omp40 !!----------------------------------------------------------------------41 !! 'key_mpp_omp' j-k-i loop (j-slab)42 !!----------------------------------------------------------------------43 44 SUBROUTINE wzv( kt )45 !!----------------------------------------------------------------------46 !! *** ROUTINE wzv ***47 !!48 !! ** Purpose : Compute the now vertical velocity after the array swap49 !!50 !! ** Method : Using the incompressibility hypothesis, the vertical51 !! velocity is computed by integrating the horizontal divergence52 !! from the bottom to the surface.53 !! The boundary conditions are w=0 at the bottom (no flux) and,54 !! in rigid-lid case, w=0 at the sea surface.55 !!56 !! ** action : wn array : the now vertical velocity57 !!----------------------------------------------------------------------58 !! * Arguments59 INTEGER, INTENT( in ) :: kt ! ocean time-step index60 61 !! * Local declarations62 INTEGER :: jj, jk ! dummy loop indices63 !!----------------------------------------------------------------------64 65 IF( kt == nit000 ) THEN66 IF(lwp) WRITE(numout,*)67 IF(lwp) WRITE(numout,*) 'wzv : vertical velocity from continuity eq.'68 IF(lwp) WRITE(numout,*) '~~~~~~~ j-k-i loops'69 70 ! bottom boundary condition: w=0 (set once for all)71 wn(:,:,jpk) = 0.e072 ENDIF73 74 ! ! ===============75 DO jj = 1, jpj ! Vertical slab76 ! ! ===============77 ! Computation from the bottom78 DO jk = jpkm1, 1, -179 wn(:,jj,jk) = wn(:,jj,jk+1) - fse3t(:,jj,jk) * hdivn(:,jj,jk)80 END DO81 ! ! ===============82 END DO ! End of slab83 ! ! ===============84 85 IF(ln_ctl) CALL prt_ctl(tab3d_1=wn, clinfo1=' w**2 - : ', mask1=wn)86 87 END SUBROUTINE wzv88 89 #else90 !!----------------------------------------------------------------------91 !! Default option k-j-i loop92 !!----------------------------------------------------------------------93 38 94 39 SUBROUTINE wzv( kt ) … … 189 134 190 135 END SUBROUTINE wzv 191 #endif192 136 193 137 !!====================================================================== -
trunk/NEMO/OPA_SRC/LDF/ldfeiv.F90
r719 r789 10 10 !!---------------------------------------------------------------------- 11 11 !! ldf_eiv : compute the eddy induced velocity coefficients 12 !! Same results but not same routine if 'key_mpp_omp'13 !! is defined or not14 12 !!---------------------------------------------------------------------- 15 13 !! * Modules used … … 40 38 41 39 CONTAINS 42 43 # if defined key_mpp_omp44 !!----------------------------------------------------------------------45 !! 'key_mpp_omp' : OpenMP / NEC autotasking (j-slab)46 !!----------------------------------------------------------------------47 48 SUBROUTINE ldf_eiv( kt )49 !!----------------------------------------------------------------------50 !! *** ROUTINE ldf_eiv ***51 !!52 !! ** Purpose : Compute the eddy induced velocity coefficient from the53 !! growth rate of baroclinic instability.54 !!55 !! ** Method :56 !!57 !! ** Action : uslp(), : i- and j-slopes of neutral surfaces58 !! vslp() at u- and v-points, resp.59 !! wslpi(), : i- and j-slopes of neutral surfaces60 !! wslpj() at w-points.61 !!62 !! History :63 !! 8.1 ! 99-03 (G. Madec, A. Jouzeau) Original code64 !! 8.5 ! 02-06 (G. Madec) Free form, F9065 !!----------------------------------------------------------------------66 !! * Arguments67 INTEGER, INTENT( in ) :: kt ! ocean time-step inedx68 69 !! * Local declarations70 INTEGER :: ji, jj, jk ! dummy loop indices71 REAL(wp) :: &72 zfw, ze3w, zn2, zf20, & ! temporary scalars73 zaht, zaht_min74 REAL(wp), DIMENSION(jpi,jpj) :: &75 zn, zah, zhw, zross ! workspace76 !!----------------------------------------------------------------------77 78 IF( kt == nit000 ) THEN79 IF(lwp) WRITE(numout,*)80 IF(lwp) WRITE(numout,*) 'ldf_eiv : eddy induced velocity coefficients'81 IF(lwp) WRITE(numout,*) '~~~~~~~ NEC autotasking / OpenMP : j-slab'82 ENDIF83 84 ! ! ===============85 DO jj = 2, jpjm1 ! Vertical slab86 ! ! ===============87 88 ! 0. Local initialization89 ! -----------------------90 zn (:,jj) = 0.e091 zhw (:,jj) = 5.e092 zah (:,jj) = 0.e093 zross(:,jj) = 0.e094 95 ! 1. Compute lateral diffusive coefficient96 ! ----------------------------------------97 98 !CDIR NOVERRCHK99 DO jk = 1, jpk100 !CDIR NOVERRCHK101 DO ji = 2, jpim1102 ! Take the max of N^2 and zero then take the vertical sum103 ! of the square root of the resulting N^2 ( required to compute104 ! internal Rossby radius Ro = .5 * sum_jpk(N) / f105 zn2 = MAX( rn2(ji,jj,jk), 0.e0 )106 ze3w = fse3w(ji,jj,jk) * tmask(ji,jj,jk)107 zn(ji,jj) = zn(ji,jj) + SQRT( zn2 ) * fse3w(ji,jj,jk)108 ! Compute elements required for the inverse time scale of baroclinic109 ! eddies using the isopycnal slopes calculated in ldfslp.F :110 ! T^-1 = sqrt(m_jpk(N^2*(r1^2+r2^2)*e3w))111 zah(ji,jj) = zah(ji,jj) + zn2 &112 * ( wslpi(ji,jj,jk) * wslpi(ji,jj,jk) &113 + wslpj(ji,jj,jk) * wslpj(ji,jj,jk) ) &114 * ze3w115 zhw(ji,jj) = zhw(ji,jj) + ze3w116 END DO117 END DO118 119 !CDIR NOVERRCHK120 DO ji = 2, jpim1121 zfw = MAX( ABS( 2. * omega * SIN( rad * gphit(ji,jj) ) ) , 1.e-10 )122 ! Rossby radius at w-point taken < 40km and > 2km123 zross(ji,jj) = MAX( MIN( .4 * zn(ji,jj) / zfw, 40.e3 ), 2.e3 )124 ! Compute aeiw by multiplying Ro^2 and T^-1125 aeiw(ji,jj) = zross(ji,jj) * zross(ji,jj) * SQRT( zah(ji,jj) / zhw(ji,jj) ) * tmask(ji,jj,1)126 IF( cp_cfg == "orca" .AND. jp_cfg == 2 ) THEN ! ORCA R02127 ! Take the minimum between aeiw and aeiv0 for depth levels128 ! lower than 20 (21 in w- point)129 IF( mbathy(ji,jj) <= 21. ) aeiw(ji,jj) = MIN( aeiw(ji,jj), 1000. )130 ENDIF131 END DO132 133 ! Decrease the coefficient in the tropics (20N-20S)134 zf20 = 2. * omega * sin( rad * 20. )135 DO ji = 2, jpim1136 aeiw(ji,jj) = MIN( 1., ABS( ff(ji,jj) / zf20 ) ) * aeiw(ji,jj)137 END DO138 139 ! ORCA R05: Take the minimum between aeiw and aeiv0140 IF( cp_cfg == "orca" .AND. jp_cfg == 05 ) THEN ! ORCA R05141 DO ji = 2, jpim1142 aeiw(ji,jj) = MIN( aeiw(ji,jj), aeiv0 )143 END DO144 ENDIF145 ! ! ===============146 END DO ! End of slab147 ! ! ===============148 149 !,,,,,,,,,,,,,,,,,,,,,,,,,,,,,synchro,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,150 151 ! lateral boundary condition on aeiw152 CALL lbc_lnk( aeiw, 'W', 1. )153 154 ! Average the diffusive coefficient at u- v- points155 DO jj = 2, jpjm1156 DO ji = fs_2, fs_jpim1 ! vector opt.157 aeiu(ji,jj) = .5 * (aeiw(ji,jj) + aeiw(ji+1,jj ))158 aeiv(ji,jj) = .5 * (aeiw(ji,jj) + aeiw(ji ,jj+1))159 END DO160 END DO161 !,,,,,,,,,,,,,,,,,,,,,,,,,,,,,synchro,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,162 163 ! lateral boundary condition on aeiu, aeiv164 CALL lbc_lnk( aeiu, 'U', 1. )165 CALL lbc_lnk( aeiv, 'V', 1. )166 167 IF(ln_ctl) THEN168 CALL prt_ctl(tab2d_1=aeiu, clinfo1=' eiv - u: ', ovlap=1)169 CALL prt_ctl(tab2d_1=aeiv, clinfo1=' eiv - v: ', ovlap=1)170 ENDIF171 172 ! ORCA R05: add a space variation on aht (=aeiv except at the equator and river mouth)173 IF( cp_cfg == "orca" .AND. jp_cfg == 05 ) THEN174 zf20 = 2. * omega * SIN( rad * 20. )175 zaht_min = 100. ! minimum value for aht176 DO jj = 1, jpj177 DO ji = 1, jpi178 zaht = ( 1. - MIN( 1., ABS( ff(ji,jj) / zf20 ) ) ) * ( aht0 - zaht_min ) &179 & + aht0 * upsrnfh(ji,jj) ! enhanced near river mouths180 ahtu(ji,jj) = MAX( MAX( zaht_min, aeiu(ji,jj) ) + zaht, aht0 )181 ahtv(ji,jj) = MAX( MAX( zaht_min, aeiv(ji,jj) ) + zaht, aht0 )182 ahtw(ji,jj) = MAX( MAX( zaht_min, aeiw(ji,jj) ) + zaht, aht0 )183 END DO184 END DO185 IF(ln_ctl) THEN186 CALL prt_ctl(tab2d_1=ahtu, clinfo1=' aht - u: ', ovlap=1)187 CALL prt_ctl(tab2d_1=ahtv, clinfo1=' aht - v: ', ovlap=1)188 CALL prt_ctl(tab2d_1=ahtw, clinfo1=' aht - w: ', ovlap=1)189 ENDIF190 ENDIF191 192 IF( aeiv0 == 0.e0 ) THEN193 aeiu(:,:) = 0.e0194 aeiv(:,:) = 0.e0195 aeiw(:,:) = 0.e0196 ENDIF197 198 END SUBROUTINE ldf_eiv199 200 # else201 !!----------------------------------------------------------------------202 !! Default key k-j-i loops203 !!----------------------------------------------------------------------204 40 205 41 SUBROUTINE ldf_eiv( kt ) … … 251 87 252 88 DO jk = 1, jpk 253 # if defined key_vectopt_loop && ! defined key_mpp_omp89 # if defined key_vectopt_loop 254 90 !CDIR NOVERRCHK 255 91 DO ji = 1, jpij ! vector opt. … … 373 209 END SUBROUTINE ldf_eiv 374 210 375 # endif376 377 211 #else 378 212 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/LDF/ldfslp.F90
r719 r789 139 139 140 140 IF( ln_zps ) THEN ! partial steps correction at the bottom ocean level (zps_hde routine) 141 # if defined key_vectopt_loop && ! defined key_mpp_omp141 # if defined key_vectopt_loop 142 142 jj = 1 143 143 DO ji = 1, jpij-jpi ! vector opt. (forced unrolling) … … 151 151 zgru(ji,jj,iku) = gru(ji,jj) 152 152 zgrv(ji,jj,ikv) = grv(ji,jj) 153 # if ! defined key_vectopt_loop || defined key_mpp_omp153 # if ! defined key_vectopt_loop 154 154 END DO 155 155 # endif … … 490 490 ! mask for mixed layer 491 491 DO jk = 1, jpk 492 # if defined key_vectopt_loop && ! defined key_mpp_omp492 # if defined key_vectopt_loop 493 493 jj = 1 494 494 DO ji = 1, jpij ! vector opt. (forced unrolling) … … 504 504 omlmask(ji,jj,jk) = 0.e0 505 505 ENDIF 506 # if ! defined key_vectopt_loop || defined key_mpp_omp506 # if ! defined key_vectopt_loop 507 507 END DO 508 508 # endif … … 522 522 zwy(:,jpj) = 0.e0 523 523 zwy(jpi,:) = 0.e0 524 # if defined key_vectopt_loop && ! defined key_mpp_omp524 # if defined key_vectopt_loop 525 525 jj = 1 526 526 DO ji = 1, jpij-jpi ! vector opt. (forced unrolling) … … 535 535 & * ( pn2(ji,jj,ik) + pn2(ji,jj,ik+1) ) & 536 536 & / MAX( tmask(ji,jj,ik) + tmask (ji,jj,ik+1), 1. ) 537 # if ! defined key_vectopt_loop || defined key_mpp_omp537 # if ! defined key_vectopt_loop 538 538 END DO 539 539 # endif … … 543 543 544 544 ! Slope at u points 545 # if defined key_vectopt_loop && ! defined key_mpp_omp545 # if defined key_vectopt_loop 546 546 jj = 1 547 547 DO ji = jpi+2, jpij-jpi-1 ! vector opt. (forced unrolling) … … 560 560 ! uslpml 561 561 uslpml (ji,jj) = zau / ( zbu - zeps ) * umask (ji,jj,ik) 562 # if ! defined key_vectopt_loop || defined key_mpp_omp562 # if ! defined key_vectopt_loop 563 563 END DO 564 564 # endif … … 572 572 zwy ( :, jpj) = 0.e0 573 573 zwy ( jpi, :) = 0.e0 574 # if defined key_vectopt_loop && ! defined key_mpp_omp574 # if defined key_vectopt_loop 575 575 jj = 1 576 576 DO ji = 1, jpij-jpi ! vector opt. (forced unrolling) … … 584 584 & * ( pn2(ji,jj,ik) + pn2(ji,jj,ik+1) ) & 585 585 & / MAX( tmask(ji,jj,ik) + tmask (ji,jj,ik+1), 1. ) 586 # if ! defined key_vectopt_loop || defined key_mpp_omp586 # if ! defined key_vectopt_loop 587 587 END DO 588 588 # endif … … 593 593 594 594 ! Slope at v points 595 # if defined key_vectopt_loop && ! defined key_mpp_omp595 # if defined key_vectopt_loop 596 596 jj = 1 597 597 DO ji = jpi+2, jpij-jpi-1 ! vector opt. (forced unrolling) … … 610 610 ! vslpml 611 611 vslpml (ji,jj) = zav / ( zbv - zeps ) * vmask (ji,jj,ik) 612 # if ! defined key_vectopt_loop || defined key_mpp_omp612 # if ! defined key_vectopt_loop 613 613 END DO 614 614 # endif … … 624 624 ! Local vertical density gradient evaluated from N^2 625 625 ! zwy = d/dz(prd)= - mk ( prd ) / grav * pn2 -- at w point 626 # if defined key_vectopt_loop && ! defined key_mpp_omp626 # if defined key_vectopt_loop 627 627 jj = 1 628 628 DO ji = 1, jpij ! vector opt. (forced unrolling) … … 636 636 zwy (ji,jj) = zm05g * pn2 (ji,jj,ik) * & 637 637 & ( prd (ji,jj,ik) + prd (ji,jj,ikm1) + 2. ) 638 # if ! defined key_vectopt_loop || defined key_mpp_omp638 # if ! defined key_vectopt_loop 639 639 END DO 640 640 # endif … … 642 642 643 643 ! Slope at w point 644 # if defined key_vectopt_loop && ! defined key_mpp_omp644 # if defined key_vectopt_loop 645 645 jj = 1 646 646 DO ji = jpi+2, jpij-jpi-1 ! vector opt. (forced unrolling) … … 672 672 wslpiml (ji,jj) = zai / ( zbi - zeps) * tmask (ji,jj,ik) 673 673 wslpjml (ji,jj) = zaj / ( zbj - zeps) * tmask (ji,jj,ik) 674 # if ! defined key_vectopt_loop || defined key_mpp_omp674 # if ! defined key_vectopt_loop 675 675 END DO 676 676 # endif -
trunk/NEMO/OPA_SRC/SBC/flxblk.F90
r719 r789 412 412 413 413 DO jt = 1, jpintsr 414 # if defined key_vectopt_loop && ! defined key_mpp_omp414 # if defined key_vectopt_loop 415 415 DO ji = 1, jpij 416 416 zalbocsd(ji,1) = zalbocsd(ji,1) + zdlha (ji,1) * zalbocs(ji,1,jt) & -
trunk/NEMO/OPA_SRC/TRA/traadv.F90
r719 r789 14 14 USE dom_oce ! ocean space and time domain 15 15 USE traadv_cen2 ! 2nd order centered scheme (tra_adv_cen2 routine) 16 USE traadv_cen2_jki ! 2nd order centered scheme (tra_adv_cen2 routine)17 16 USE traadv_tvd ! TVD scheme (tra_adv_tvd routine) 18 17 USE traadv_muscl ! MUSCL scheme (tra_adv_muscl routine) … … 88 87 89 88 SELECT CASE ( nadv ) ! compute advection trend and add it to general trend 90 CASE ( 0 ) ; CALL tra_adv_cen2 ( kt, zun, zvn, zwn ) ! 2nd order centered scheme k-j-i loops 91 CASE ( 1 ) ; CALL tra_adv_cen2_jki( kt, zun, zvn, zwn ) ! 2nd order centered scheme 89 CASE ( 1 ) ; CALL tra_adv_cen2 ( kt, zun, zvn, zwn ) ! 2nd order centered scheme 92 90 CASE ( 2 ) ; CALL tra_adv_tvd ( kt, zun, zvn, zwn ) ! TVD scheme 93 91 CASE ( 3 ) ; CALL tra_adv_muscl ( kt, zun, zvn, zwn ) ! MUSCL scheme … … 99 97 CALL tra_adv_cen2 ( kt, zun, zvn, zwn ) 100 98 CALL prt_ctl( tab3d_1=ta, clinfo1=' adv0 - Ta: ', mask1=tmask, & 101 & tab3d_2=sa, clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' )102 CALL tra_adv_cen2_jki( kt, zun, zvn, zwn )103 CALL prt_ctl( tab3d_1=ta, clinfo1=' adv1 - Ta: ', mask1=tmask, &104 99 & tab3d_2=sa, clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) 105 100 CALL tra_adv_tvd ( kt, zun, zvn, zwn ) … … 171 166 172 167 ! ! Set nadv 173 IF( ln_traadv_cen2 ) nadv = 0174 #if defined key_mpp_omp175 168 IF( ln_traadv_cen2 ) nadv = 1 176 #endif177 169 IF( ln_traadv_tvd ) nadv = 2 178 170 IF( ln_traadv_muscl ) nadv = 3 … … 184 176 IF(lwp) THEN ! Print the choice 185 177 WRITE(numout,*) 186 IF( nadv == 0 ) WRITE(numout,*) ' 2nd order scheme is used' 187 IF( nadv == 1 ) WRITE(numout,*) ' 2nd order scheme is usedi, k-j-i case' 178 IF( nadv == 1 ) WRITE(numout,*) ' 2nd order scheme is used' 188 179 IF( nadv == 2 ) WRITE(numout,*) ' TVD scheme is used' 189 180 IF( nadv == 3 ) WRITE(numout,*) ' MUSCL scheme is used' 190 181 IF( nadv == 4 ) WRITE(numout,*) ' MUSCL2 scheme is used' 191 182 IF( nadv == 5 ) WRITE(numout,*) ' UBS scheme is used' 192 IF( nadv == 6 ) WRITE(numout,*) ' PPM scheme is used' 193 IF( nadv == 7 ) WRITE(numout,*) ' QUICKEST scheme is used' 183 IF( nadv == 6 ) WRITE(numout,*) ' QUICKEST scheme is used' 194 184 IF( nadv == -1 ) WRITE(numout,*) ' esopa test: use all advection scheme' 195 185 ENDIF -
trunk/NEMO/OPA_SRC/TRA/traadv_cen2.F90
r719 r789 13 13 !! tra_adv_cen2 : update the tracer trend with the horizontal and 14 14 !! vertical advection trends using a seconder order 15 !! centered scheme. (k-j-i loops)16 15 !!---------------------------------------------------------------------- 17 16 USE oce ! ocean dynamics and active tracers -
trunk/NEMO/OPA_SRC/TRA/traadv_qck.F90
r719 r789 52 52 53 53 CONTAINS 54 55 #if ! defined key_mpp_omp56 !!----------------------------------------------------------------------57 !! Default option : quickest advection scheme (k-j-i loop)58 !!----------------------------------------------------------------------59 54 60 55 SUBROUTINE tra_adv_qck( kt, pun, pvn, pwn ) … … 581 576 END FUNCTION 582 577 583 #else584 !!----------------------------------------------------------------------585 !! 'key_mpp_omp' : quickest advection (k- and j-slabs)586 !!----------------------------------------------------------------------587 SUBROUTINE tra_adv_qck( kt, pun, pvn, pwn )588 !!----------------------------------------------------------------------589 !! * Arguments590 INTEGER, INTENT( in ) :: kt ! ocean time-step index591 REAL(wp), INTENT(in), DIMENSION(jpi,jpj,jpk) :: pun ! effective ocean velocity, u_component592 REAL(wp), INTENT(in), DIMENSION(jpi,jpj,jpk) :: pvn ! effective ocean velocity, v_component593 REAL(wp), INTENT(in), DIMENSION(jpi,jpj,jpk) :: pwn ! effective ocean velocity, w_component594 !!----------------------------------------------------------------------595 IF(lwp) WRITE(numout,*)596 IF(lwp) WRITE(numout,*) 'tra_adv_ qck:3st order quickest advection scheme'597 IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~ Vector optimization case'598 IF(lwp) WRITE(numout,*) 'WITH AUTOTASKING =>this routine doesn t exist for the moment'599 IF(lwp) WRITE(numout,*) ' EMPTY ROUTINE!!!!!!'600 601 END SUBROUTINE tra_adv_qck602 603 #endif604 605 578 !!====================================================================== 606 579 END MODULE traadv_qck -
trunk/NEMO/OPA_SRC/TRA/trabbc.F90
r719 r789 75 75 INTEGER, INTENT( in ) :: kt ! ocean time-step index 76 76 !! 77 #if defined key_vectopt_loop && ! defined key_mpp_omp77 #if defined key_vectopt_loop 78 78 INTEGER :: ji ! dummy loop indices 79 79 #else … … 95 95 ! 96 96 CASE ( 1:2 ) ! geothermal heat flux 97 #if defined key_vectopt_loop && ! defined key_mpp_omp97 #if defined key_vectopt_loop 98 98 DO ji = jpi+2, jpij-jpi-1 ! vector opt. (forced unrolling) 99 99 zqgh_trd = ro0cpr * qgh_trd0(ji,1) / fse3t(ji,1,nbotlevt(ji,1) ) -
trunk/NEMO/OPA_SRC/TRA/trabbl.F90
r719 r789 154 154 ! ----------------------------------------------------------------- 155 155 ! mbathy= number of w-level, minimum value=1 (cf dommsk.F) 156 # if defined key_vectopt_loop && ! defined key_mpp_omp156 # if defined key_vectopt_loop 157 157 jj = 1 158 158 DO ji = 1, jpij ! vector opt. (forced unrolling) … … 167 167 zsbb(ji,jj) = sb(ji,jj,ik) * tmask(ji,jj,1) 168 168 zdep(ji,jj) = fsdept(ji,jj,ik) ! depth of the ocean bottom T-level 169 # if ! defined key_vectopt_loop || defined key_mpp_omp169 # if ! defined key_vectopt_loop 170 170 END DO 171 171 # endif … … 173 173 174 174 IF( ln_zps ) THEN ! partial steps correction 175 # if defined key_vectopt_loop && ! defined key_mpp_omp175 # if defined key_vectopt_loop 176 176 jj = 1 177 177 DO ji = 1, jpij-jpi ! vector opt. (forced unrolling) … … 188 188 zahu(ji,jj) = atrbbl * e2u(ji,jj) * ze3u / e1u(ji,jj) * umask(ji,jj,1) 189 189 zahv(ji,jj) = atrbbl * e1v(ji,jj) * ze3v / e2v(ji,jj) * vmask(ji,jj,1) 190 # if ! defined key_vectopt_loop || defined key_mpp_omp190 # if ! defined key_vectopt_loop 191 191 END DO 192 192 # endif 193 193 END DO 194 194 ELSE ! z-coordinate - full steps or s-coordinate 195 # if defined key_vectopt_loop && ! defined key_mpp_omp195 # if defined key_vectopt_loop 196 196 jj = 1 197 197 DO ji = 1, jpij-jpi ! vector opt. (forced unrolling) … … 204 204 zahu(ji,jj) = atrbbl * e2u(ji,jj) * fse3u(ji,jj,iku) / e1u(ji,jj) * umask(ji,jj,1) 205 205 zahv(ji,jj) = atrbbl * e1v(ji,jj) * fse3v(ji,jj,ikv) / e2v(ji,jj) * vmask(ji,jj,1) 206 # if ! defined key_vectopt_loop || defined key_mpp_omp206 # if ! defined key_vectopt_loop 207 207 END DO 208 208 # endif … … 219 219 CASE ( 0 ) ! Jackett and McDougall (1994) formulation 220 220 221 # if defined key_vectopt_loop && ! defined key_mpp_omp221 # if defined key_vectopt_loop 222 222 jj = 1 223 223 DO ji = 1, jpij-jpi ! vector opt. (forced unrolling) … … 238 238 zsign = SIGN( 0.5, - zgdrho * ( zdep(ji+1,jj) - zdep(ji,jj) ) ) 239 239 zki(ji,jj) = ( 0.5 - zsign ) * zahu(ji,jj) 240 # if ! defined key_vectopt_loop || defined key_mpp_omp241 END DO 242 # endif 243 END DO 244 245 # if defined key_vectopt_loop && ! defined key_mpp_omp240 # if ! defined key_vectopt_loop 241 END DO 242 # endif 243 END DO 244 245 # if defined key_vectopt_loop 246 246 jj = 1 247 247 DO ji = 1, jpij-jpi ! vector opt. (forced unrolling) … … 262 262 zsign = sign( 0.5, -zgdrho * ( zdep(ji,jj+1) - zdep(ji,jj) ) ) 263 263 zkj(ji,jj) = ( 0.5 - zsign ) * zahv(ji,jj) 264 # if ! defined key_vectopt_loop || defined key_mpp_omp264 # if ! defined key_vectopt_loop 265 265 END DO 266 266 # endif … … 269 269 CASE ( 1 ) ! Linear formulation function of temperature only 270 270 ! 271 # if defined key_vectopt_loop && ! defined key_mpp_omp271 # if defined key_vectopt_loop 272 272 jj = 1 273 273 DO ji = 1, jpij-jpi ! vector opt. (forced unrolling) … … 281 281 zsign = SIGN( 0.5, - zgdrho * ( zdep(ji+1,jj) - zdep(ji,jj) ) ) 282 282 zki(ji,jj) = ( 0.5 - zsign ) * zahu(ji,jj) 283 # if ! defined key_vectopt_loop || defined key_mpp_omp284 END DO 285 # endif 286 END DO 287 288 # if defined key_vectopt_loop && ! defined key_mpp_omp283 # if ! defined key_vectopt_loop 284 END DO 285 # endif 286 END DO 287 288 # if defined key_vectopt_loop 289 289 jj = 1 290 290 DO ji = 1, jpij-jpi ! vector opt. (forced unrolling) … … 298 298 zsign = sign( 0.5, -zgdrho * ( zdep(ji,jj+1) - zdep(ji,jj) ) ) 299 299 zkj(ji,jj) = ( 0.5 - zsign ) * zahv(ji,jj) 300 # if ! defined key_vectopt_loop || defined key_mpp_omp300 # if ! defined key_vectopt_loop 301 301 END DO 302 302 # endif … … 305 305 CASE ( 2 ) ! Linear formulation function of temperature and salinity 306 306 307 # if defined key_vectopt_loop && ! defined key_mpp_omp307 # if defined key_vectopt_loop 308 308 jj = 1 309 309 DO ji = 1, jpij-jpi ! vector opt. (forced unrolling) … … 318 318 zsign = SIGN( 0.5, - zgdrho * ( zdep(ji+1,jj) - zdep(ji,jj) ) ) 319 319 zki(ji,jj) = ( 0.5 - zsign ) * zahu(ji,jj) 320 # if ! defined key_vectopt_loop || defined key_mpp_omp321 END DO 322 # endif 323 END DO 324 325 # if defined key_vectopt_loop && ! defined key_mpp_omp320 # if ! defined key_vectopt_loop 321 END DO 322 # endif 323 END DO 324 325 # if defined key_vectopt_loop 326 326 jj = 1 327 327 DO ji = 1, jpij-jpi ! vector opt. (forced unrolling) … … 336 336 zsign = sign( 0.5, -zgdrho * ( zdep(ji,jj+1) - zdep(ji,jj) ) ) 337 337 zkj(ji,jj) = ( 0.5 - zsign ) * zahv(ji,jj) 338 # if ! defined key_vectopt_loop || defined key_mpp_omp338 # if ! defined key_vectopt_loop 339 339 END DO 340 340 # endif … … 352 352 353 353 ! first derivative (gradient) 354 # if defined key_vectopt_loop && ! defined key_mpp_omp354 # if defined key_vectopt_loop 355 355 jj = 1 356 356 DO ji = 1, jpij-jpi ! vector opt. (forced unrolling) … … 364 364 zky(ji,jj) = zkj(ji,jj) * ( ztbb(ji,jj+1) - ztbb(ji,jj) ) 365 365 zkw(ji,jj) = zkj(ji,jj) * ( zsbb(ji,jj+1) - zsbb(ji,jj) ) 366 # if ! defined key_vectopt_loop || defined key_mpp_omp366 # if ! defined key_vectopt_loop 367 367 END DO 368 368 # endif … … 402 402 403 403 ! second derivative (divergence) and add to the general tracer trend 404 # if defined key_vectopt_loop && ! defined key_mpp_omp404 # if defined key_vectopt_loop 405 405 jj = 1 406 406 DO ji = jpi+2, jpij-jpi-1 ! vector opt. (forced unrolling) … … 417 417 ta(ji,jj,ik) = ta(ji,jj,ik) + zta 418 418 sa(ji,jj,ik) = sa(ji,jj,ik) + zsa 419 # if ! defined key_vectopt_loop || defined key_mpp_omp419 # if ! defined key_vectopt_loop 420 420 END DO 421 421 # endif -
trunk/NEMO/OPA_SRC/TRA/trabbl_adv.h90
r719 r789 99 99 ! mbathy= number of w-level, minimum value=1 (cf dommsk.F) 100 100 101 #if defined key_vectopt_loop && ! defined key_mpp_omp101 #if defined key_vectopt_loop 102 102 jj = 1 103 103 DO ji = 1, jpij ! vector opt. (forced unrolling) … … 115 115 zunb(ji,jj) = un(ji,jj,mbku(ji,jj)) 116 116 zvnb(ji,jj) = vn(ji,jj,mbkv(ji,jj)) 117 #if ! defined key_vectopt_loop || defined key_mpp_omp117 #if ! defined key_vectopt_loop 118 118 END DO 119 119 #endif … … 229 229 IF( ln_zps ) THEN ! partial steps correction 230 230 231 # if defined key_vectopt_loop && ! defined key_mpp_omp231 # if defined key_vectopt_loop 232 232 jj = 1 233 233 DO ji = 1, jpij-jpi ! vector opt. (forced unrolling) … … 249 249 v_bbl(ji,jj,ikv) = zalphay(ji,jj) * vn(ji,jj,ikv) * ze3v / fse3v(ji,jj,ikv) 250 250 ENDIF 251 # if ! defined key_vectopt_loop || defined key_mpp_omp251 # if ! defined key_vectopt_loop 252 252 END DO 253 253 # endif … … 259 259 ELSE ! if not partial step loop over the whole domain no lbc call 260 260 261 #if defined key_vectopt_loop && ! defined key_mpp_omp261 #if defined key_vectopt_loop 262 262 jj = 1 263 263 DO ji = 1, jpij ! vector opt. (forced unrolling) … … 272 272 v_bbl(ji,jj,ikv) = zalphay(ji,jj) * vn(ji,jj,ikv) 273 273 ENDIF 274 #if ! defined key_vectopt_loop || defined key_mpp_omp274 #if ! defined key_vectopt_loop 275 275 END DO 276 276 #endif … … 284 284 ! ... Second order centered tracer flux at u and v-points 285 285 286 # if defined key_vectopt_loop && ! defined key_mpp_omp286 # if defined key_vectopt_loop 287 287 jj = 1 288 288 DO ji = 1, jpij-jpi ! vector opt. (forced unrolling) … … 309 309 zwz(ji,jj) = ( ( zfvj + ABS( zfvj ) ) * zsbb(ji ,jj ) & 310 310 & +( zfvj - ABS( zfvj ) ) * zsbb(ji ,jj+1) ) * 0.5 311 #if ! defined key_vectopt_loop || defined key_mpp_omp311 #if ! defined key_vectopt_loop 312 312 END DO 313 313 #endif 314 314 END DO 315 # if defined key_vectopt_loop && ! defined key_mpp_omp315 # if defined key_vectopt_loop 316 316 jj = 1 317 317 DO ji = jpi+2, jpij-jpi-1 ! vector opt. (forced unrolling) … … 331 331 ta(ji,jj,ik) = ta(ji,jj,ik) + zta 332 332 sa(ji,jj,ik) = sa(ji,jj,ik) + zsa 333 #if ! defined key_vectopt_loop || defined key_mpp_omp333 #if ! defined key_vectopt_loop 334 334 END DO 335 335 #endif … … 365 365 IF( ln_zps ) THEN 366 366 367 # if defined key_vectopt_loop && ! defined key_mpp_omp367 # if defined key_vectopt_loop 368 368 jj = 1 369 369 DO ji = 1, jpij-jpi ! vector opt. (forced unrolling) … … 383 383 zwu(ji,jj) = zalphax(ji,jj) * e2u(ji,jj) * ze3u 384 384 zwv(ji,jj) = zalphay(ji,jj) * e1v(ji,jj) * ze3v 385 #if ! defined key_vectopt_loop || defined key_mpp_omp385 #if ! defined key_vectopt_loop 386 386 END DO 387 387 #endif … … 390 390 ELSE 391 391 392 # if defined key_vectopt_loop && ! defined key_mpp_omp392 # if defined key_vectopt_loop 393 393 jj = 1 394 394 DO ji = 1, jpij-jpi ! vector opt. (forced unrolling) … … 401 401 zwu(ji,jj) = zalphax(ji,jj) * e2u(ji,jj) * fse3u(ji,jj,iku) 402 402 zwv(ji,jj) = zalphay(ji,jj) * e1v(ji,jj) * fse3v(ji,jj,ikv) 403 #if ! defined key_vectopt_loop || defined key_mpp_omp403 #if ! defined key_vectopt_loop 404 404 END DO 405 405 #endif … … 409 409 410 410 411 # if defined key_vectopt_loop && ! defined key_mpp_omp411 # if defined key_vectopt_loop 412 412 jj = 1 413 413 DO ji = jpi+2, jpij-jpi-1 ! vector opt. (forced unrolling) … … 425 425 & ) / zbt 426 426 427 # if ! defined key_vectopt_loop || defined key_mpp_omp427 # if ! defined key_vectopt_loop 428 428 END DO 429 429 # endif -
trunk/NEMO/OPA_SRC/TRA/traldf_iso.F90
r719 r789 18 18 !! and with the vertical part of 19 19 !! the isopycnal or geopotential s-coord. operator 20 !! vector optimization, use k-j-i loops.21 20 !!---------------------------------------------------------------------- 22 21 USE oce ! ocean dynamics and active tracers … … 151 150 152 151 !CDIR PARALLEL DO PRIVATE( zdk1t, zdk1s, zftu, zfsu ) 153 !$OMP PARALLEL DO PRIVATE( zdk1t, zdk1s, zftu, zfsu )154 152 ! ! =============== 155 153 DO jk = 1, jpkm1 ! Horizontal slab -
trunk/NEMO/OPA_SRC/TRA/trazdf.F90
r719 r789 17 17 USE trazdf_exp ! vertical diffusion: explicit (tra_zdf_exp routine) 18 18 USE trazdf_imp ! vertical diffusion: implicit (tra_zdf_imp routine) 19 USE trazdf_imp_jki ! vertical diffusion implicit (tra_zdf_imp_jki routine)20 19 21 20 USE ldftra_oce ! ocean active tracers: lateral physics … … 90 89 CALL prt_ctl( tab3d_1=ta, clinfo1=' zdf1 - Ta: ', mask1=tmask, & 91 90 & tab3d_2=sa, clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) 92 CALL tra_zdf_imp_jki( kt, r2dt )93 CALL prt_ctl( tab3d_1=ta, clinfo1=' zdf2 - Ta: ', mask1=tmask, &94 & tab3d_2=sa, clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' )95 91 96 92 CASE ( 0 ) ! explicit scheme … … 102 98 ENDIF 103 99 104 CASE ( 1 ) ! implicit scheme (k-j-i loop)100 CASE ( 1 ) ! implicit scheme 105 101 CALL tra_zdf_imp ( kt, r2dt ) 106 IF( l_trdtra ) THEN ! save the vertical diffusive trends for further diagnostics107 DO jk = 1, jpkm1108 ztrdt(:,:,jk) = ( ( ta(:,:,jk) - tb(:,:,jk) ) / r2dt(jk) ) - ztrdt(:,:,jk)109 ztrds(:,:,jk) = ( ( sa(:,:,jk) - sb(:,:,jk) ) / r2dt(jk) ) - ztrds(:,:,jk)110 END DO111 CALL trd_mod( ztrdt, ztrds, jptra_trd_zdf, 'TRA', kt )112 ENDIF113 114 CASE ( 2 ) ! implicit scheme (j-k-i loop)115 CALL tra_zdf_imp_jki( kt, r2dt )116 102 IF( l_trdtra ) THEN ! save the vertical diffusive trends for further diagnostics 117 103 DO jk = 1, jpkm1 … … 137 123 !! ** Purpose : Choose the vertical mixing scheme 138 124 !! 139 !! ** Method : Set nzdf from ln_zdfexp and 'key_mpp_omp'.125 !! ** Method : Set nzdf from ln_zdfexp 140 126 !! nzdf = 0 explicit (time-splitting) scheme (ln_zdfexp=T) 141 127 !! = 1 implicit (euler backward) scheme (ln_zdfexp=F) 142 !! = 2 implicit (euler backward) scheme with j-k-i loops143 !! (ln_zdfexp=T and 'key_mpp_omp')144 128 !! NB: rotation of lateral mixing operator or TKE or KPP scheme, 145 129 !! the implicit scheme is required. … … 169 153 ENDIF 170 154 171 ! NEC autotasking / OpenMP172 #if defined key_mpp_omp173 IF( nzdf == 1 ) nzdf = 2 ! j-k-i loop174 #endif175 176 155 ! Test: esopa 177 156 IF( lk_esopa ) nzdf = -1 ! All schemes used … … 184 163 IF( nzdf == 0 ) WRITE(numout,*) ' Explicit time-splitting scheme' 185 164 IF( nzdf == 1 ) WRITE(numout,*) ' Implicit (euler backward) scheme' 186 IF( nzdf == 2 ) WRITE(numout,*) ' Implicit (euler backward) scheme with j-k-i loops'187 165 ENDIF 188 166 -
trunk/NEMO/OPA_SRC/TRA/trazdf_exp.F90
r719 r789 85 85 IF( kt == nit000 ) THEN 86 86 IF(lwp) WRITE(numout,*) 87 IF(lwp) WRITE(numout,*) 'tra_zdf_exp : explicit vertical mixing (j-k-i loops)'87 IF(lwp) WRITE(numout,*) 'tra_zdf_exp : explicit vertical mixing' 88 88 IF(lwp) WRITE(numout,*) '~~~~~~~~~~~' 89 89 ENDIF -
trunk/NEMO/OPA_SRC/TRA/trazdf_imp.F90
r719 r789 17 17 !! tra_zdf_imp : Update the tracer trend with the diagonal vertical 18 18 !! part of the mixing tensor. 19 !! Vector optimization, use k-j-i loops.20 19 !!---------------------------------------------------------------------- 21 20 !! * Modules used … … 106 105 IF( kt == nit000 ) THEN 107 106 IF(lwp)WRITE(numout,*) 108 IF(lwp)WRITE(numout,*) 'tra_zdf_imp : implicit vertical mixing (k-j-i loops)'107 IF(lwp)WRITE(numout,*) 'tra_zdf_imp : implicit vertical mixing' 109 108 IF(lwp)WRITE(numout,*) '~~~~~~~~~~~ ' 110 109 zavi = 0.e0 ! avoid warning at compilation phase when lk_ldfslp=F -
trunk/NEMO/OPA_SRC/TRA/zpshde.F90
r719 r789 130 130 131 131 ! Interpolation of T and S at the last ocean level 132 # if defined key_vectopt_loop && ! defined key_mpp_omp132 # if defined key_vectopt_loop 133 133 jj = 1 134 134 DO ji = 1, jpij-jpi ! vector opt. (forced unrolled) … … 193 193 pgsv(ji,jj) = vmask(ji,jj,1) * ( psal(ji,jj+1,ikv) - zsj(ji,jj) ) 194 194 ENDIF 195 # if ! defined key_vectopt_loop || defined key_mpp_omp195 # if ! defined key_vectopt_loop 196 196 END DO 197 197 # endif … … 205 205 206 206 ! Gradient of density at the last level 207 # if defined key_vectopt_loop && ! defined key_mpp_omp207 # if defined key_vectopt_loop 208 208 jj = 1 209 209 DO ji = 1, jpij-jpi ! vector opt. (forced unrolled) … … 226 226 pgrv(ji,jj) = vmask(ji,jj,1) * ( prd(ji,jj+1,ikv) - zrj(ji,jj) ) 227 227 ENDIF 228 # if ! defined key_vectopt_loop || defined key_mpp_omp228 # if ! defined key_vectopt_loop 229 229 END DO 230 230 # endif -
trunk/NEMO/OPA_SRC/ZDF/zdfbfr.F90
r719 r789 80 80 81 81 CASE( 0 ) ! no-slip boundary condition 82 # if defined key_vectopt_loop && ! defined key_mpp_omp82 # if defined key_vectopt_loop 83 83 jj = 1 84 84 DO ji = jpi+2, jpij-jpi-1 ! vector opt. (forced unrolling) … … 93 93 avmu(ji,jj,ikbu) = 2. * avmu(ji,jj,ikbum1) 94 94 avmv(ji,jj,ikbv) = 2. * avmv(ji,jj,ikbvm1) 95 # if ! defined key_vectopt_loop || defined key_mpp_omp95 # if ! defined key_vectopt_loop 96 96 END DO 97 97 # endif … … 99 99 100 100 CASE( 1 ) ! linear botton friction 101 # if defined key_vectopt_loop && ! defined key_mpp_omp101 # if defined key_vectopt_loop 102 102 jj = 1 103 103 DO ji = jpi+2, jpij-jpi-1 ! vector opt. (forced unrolling) … … 110 110 avmu(ji,jj,ikbu) = bfri1 * fse3uw(ji,jj,ikbu) 111 111 avmv(ji,jj,ikbv) = bfri1 * fse3vw(ji,jj,ikbv) 112 # if ! defined key_vectopt_loop || defined key_mpp_omp112 # if ! defined key_vectopt_loop 113 113 END DO 114 114 # endif … … 116 116 117 117 CASE( 2 ) ! quadratic botton friction 118 # if defined key_vectopt_loop && ! defined key_mpp_omp118 # if defined key_vectopt_loop 119 119 jj = 1 120 120 !CDIR NOVERRCHK … … 142 142 avmu(ji,jj,ikbu) = bfri2 * zecu * fse3uw(ji,jj,ikbu) 143 143 avmv(ji,jj,ikbv) = bfri2 * zecv * fse3vw(ji,jj,ikbv) 144 # if ! defined key_vectopt_loop || defined key_mpp_omp144 # if ! defined key_vectopt_loop 145 145 END DO 146 146 # endif … … 148 148 149 149 CASE( 3 ) ! free-slip boundary condition 150 # if defined key_vectopt_loop && ! defined key_mpp_omp150 # if defined key_vectopt_loop 151 151 jj = 1 152 152 DO ji = jpi+2, jpij-jpi-1 ! vector opt. (forced unrolling) … … 159 159 avmu(ji,jj,ikbu) = 0.e0 160 160 avmv(ji,jj,ikbv) = 0.e0 161 # if ! defined key_vectopt_loop || defined key_mpp_omp161 # if ! defined key_vectopt_loop 162 162 END DO 163 163 # endif -
trunk/NEMO/OPA_SRC/ZDF/zdfevd.F90
r719 r789 79 79 DO jk = 1, jpkm1 ! Horizontal slab 80 80 ! ! =============== 81 # if defined key_vectopt_loop && ! defined key_mpp_omp81 # if defined key_vectopt_loop 82 82 !!! WHERE( rn2(:,:,jk) <= -1.e-12 ) avt(:,:,jk) = tmask(:,:,jk) * avevd ! agissant sur T SEUL! 83 83 jj = 1 ! big loop forced … … 129 129 ! ! =============== 130 130 !!! WHERE( rn2(:,:,jk) <= -1.e-12 ) avt(:,:,jk) = tmask(:,:,jk) * avevd ! agissant sur T SEUL! 131 # if defined key_vectopt_loop && ! defined key_mpp_omp131 # if defined key_vectopt_loop 132 132 jj = 1 ! big loop forced 133 133 DO ji = 1, jpij -
trunk/NEMO/OPA_SRC/ZDF/zdfmxl.F90
r719 r789 44 44 45 45 CONTAINS 46 47 # if defined key_mpp_omp48 !!----------------------------------------------------------------------49 !! 'key_mpp_omp' j-k-i loop (j-slab)50 !!----------------------------------------------------------------------51 52 SUBROUTINE zdf_mxl( kt )53 !!----------------------------------------------------------------------54 !! *** ROUTINE zdfmxl ***55 !!56 !! ** Purpose : Compute the turbocline depth and the mixed layer depth57 !! with a density criteria.58 !!59 !! ** Method : The turbocline depth is the depth at which the vertical60 !! eddy diffusivity coefficient (resulting from the vertical physics61 !! alone, not the isopycnal part, see trazdf.F) fall below a given62 !! value defined locally (avt_c here taken equal to 5 cm/s2)63 !!64 !! ** Action :65 !!66 !!----------------------------------------------------------------------67 !! * Arguments68 INTEGER, INTENT( in ) :: kt ! ocean time-step index69 70 !! * Local declarations71 INTEGER :: ji, jj, jk ! dummy loop indices72 INTEGER :: ik ! temporary integer73 INTEGER, DIMENSION(jpi,jpj) :: &74 imld ! temporary workspace75 !!----------------------------------------------------------------------76 77 IF( kt == nit000 ) THEN78 IF(lwp) WRITE(numout,*)79 IF(lwp) WRITE(numout,*) 'zdf_mxl : mixed layer depth, j-k-i loops'80 IF(lwp) WRITE(numout,*) '~~~~~~~'81 ENDIF82 83 ! ! ===============84 DO jj = 1, jpj ! Vertical slab85 ! ! ===============86 87 ! 1. Turbocline depth88 ! -------------------89 ! last w-level at which avt<avt_c (starting from the bottom jk=jpk)90 ! (since avt(.,.,jpk)=0, we have jpk=< imld =< 2 )91 DO jk = jpk, 2, -192 DO ji = 1, jpi93 IF( avt(ji,jj,jk) < avt_c ) imld(ji,jj) = jk94 END DO95 END DO96 97 ! Turbocline depth and sub-turbocline temperature98 DO ji = 1, jpi99 ik = imld(ji,jj)100 hmld (ji,jj) = fsdepw(ji,jj,ik) * tmask(ji,jj,1)101 END DO102 103 !!gm idea104 !!105 !!gm DO jk = jpk, 2, -1106 !!gm DO ji = 1, jpi107 !!gm IF( avt(ji,jj,jk) < avt_c ) hmld(ji,jj) = fsdepw(ji,jj,jk) * tmask(ji,jj,1)108 !!gm END DO109 !!gm END DO110 !!gm111 112 ! 2. Mixed layer depth113 ! --------------------114 ! Initialization to the number of w ocean point mbathy115 nmln(:,jj) = mbathy(:,jj)116 117 ! Last w-level at which rhop>=rho surf+rho_c (starting from jpk-1)118 ! (rhop defined at t-point, thus jk-1 for w-level just above)119 DO jk = jpkm1, 2, -1120 DO ji = 1, jpi121 IF( rhop(ji,jj,jk) > rhop(ji,jj,1) + rho_c ) nmln(ji,jj) = jk122 END DO123 END DO124 125 ! Mixed layer depth126 DO ji = 1, jpi127 ik = nmln(ji,jj)128 hmlp (ji,jj) = fsdepw(ji,jj,ik) * tmask(ji,jj,1)129 hmlpt(ji,jj) = fsdept(ji,jj,ik-1)130 END DO131 ! ! ===============132 END DO ! End of slab133 ! ! ===============134 135 IF(ln_ctl) CALL prt_ctl( tab2d_1=REAL(nmln,wp), clinfo1=' nmln : ', tab2d_2=hmld, clinfo2=' hmld : ', ovlap=1 )136 137 END SUBROUTINE zdf_mxl138 139 # else140 !!----------------------------------------------------------------------141 !! Default option : k-j-i loop142 !!----------------------------------------------------------------------143 46 144 47 SUBROUTINE zdf_mxl( kt ) … … 237 140 238 141 END SUBROUTINE zdf_mxl 239 #endif240 142 241 143 !!====================================================================== -
trunk/NEMO/OPA_SRC/ZDF/zdftke.F90
r746 r789 43 43 44 44 PUBLIC zdf_tke ! routine called in step module 45 PUBLIC zdf_tke_init ! routine also called in zdftke_jki module46 PUBLIC tke_rst ! routine also called in zdftke_jki module47 45 48 46 LOGICAL , PUBLIC, PARAMETER :: lk_zdftke = .TRUE. !: TKE vertical mixing flag -
trunk/NEMO/OPA_SRC/eosbn2.F90
r719 r789 488 488 DO jj = 1, jpjm1 489 489 !CDIR NOVERRCHK 490 #if defined key_mpp_omp491 DO ji = 1, jpim1492 #else493 490 DO ji = 1, fs_jpim1 ! vector opt. 494 #endif495 491 zws(ji,jj) = SQRT( ABS( psal(ji,jj) ) ) 496 492 END DO … … 500 496 DO jj = 1, jpjm1 ! Horizontal slab 501 497 ! ! =============== 502 #if defined key_mpp_omp503 DO ji = 1, jpim1504 #else505 498 DO ji = 1, fs_jpim1 ! vector opt. 506 #endif507 499 508 500 zmask = tmask(ji,jj,1) ! land/sea bottom mask = surf. mask … … 555 547 DO jj = 1, jpjm1 ! Horizontal slab 556 548 ! ! =============== 557 #if defined key_mpp_omp558 DO ji = 1, jpim1559 #else560 549 DO ji = 1, fs_jpim1 ! vector opt. 561 #endif562 550 prd(ji,jj) = ( 0.0285 - ralpha * ptem(ji,jj) ) * tmask(ji,jj,1) 563 551 END DO … … 572 560 DO jj = 1, jpjm1 ! Horizontal slab 573 561 ! ! =============== 574 #if defined key_mpp_omp575 DO ji = 1, jpim1576 #else577 562 DO ji = 1, fs_jpim1 ! vector opt. 578 #endif579 563 prd(ji,jj) = ( rbeta * psal(ji,jj) - ralpha * ptem(ji,jj) ) * tmask(ji,jj,1) 580 564 END DO -
trunk/NEMO/OPA_SRC/par_oce.F90
r719 r789 219 219 #endif 220 220 221 #if defined key_mpp_omp222 LOGICAL, PUBLIC, PARAMETER :: lk_jki = .TRUE. !: j-k-i loop flag223 #else224 LOGICAL, PUBLIC, PARAMETER :: lk_jki = .FALSE. !: k-j-i loop flag225 #endif226 227 221 !!====================================================================== 228 222 END MODULE par_oce -
trunk/NEMO/OPA_SRC/step.F90
r782 r789 88 88 USE zdfbfr ! bottom friction (zdf_bfr routine) 89 89 USE zdftke ! TKE vertical mixing (zdf_tke routine) 90 USE zdftke_jki ! TKE vertical mixing (zdf_tke routine)91 90 USE zdfkpp ! KPP vertical mixing (zdf_kpp routine) 92 91 USE zdfddm ! double diffusion mixing (zdf_ddm routine) … … 248 247 ! ! Vertical eddy viscosity and diffusivity coefficients 249 248 IF( lk_zdfric ) CALL zdf_ric( kstp ) ! Richardson number dependent Kz 250 #if defined key_mpp_omp 251 IF( lk_zdftke ) CALL zdf_tke_jki( kstp ) ! TKE closure scheme for Kz - j-k-i loops 252 #else 249 253 250 IF( lk_zdftke ) CALL zdf_tke( kstp ) ! TKE closure scheme for Kz 254 #endif 251 255 252 IF( lk_zdfkpp ) CALL zdf_kpp( kstp ) ! KPP closure scheme for Kz 256 253
Note: See TracChangeset
for help on using the changeset viewer.
