Changeset 2034 for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP
- Timestamp:
- 2010-07-29T17:05:35+02:00 (14 years ago)
- Location:
- branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP
- Files:
-
- 5 edited
-
trcadv.F90 (modified) (2 diffs)
-
trcbbl.F90 (modified) (1 diff)
-
trcldf.F90 (modified) (2 diffs)
-
trcnxt.F90 (modified) (1 diff)
-
trczdf.F90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP/trcadv.F90
r2030 r2034 39 39 # include "vectopt_loop_substitute.h90" 40 40 !!---------------------------------------------------------------------- 41 !! NEMO/OPA 3. 2 , LOCEAN-IPSL (2009)42 !! $Id: trcadv.F90 1601 2009-08-11 10:09:19Z ctlod $41 !! NEMO/OPA 3.3 , LOCEAN-IPSL (2010) 42 !! $Id: trcadv.F90 2024 2010-07-29 10:57:35Z cetlod $ 43 43 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 44 44 !!---------------------------------------------------------------------- … … 76 76 ! ! add the eiv transport (if necessary) 77 77 IF( lk_traldf_eiv ) CALL tra_adv_eiv( kt, zun, zvn, zwn, 'TRC' ) 78 79 SELECT CASE ( nadv ) ! compute advection trend and add it to general trend80 CASE ( 1 ) ; CALL tra_adv_cen2 ( kt , 'TRC', zun, zvn, zwn, &81 & trb, trn , tra, jptra ) ! 2nd order centered scheme82 CASE ( 2 ) ; CALL tra_adv_tvd ( kt , 'TRC', zun, zvn, zwn, &83 & trb, trn , tra, jptra ) ! TVD scheme84 CASE ( 3 ) ; CALL tra_adv_muscl ( kt , 'TRC', zun, zvn, zwn, &85 & trb, tra , jptra ) ! MUSCL scheme86 CASE ( 4 ) ; CALL tra_adv_muscl2( kt , 'TRC', zun, zvn, zwn, &87 & trb, trn , tra, jptra ) ! MUSCL2 scheme88 CASE ( 5 ) ; CALL tra_adv_ubs ( kt , 'TRC', zun, zvn, zwn, &89 & trb, trn , tra, jptra ) ! UBS scheme90 CASE ( 6 ) ; CALL tra_adv_qck ( kt , 'TRC', zun, zvn, zwn, &91 & trb, trn , tra, jptra ) ! QUICKEST scheme92 78 ! 93 CASE (-1 ) ! esopa: test all possibility with control print 94 CALL tra_adv_cen2 ( kt , 'TRC', zun, zvn, zwn, & 95 & trb, trn , tra, jptra ) 96 WRITE(charout, FMT="('adv1')") ; CALL prt_ctl_trc_info(charout) 97 CALL prt_ctl_trc(tab4d=tra, mask=tmask, clinfo=ctrcnm,clinfo2='trd') 98 ! 99 CALL tra_adv_tvd ( kt , 'TRC', zun, zvn, zwn, & 100 & trb, trn , tra, jptra ) 101 WRITE(charout, FMT="('adv2')") ; CALL prt_ctl_trc_info(charout) 102 CALL prt_ctl_trc(tab4d=tra, mask=tmask, clinfo=ctrcnm,clinfo2='trd') 103 ! 104 CALL tra_adv_muscl ( kt , 'TRC', zun, zvn, zwn, & 105 & trb, tra, jptra ) 106 WRITE(charout, FMT="('adv3')") ; CALL prt_ctl_trc_info(charout) 107 CALL prt_ctl_trc(tab4d=tra, mask=tmask, clinfo=ctrcnm,clinfo2='trd') 108 ! 109 CALL tra_adv_muscl2( kt , 'TRC', zun, zvn, zwn, & 110 & trb, trn , tra, jptra ) 111 WRITE(charout, FMT="('adv4')") ; CALL prt_ctl_trc_info(charout) 112 CALL prt_ctl_trc(tab4d=tra, mask=tmask, clinfo=ctrcnm,clinfo2='trd') 113 ! 114 CALL tra_adv_ubs ( kt , 'TRC', zun, zvn, zwn, & 115 & trb, trn , tra, jptra ) 116 WRITE(charout, FMT="('adv5')") ; CALL prt_ctl_trc_info(charout) 117 CALL prt_ctl_trc(tab4d=tra, mask=tmask, clinfo=ctrcnm,clinfo2='trd') 118 ! 119 CALL tra_adv_qck ( kt , 'TRC', zun, zvn, zwn, & 120 & trb, trn , tra, jptra ) 121 WRITE(charout, FMT="('adv6')") ; CALL prt_ctl_trc_info(charout) 122 CALL prt_ctl_trc(tab4d=tra, mask=tmask, clinfo=ctrcnm,clinfo2='trd') 123 ! 79 SELECT CASE ( nadv ) !== compute advection trend and add it to general trend ==! 80 CASE ( 1 ) ; CALL tra_adv_cen2 ( kt, 'TRC', zun, zvn, zwn, trb, trn, tra, jptra ) ! 2nd order centered 81 CASE ( 2 ) ; CALL tra_adv_tvd ( kt, 'TRC', zun, zvn, zwn, trb, trn, tra, jptra ) ! TVD 82 CASE ( 3 ) ; CALL tra_adv_muscl ( kt, 'TRC', zun, zvn, zwn, trb, tra, jptra ) ! MUSCL 83 CASE ( 4 ) ; CALL tra_adv_muscl2( kt, 'TRC', zun, zvn, zwn, trb, trn, tra, jptra ) ! MUSCL2 84 CASE ( 5 ) ; CALL tra_adv_ubs ( kt, 'TRC', zun, zvn, zwn, trb, trn, tra, jptra ) ! UBS 85 CASE ( 6 ) ; CALL tra_adv_qck ( kt, 'TRC', zun, zvn, zwn, trb, trn, tra, jptra ) ! QUICKEST 86 ! 87 CASE (-1 ) !== esopa: test all possibility with control print ==! 88 CALL tra_adv_cen2 ( kt, 'TRC', zun, zvn, zwn, trb, trn, tra, jptra ) 89 WRITE(charout, FMT="('adv1')") ; CALL prt_ctl_trc_info(charout) 90 CALL prt_ctl_trc(tab4d=tra, mask=tmask, clinfo=ctrcnm,clinfo2='trd') 91 CALL tra_adv_tvd ( kt, 'TRC', zun, zvn, zwn, trb, trn, tra, jptra ) 92 WRITE(charout, FMT="('adv2')") ; CALL prt_ctl_trc_info(charout) 93 CALL prt_ctl_trc(tab4d=tra, mask=tmask, clinfo=ctrcnm,clinfo2='trd') 94 CALL tra_adv_muscl ( kt, 'TRC', zun, zvn, zwn, trb, tra, jptra ) 95 WRITE(charout, FMT="('adv3')") ; CALL prt_ctl_trc_info(charout) 96 CALL prt_ctl_trc(tab4d=tra, mask=tmask, clinfo=ctrcnm,clinfo2='trd') 97 CALL tra_adv_muscl2( kt, 'TRC', zun, zvn, zwn, trb, trn, tra, jptra ) 98 WRITE(charout, FMT="('adv4')") ; CALL prt_ctl_trc_info(charout) 99 CALL prt_ctl_trc(tab4d=tra, mask=tmask, clinfo=ctrcnm,clinfo2='trd') 100 CALL tra_adv_ubs ( kt, 'TRC', zun, zvn, zwn, trb, trn, tra, jptra ) 101 WRITE(charout, FMT="('adv5')") ; CALL prt_ctl_trc_info(charout) 102 CALL prt_ctl_trc(tab4d=tra, mask=tmask, clinfo=ctrcnm,clinfo2='trd') 103 CALL tra_adv_qck ( kt, 'TRC', zun, zvn, zwn, trb, trn, tra, jptra ) 104 WRITE(charout, FMT="('adv6')") ; CALL prt_ctl_trc_info(charout) 105 CALL prt_ctl_trc(tab4d=tra, mask=tmask, clinfo=ctrcnm,clinfo2='trd') 106 ! 124 107 END SELECT 125 108 -
branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP/trcbbl.F90
r2030 r2034 34 34 # include "top_substitute.h90" 35 35 !!---------------------------------------------------------------------- 36 !! NEMO/OPA 3. 2 , LOCEAN-IPSL (2009)36 !! NEMO/OPA 3.3 , LOCEAN-IPSL (2010) 37 37 !! $Id$ 38 38 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) -
branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP/trcldf.F90
r2030 r2034 41 41 # include "vectopt_loop_substitute.h90" 42 42 !!---------------------------------------------------------------------- 43 !! OPA 9.0 , LOCEAN-IPSL (2006)44 !! $Id: tr aldf.F90 1601 2009-08-11 10:09:19Z ctlod $43 !! NEMO/OPA 3.3 , LOCEAN-IPSL (2010) 44 !! $Id: trcldf.F90 2024 2010-07-29 10:57:35Z cetlod $ 45 45 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 46 46 !!---------------------------------------------------------------------- … … 70 70 71 71 SELECT CASE ( nldf ) ! compute lateral mixing trend and add it to the general trend 72 CASE ( 0 ) ; CALL tra_ldf_lap ( kt , 'TRC', gtru , gtrv, & 73 & trb, tra , jptra ) ! iso-level laplacian 74 CASE ( 1 ) ; CALL tra_ldf_iso ( kt , 'TRC', gtru , gtrv, & 75 & trb, tra , jptra, rn_ahtrb_0 ) ! rotated laplacian 76 CASE ( 2 ) ; CALL tra_ldf_bilap ( kt , 'TRC', gtru , gtrv, & 77 & trb, tra , jptra ) ! iso-level bilaplacian 78 CASE ( 3 ) ; CALL tra_ldf_bilapg( kt , 'TRC', trb, tra, jptra ) ! s-coord. horizontal bilaplacian 72 CASE ( 0 ) ; CALL tra_ldf_lap ( kt , 'TRC', gtru, gtrv, trb, tra, jptra ) ! iso-level laplacian 73 CASE ( 1 ) ; CALL tra_ldf_iso ( kt , 'TRC', gtru, gtrv, trb, tra, jptra, rn_ahtb_0 ) ! rotated laplacian 74 CASE ( 2 ) ; CALL tra_ldf_bilap ( kt , 'TRC', gtru, gtrv, trb, tra, jptra ) ! iso-level bilaplacian 75 CASE ( 3 ) ; CALL tra_ldf_bilapg( kt , 'TRC', trb, tra, jptra ) ! s-coord. horizontal bilaplacian 79 76 ! 80 77 CASE ( -1 ) ! esopa: test all possibility with control print 81 CALL tra_ldf_lap ( kt , 'TRC', gtru, gtrv, & 82 & trb, tra , jptra ) 83 WRITE(charout, FMT="('ldf0 ')") ; CALL prt_ctl_trc_info(charout) 84 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) 85 ! 86 CALL tra_ldf_iso ( kt , 'TRC', gtru , gtrv, & 87 & trb, tra , jptra, rn_ahtrb_0 ) 88 WRITE(charout, FMT="('ldf1 ')") ; CALL prt_ctl_trc_info(charout) 89 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) 90 ! 91 CALL tra_ldf_bilap ( kt , 'TRC', gtru , gtrv, & 92 & trb, tra , jptra ) 93 WRITE(charout, FMT="('ldf2 ')") ; CALL prt_ctl_trc_info(charout) 94 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) 95 ! 96 CALL tra_ldf_bilapg( kt, 'TRC', trb, tra , jptra ) 97 WRITE(charout, FMT="('ldf3 ')") ; CALL prt_ctl_trc_info(charout) 98 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) 78 CALL tra_ldf_lap ( kt , 'TRC', gtru, gtrv, trb, tra, jptra ) 79 WRITE(charout, FMT="('ldf0 ')") ; CALL prt_ctl_trc_info(charout) 80 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) 81 CALL tra_ldf_iso ( kt , 'TRC', gtru, gtrv, trb, tra, jptra, rn_ahtb_0 ) 82 WRITE(charout, FMT="('ldf1 ')") ; CALL prt_ctl_trc_info(charout) 83 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) 84 CALL tra_ldf_bilap ( kt , 'TRC', gtru, gtrv, trb, tra, jptra ) 85 WRITE(charout, FMT="('ldf2 ')") ; CALL prt_ctl_trc_info(charout) 86 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) 87 CALL tra_ldf_bilapg( kt , 'TRC', trb, tra, jptra ) 88 WRITE(charout, FMT="('ldf3 ')") ; CALL prt_ctl_trc_info(charout) 89 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) 99 90 END SELECT 100 91 ! -
branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP/trcnxt.F90
r2030 r2034 120 120 121 121 ! Leap-Frog + Asselin filter time stepping 122 IF( lk_vvl ) THEN ; CALL tra_nxt_vvl( kt , nittrc000, & 123 & trb, trn, tra, jptra ) ! variable volume level (vvl) 124 ELSE ; CALL tra_nxt_fix( kt , nittrc000, & 125 & trb, trn, tra, jptra ) ! fixed volume level 122 IF( lk_vvl ) THEN ; CALL tra_nxt_vvl( kt, nittrc000, trb, trn, tra, jptra ) ! variable volume level (vvl) 123 ELSE ; CALL tra_nxt_fix( kt, nittrc000, trb, trn, tra, jptra ) ! fixed volume level 126 124 ENDIF 127 125 -
branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP/trczdf.F90
r2030 r2034 41 41 # include "vectopt_loop_substitute.h90" 42 42 !!---------------------------------------------------------------------- 43 !! OPA 9.0 , LOCEAN-IPSL (2005)44 !! $Id: tr azdf.F90 1533 2009-07-24 09:54:48Z ctlod $43 !! NEMO/OPA 3.3 , LOCEAN-IPSL (2010) 44 !! $Id: trcldf.F90 2024 2010-07-29 10:57:35Z cetlod $ 45 45 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 46 46 !!---------------------------------------------------------------------- … … 76 76 SELECT CASE ( nzdf ) ! compute lateral mixing trend and add it to the general trend 77 77 CASE ( -1 ) ! esopa: test all possibility with control print 78 CALL tra_zdf_exp( kt , 'TRC', r2dt, nn_trczdf_exp, & 79 & trb, tra, jptra ) 80 WRITE(charout, FMT="('zdf1 ')") ; CALL prt_ctl_trc_info(charout) 81 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) 82 ! 83 CALL tra_zdf_imp( kt , 'TRC', r2dt, & 84 & trb, tra, jptra ) 85 WRITE(charout, FMT="('zdf2 ')") ; CALL prt_ctl_trc_info(charout) 86 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) 87 CASE ( 0 ) ; CALL tra_zdf_exp( kt , 'TRC', r2dt, nn_trczdf_exp, & 88 & trb, tra , jptra ) ! explicit scheme 89 CASE ( 1 ) ; CALL tra_zdf_imp( kt , 'TRC', r2dt, & 90 & trb, tra , jptra ) ! implicit scheme 78 CALL tra_zdf_exp( kt , 'TRC', r2dt, nn_trczdf_exp, trb, tra, jptra ) 79 WRITE(charout, FMT="('zdf1 ')") ; CALL prt_ctl_trc_info(charout) 80 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) 81 CALL tra_zdf_imp( kt , 'TRC', r2dt, trb, tra, jptra ) 82 WRITE(charout, FMT="('zdf2 ')") ; CALL prt_ctl_trc_info(charout) 83 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) 84 CASE ( 0 ) ; CALL tra_zdf_exp( kt , 'TRC', r2dt, nn_trczdf_exp, trb, tra, jptra ) ! explicit scheme 85 CASE ( 1 ) ; CALL tra_zdf_imp( kt , 'TRC', r2dt, trb, tra, jptra ) ! implicit scheme 91 86 92 87 END SELECT
Note: See TracChangeset
for help on using the changeset viewer.
