- Timestamp:
- 2011-10-13T11:41:49+02:00 (13 years ago)
- Location:
- branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA
- Files:
-
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90
r2892 r2910 100 100 101 101 SELECT CASE ( nadv ) !== compute advection trend and add it to general trend ==! 102 CASE ( 1 ) ; CALL tra_adv_cen2 ( kt, nit000, 'TRA', zun, zvn, zwn, tsb, tsn, tsa, jpts ) ! 2nd order centered103 CASE ( 2 ) ; CALL tra_adv_tvd ( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsn, tsa, jpts ) ! TVD104 CASE ( 3 ) ; CALL tra_adv_muscl ( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsa, jpts ) ! MUSCL105 CASE ( 4 ) ; CALL tra_adv_muscl2( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsn, tsa, jpts ) ! MUSCL2106 CASE ( 5 ) ; CALL tra_adv_ubs ( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsn, tsa, jpts ) ! UBS107 CASE ( 6 ) ; CALL tra_adv_qck ( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsn, tsa, jpts ) ! QUICKEST102 CASE ( 1 ) ; CALL tra_adv_cen2 ( kt, nit000, 'TRA', zun, zvn, zwn, tsb, tsn, tsa, jpts ) ! 2nd order centered 103 CASE ( 2 ) ; CALL tra_adv_tvd ( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsn, tsa, jpts ) ! TVD 104 CASE ( 3 ) ; CALL tra_adv_muscl ( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsa, jpts ) ! MUSCL 105 CASE ( 4 ) ; CALL tra_adv_muscl2( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsn, tsa, jpts ) ! MUSCL2 106 CASE ( 5 ) ; CALL tra_adv_ubs ( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsn, tsa, jpts ) ! UBS 107 CASE ( 6 ) ; CALL tra_adv_qck ( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsn, tsa, jpts ) ! QUICKEST 108 108 ! 109 109 CASE (-1 ) !== esopa: test all possibility with control print ==! 110 CALL tra_adv_cen2 ( kt, nit000, 'TRA', zun, zvn, zwn, tsb, tsn, tsa, jpts )110 CALL tra_adv_cen2 ( kt, nit000, 'TRA', zun, zvn, zwn, tsb, tsn, tsa, jpts ) 111 111 CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' adv0 - Ta: ', mask1=tmask, & 112 112 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) 113 CALL tra_adv_tvd ( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsn, tsa, jpts )113 CALL tra_adv_tvd ( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsn, tsa, jpts ) 114 114 CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' adv1 - Ta: ', mask1=tmask, & 115 115 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) 116 CALL tra_adv_muscl ( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsa, jpts )116 CALL tra_adv_muscl ( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsa, jpts ) 117 117 CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' adv3 - Ta: ', mask1=tmask, & 118 118 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) 119 CALL tra_adv_muscl2( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsn, tsa, jpts )119 CALL tra_adv_muscl2( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsn, tsa, jpts ) 120 120 CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' adv4 - Ta: ', mask1=tmask, & 121 121 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) 122 CALL tra_adv_ubs ( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsn, tsa, jpts )122 CALL tra_adv_ubs ( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsn, tsa, jpts ) 123 123 CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' adv5 - Ta: ', mask1=tmask, & 124 124 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) 125 CALL tra_adv_qck ( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsn, tsa, jpts )125 CALL tra_adv_qck ( kt, nit000, 'TRA', r2dtra, zun, zvn, zwn, tsb, tsn, tsa, jpts ) 126 126 CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' adv6 - Ta: ', mask1=tmask, & 127 127 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) -
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90
r2892 r2910 53 53 CONTAINS 54 54 55 SUBROUTINE tra_adv_cen2( kt, nit000, cdtype, pun, pvn, pwn, &55 SUBROUTINE tra_adv_cen2( kt, kit000, cdtype, pun, pvn, pwn, & 56 56 & ptb, ptn, pta, kjpt ) 57 57 !!---------------------------------------------------------------------- … … 116 116 ! 117 117 INTEGER , INTENT(in ) :: kt ! ocean time-step index 118 INTEGER , INTENT(in ) :: nit000 ! first time step index118 INTEGER , INTENT(in ) :: kit000 ! first time step index 119 119 CHARACTER(len=3) , INTENT(in ) :: cdtype ! =TRA or TRC (tracer indicator) 120 120 INTEGER , INTENT(in ) :: kjpt ! number of tracers … … 136 136 ENDIF 137 137 138 IF( kt == nit000 ) THEN138 IF( kt == kit000 ) THEN 139 139 IF(lwp) WRITE(numout,*) 140 140 IF(lwp) WRITE(numout,*) 'tra_adv_cen2 : 2nd order centered advection scheme on ', cdtype -
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_eiv.F90
r2892 r2910 45 45 CONTAINS 46 46 47 SUBROUTINE tra_adv_eiv( kt, nit000, pun, pvn, pwn, cdtype )47 SUBROUTINE tra_adv_eiv( kt, kit000, pun, pvn, pwn, cdtype ) 48 48 !!---------------------------------------------------------------------- 49 49 !! *** ROUTINE tra_adv_eiv *** … … 69 69 #endif 70 70 INTEGER , INTENT(in ) :: kt ! ocean time-step index 71 INTEGER , INTENT(in ) :: nit000 ! first time step index71 INTEGER , INTENT(in ) :: kit000 ! first time step index 72 72 CHARACTER(len=3) , INTENT(in ) :: cdtype ! =TRA or TRC (tracer indicator) 73 73 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pun ! in : 3 ocean velocity components … … 91 91 ENDIF 92 92 93 IF( kt == nit000 ) THEN93 IF( kt == kit000 ) THEN 94 94 IF(lwp) WRITE(numout,*) 95 95 IF(lwp) WRITE(numout,*) 'tra_adv_eiv : eddy induced advection on ', cdtype,' :' … … 204 204 !!---------------------------------------------------------------------- 205 205 CONTAINS 206 SUBROUTINE tra_adv_eiv( kt, nit000, pun, pvn, pwn, cdtype ) ! Empty routine206 SUBROUTINE tra_adv_eiv( kt, kit000, pun, pvn, pwn, cdtype ) ! Empty routine 207 207 INTEGER :: kt 208 INTEGER :: nit000208 INTEGER :: kit000 209 209 CHARACTER(len=3) :: cdtype 210 210 REAL, DIMENSION(:,:,:) :: pun, pvn, pwn -
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90
r2892 r2910 44 44 CONTAINS 45 45 46 SUBROUTINE tra_adv_muscl( kt, nit000,cdtype, p2dt, pun, pvn, pwn, &46 SUBROUTINE tra_adv_muscl( kt, kit000, cdtype, p2dt, pun, pvn, pwn, & 47 47 & ptb, pta, kjpt ) 48 48 !!---------------------------------------------------------------------- … … 66 66 ! 67 67 INTEGER , INTENT(in ) :: kt ! ocean time-step index 68 INTEGER , INTENT(in ) :: nit000 ! first time step index68 INTEGER , INTENT(in ) :: kit000 ! first time step index 69 69 CHARACTER(len=3) , INTENT(in ) :: cdtype ! =TRA or TRC (tracer indicator) 70 70 INTEGER , INTENT(in ) :: kjpt ! number of tracers … … 84 84 ENDIF 85 85 86 IF( kt == nit000 ) THEN86 IF( kt == kit000 ) THEN 87 87 IF(lwp) WRITE(numout,*) 88 88 IF(lwp) WRITE(numout,*) 'tra_adv : MUSCL advection scheme on ', cdtype -
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.F90
r2892 r2910 42 42 CONTAINS 43 43 44 SUBROUTINE tra_adv_muscl2( kt, nit000, cdtype, p2dt, pun, pvn, pwn, &44 SUBROUTINE tra_adv_muscl2( kt, kit000, cdtype, p2dt, pun, pvn, pwn, & 45 45 & ptb, ptn, pta, kjpt ) 46 46 !!---------------------------------------------------------------------- … … 64 64 !! 65 65 INTEGER , INTENT(in ) :: kt ! ocean time-step index 66 INTEGER , INTENT(in ) :: nit000 ! first time step index66 INTEGER , INTENT(in ) :: kit000 ! first time step index 67 67 CHARACTER(len=3) , INTENT(in ) :: cdtype ! =TRA or TRC (tracer indicator) 68 68 INTEGER , INTENT(in ) :: kjpt ! number of tracers … … 82 82 ENDIF 83 83 84 IF( kt == nit000 ) THEN84 IF( kt == kit000 ) THEN 85 85 IF(lwp) WRITE(numout,*) 86 86 IF(lwp) WRITE(numout,*) 'tra_adv_muscl2 : MUSCL2 advection scheme on ', cdtype -
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90
r2892 r2910 45 45 CONTAINS 46 46 47 SUBROUTINE tra_adv_qck ( kt, nit000, cdtype, p2dt, pun, pvn, pwn, &47 SUBROUTINE tra_adv_qck ( kt, kit000, cdtype, p2dt, pun, pvn, pwn, & 48 48 & ptb, ptn, pta, kjpt ) 49 49 !!---------------------------------------------------------------------- … … 82 82 !!---------------------------------------------------------------------- 83 83 INTEGER , INTENT(in ) :: kt ! ocean time-step index 84 INTEGER , INTENT(in ) :: nit000 ! first time step index84 INTEGER , INTENT(in ) :: kit000 ! first time step index 85 85 CHARACTER(len=3) , INTENT(in ) :: cdtype ! =TRA or TRC (tracer indicator) 86 86 INTEGER , INTENT(in ) :: kjpt ! number of tracers … … 91 91 !!---------------------------------------------------------------------- 92 92 93 IF( kt == nit000 ) THEN93 IF( kt == kit000 ) THEN 94 94 IF(lwp) WRITE(numout,*) 95 95 IF(lwp) WRITE(numout,*) 'tra_adv_qck : 3rd order quickest advection scheme on ', cdtype -
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90
r2892 r2910 51 51 CONTAINS 52 52 53 SUBROUTINE tra_adv_tvd ( kt, nit000, cdtype, p2dt, pun, pvn, pwn, &53 SUBROUTINE tra_adv_tvd ( kt, kit000, cdtype, p2dt, pun, pvn, pwn, & 54 54 & ptb, ptn, pta, kjpt ) 55 55 !!---------------------------------------------------------------------- … … 71 71 ! 72 72 INTEGER , INTENT(in ) :: kt ! ocean time-step index 73 INTEGER , INTENT(in ) :: nit000 ! first time step index73 INTEGER , INTENT(in ) :: kit000 ! first time step index 74 74 CHARACTER(len=3) , INTENT(in ) :: cdtype ! =TRA or TRC (tracer indicator) 75 75 INTEGER , INTENT(in ) :: kjpt ! number of tracers … … 90 90 ENDIF 91 91 92 IF( kt == nit000 ) THEN92 IF( kt == kit000 ) THEN 93 93 IF(lwp) WRITE(numout,*) 94 94 IF(lwp) WRITE(numout,*) 'tra_adv_tvd : TVD advection scheme on ', cdtype -
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90
r2892 r2910 40 40 CONTAINS 41 41 42 SUBROUTINE tra_adv_ubs ( kt, nit000, cdtype, p2dt, pun, pvn, pwn, &42 SUBROUTINE tra_adv_ubs ( kt, kit000, cdtype, p2dt, pun, pvn, pwn, & 43 43 & ptb, ptn, pta, kjpt ) 44 44 !!---------------------------------------------------------------------- … … 80 80 ! 81 81 INTEGER , INTENT(in ) :: kt ! ocean time-step index 82 INTEGER , INTENT(in ) :: nit000 ! first time step index82 INTEGER , INTENT(in ) :: kit000 ! first time step index 83 83 CHARACTER(len=3) , INTENT(in ) :: cdtype ! =TRA or TRC (tracer indicator) 84 84 INTEGER , INTENT(in ) :: kjpt ! number of tracers … … 98 98 ENDIF 99 99 100 IF( kt == nit000 ) THEN100 IF( kt == kit000 ) THEN 101 101 IF(lwp) WRITE(numout,*) 102 102 IF(lwp) WRITE(numout,*) 'tra_adv_ubs : horizontal UBS advection scheme on ', cdtype -
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90
r2892 r2910 311 311 312 312 313 SUBROUTINE bbl( kt, nit000, cdtype )313 SUBROUTINE bbl( kt, kit000, cdtype ) 314 314 !!---------------------------------------------------------------------- 315 315 !! *** ROUTINE bbl *** … … 343 343 ! 344 344 INTEGER , INTENT(in ) :: kt ! ocean time-step index 345 INTEGER , INTENT(in ) :: nit000 ! first time step index345 INTEGER , INTENT(in ) :: kit000 ! first time step index 346 346 CHARACTER(len=3), INTENT(in ) :: cdtype ! =TRA or TRC (tracer indicator) 347 347 !! … … 390 390 ENDIF 391 391 392 IF( kt == nit000 ) THEN392 IF( kt == kit000 ) THEN 393 393 IF(lwp) WRITE(numout,*) 394 394 IF(lwp) WRITE(numout,*) 'trabbl:bbl : Compute bbl velocities and diffusive coefficients in ', cdtype … … 538 538 !! 539 539 !! ** Method : Read the nambbl namelist and check the parameters 540 !! called by nemo_init at the first timestep ( nit000)540 !! called by nemo_init at the first timestep (kit000) 541 541 !!---------------------------------------------------------------------- 542 542 USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released -
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90
r2892 r2910 68 68 69 69 SELECT CASE ( nldf ) ! compute lateral mixing trend and add it to the general trend 70 CASE ( 0 ) ; CALL tra_ldf_lap ( kt, nit000, 'TRA', gtsu, gtsv, tsb, tsa, jpts ) ! iso-level laplacian70 CASE ( 0 ) ; CALL tra_ldf_lap ( kt, nit000, 'TRA', gtsu, gtsv, tsb, tsa, jpts ) ! iso-level laplacian 71 71 CASE ( 1 ) ! rotated laplacian 72 72 IF( ln_traldf_grif ) THEN … … 297 297 ! Compute the ldf trends 298 298 ! ---------------------- 299 CALL tra_ldf( nit000 +1 ) ! horizontal components (+1: no more init)300 CALL tra_zdf( nit000 ) ! vertical component (if necessary nit000 to performed the init)299 CALL tra_ldf( nit000 + 1 ) ! horizontal components (+1: no more init) 300 CALL tra_zdf( nit000 ) ! vertical component (if necessary nit000 to performed the init) 301 301 302 302 ! finalise the computation and recover all arrays -
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilap.F90
r2892 r2910 47 47 CONTAINS 48 48 49 SUBROUTINE tra_ldf_bilap( kt, nit000, cdtype, pgu, pgv, &49 SUBROUTINE tra_ldf_bilap( kt, kit000, cdtype, pgu, pgv, & 50 50 & ptb, pta, kjpt ) 51 51 !!---------------------------------------------------------------------- … … 79 79 !! 80 80 INTEGER , INTENT(in ) :: kt ! ocean time-step index 81 INTEGER , INTENT(in ) :: nit000 ! first time step index81 INTEGER , INTENT(in ) :: kit000 ! first time step index 82 82 CHARACTER(len=3) , INTENT(in ) :: cdtype ! =TRA or TRC (tracer indicator) 83 83 INTEGER , INTENT(in ) :: kjpt ! number of tracers … … 94 94 ENDIF 95 95 96 IF( kt == nit000 ) THEN96 IF( kt == kit000 ) THEN 97 97 IF(lwp) WRITE(numout,*) 98 98 IF(lwp) WRITE(numout,*) 'tra_ldf_bilap : iso-level biharmonic operator on ', cdtype -
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilapg.F90
r2892 r2910 42 42 CONTAINS 43 43 44 SUBROUTINE tra_ldf_bilapg( kt, nit000, cdtype, ptb, pta, kjpt )44 SUBROUTINE tra_ldf_bilapg( kt, kit000, cdtype, ptb, pta, kjpt ) 45 45 !!---------------------------------------------------------------------- 46 46 !! *** ROUTINE tra_ldf_bilapg *** … … 70 70 ! 71 71 INTEGER , INTENT(in ) :: kt ! ocean time-step index 72 INTEGER , INTENT(in ) :: nit000 ! first time step index72 INTEGER , INTENT(in ) :: kit000 ! first time step index 73 73 CHARACTER(len=3), INTENT(in ) :: cdtype ! =TRA or TRC (tracer indicator) 74 74 INTEGER , INTENT(in ) :: kjpt ! number of tracers … … 83 83 ENDIF 84 84 85 IF( kt == nit000 ) THEN85 IF( kt == kit000 ) THEN 86 86 IF(lwp) WRITE(numout,*) 87 87 IF(lwp) WRITE(numout,*) 'tra_ldf_bilapg : horizontal biharmonic operator in s-coordinate on ', cdtype … … 346 346 !!---------------------------------------------------------------------- 347 347 CONTAINS 348 SUBROUTINE tra_ldf_bilapg( kt, nit000, cdtype, ptb, pta, kjpt ) ! Empty routine349 INTEGER :: kt, nit000348 SUBROUTINE tra_ldf_bilapg( kt, kit000, cdtype, ptb, pta, kjpt ) ! Empty routine 349 INTEGER :: kt, kit000 350 350 CHARACTER(len=3) :: cdtype 351 351 REAL, DIMENSION(:,:,:,:) :: ptb, pta 352 WRITE(*,*) 'tra_ldf_iso: You should not have seen this print! error?', kt, cdtype, ptb(1,1,1,1), pta(1,1,1,1), kjpt 352 WRITE(*,*) 'tra_ldf_iso: You should not have seen this print! error?', & 353 & kt, kit000, cdtype, ptb(1,1,1,1), pta(1,1,1,1), kjpt 353 354 END SUBROUTINE tra_ldf_bilapg 354 355 #endif -
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90
r2892 r2910 49 49 CONTAINS 50 50 51 SUBROUTINE tra_ldf_iso( kt, nit000, cdtype, pgu, pgv, &51 SUBROUTINE tra_ldf_iso( kt, kit000, cdtype, pgu, pgv, & 52 52 & ptb, pta, kjpt, pahtb0 ) 53 53 !!---------------------------------------------------------------------- … … 96 96 ! 97 97 INTEGER , INTENT(in ) :: kt ! ocean time-step index 98 INTEGER , INTENT(in ) :: nit000 ! first time step index98 INTEGER , INTENT(in ) :: kit000 ! first time step index 99 99 CHARACTER(len=3) , INTENT(in ) :: cdtype ! =TRA or TRC (tracer indicator) 100 100 INTEGER , INTENT(in ) :: kjpt ! number of tracers … … 117 117 ENDIF 118 118 119 IF( kt == nit000 ) THEN119 IF( kt == kit000 ) THEN 120 120 IF(lwp) WRITE(numout,*) 121 121 IF(lwp) WRITE(numout,*) 'tra_ldf_iso : rotated laplacian diffusion operator on ', cdtype … … 302 302 !!---------------------------------------------------------------------- 303 303 CONTAINS 304 SUBROUTINE tra_ldf_iso( kt, nit000,cdtype, pgu, pgv, ptb, pta, kjpt, pahtb0 ) ! Empty routine305 INTEGER:: kt, nit000304 SUBROUTINE tra_ldf_iso( kt, kit000,cdtype, pgu, pgv, ptb, pta, kjpt, pahtb0 ) ! Empty routine 305 INTEGER:: kt, kit000 306 306 CHARACTER(len=3) :: cdtype 307 307 REAL, DIMENSION(:,:,:) :: pgu, pgv ! tracer gradient at pstep levels 308 308 REAL, DIMENSION(:,:,:,:) :: ptb, pta 309 WRITE(*,*) 'tra_ldf_iso: You should not have seen this print! error?', kt, cdtype, pgu(1,1,1), pgv(1,1,1), &310 & 309 WRITE(*,*) 'tra_ldf_iso: You should not have seen this print! error?', kt, kit000, cdtype, & 310 & pgu(1,1,1), pgv(1,1,1), ptb(1,1,1,1), pta(1,1,1,1), kjpt, pahtb0 311 311 END SUBROUTINE tra_ldf_iso 312 312 #endif -
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90
r2892 r2910 48 48 CONTAINS 49 49 50 SUBROUTINE tra_ldf_iso_grif( kt, nit000, cdtype, pgu, pgv, &50 SUBROUTINE tra_ldf_iso_grif( kt, kit000, cdtype, pgu, pgv, & 51 51 & ptb, pta, kjpt, pahtb0 ) 52 52 !!---------------------------------------------------------------------- … … 95 95 ! 96 96 INTEGER , INTENT(in ) :: kt ! ocean time-step index 97 INTEGER , INTENT(in ) :: nit000 ! first time step index97 INTEGER , INTENT(in ) :: kit000 ! first time step index 98 98 CHARACTER(len=3) , INTENT(in ) :: cdtype ! =TRA or TRC (tracer indicator) 99 99 INTEGER , INTENT(in ) :: kjpt ! number of tracers … … 128 128 !zdkt(1:jpi,1:jpj,0:1) => wrk_3d_9(:,:,1:2) 129 129 130 IF( kt == nit000 ) THEN130 IF( kt == kit000 ) THEN 131 131 IF(lwp) WRITE(numout,*) 132 132 IF(lwp) WRITE(numout,*) 'tra_ldf_iso_grif : rotated laplacian diffusion operator on ', cdtype -
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90
r2892 r2910 44 44 CONTAINS 45 45 46 SUBROUTINE tra_ldf_lap( kt, nit000, cdtype, pgu, pgv, &46 SUBROUTINE tra_ldf_lap( kt, kit000, cdtype, pgu, pgv, & 47 47 & ptb, pta, kjpt ) 48 48 !!---------------------------------------------------------------------- … … 66 66 ! 67 67 INTEGER , INTENT(in ) :: kt ! ocean time-step index 68 INTEGER , INTENT(in ) :: nit000 ! first time step index68 INTEGER , INTENT(in ) :: kit000 ! first time step index 69 69 CHARACTER(len=3) , INTENT(in ) :: cdtype ! =TRA or TRC (tracer indicator) 70 70 INTEGER , INTENT(in ) :: kjpt ! number of tracers … … 78 78 !!---------------------------------------------------------------------- 79 79 80 IF( kt == nit000 ) THEN80 IF( kt == kit000 ) THEN 81 81 IF(lwp) WRITE(numout,*) 82 82 IF(lwp) WRITE(numout,*) 'tra_ldf_lap : iso-level laplacian diffusion on ', cdtype -
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90
r2892 r2910 148 148 ELSE ! Leap-Frog + Asselin filter time stepping 149 149 ! 150 IF( lk_vvl ) THEN ; CALL tra_nxt_vvl( kt, nit000, 'TRA', tsb, tsn, tsa, jpts ) ! variable volume level (vvl)151 ELSE ; CALL tra_nxt_fix( kt, nit000, 'TRA', tsb, tsn, tsa, jpts ) ! fixed volume level150 IF( lk_vvl ) THEN ; CALL tra_nxt_vvl( kt, nit000, 'TRA', tsb, tsn, tsa, jpts ) ! variable volume level (vvl) 151 ELSE ; CALL tra_nxt_fix( kt, nit000, 'TRA', tsb, tsn, tsa, jpts ) ! fixed volume level 152 152 ENDIF 153 153 ENDIF … … 179 179 180 180 181 SUBROUTINE tra_nxt_fix( kt, nit000, cdtype, ptb, ptn, pta, kjpt )181 SUBROUTINE tra_nxt_fix( kt, kit000, cdtype, ptb, ptn, pta, kjpt ) 182 182 !!---------------------------------------------------------------------- 183 183 !! *** ROUTINE tra_nxt_fix *** … … 203 203 !!---------------------------------------------------------------------- 204 204 INTEGER , INTENT(in ) :: kt ! ocean time-step index 205 INTEGER , INTENT(in ) :: nit000 ! first time step index205 INTEGER , INTENT(in ) :: kit000 ! first time step index 206 206 CHARACTER(len=3), INTENT(in ) :: cdtype ! =TRA or TRC (tracer indicator) 207 207 INTEGER , INTENT(in ) :: kjpt ! number of tracers … … 215 215 !!---------------------------------------------------------------------- 216 216 217 IF( kt == nit000 ) THEN217 IF( kt == kit000 ) THEN 218 218 IF(lwp) WRITE(numout,*) 219 219 IF(lwp) WRITE(numout,*) 'tra_nxt_fix : time stepping', cdtype … … 246 246 247 247 248 SUBROUTINE tra_nxt_vvl( kt, nit000, cdtype, ptb, ptn, pta, kjpt )248 SUBROUTINE tra_nxt_vvl( kt, kit000, cdtype, ptb, ptn, pta, kjpt ) 249 249 !!---------------------------------------------------------------------- 250 250 !! *** ROUTINE tra_nxt_vvl *** … … 271 271 !!---------------------------------------------------------------------- 272 272 INTEGER , INTENT(in ) :: kt ! ocean time-step index 273 INTEGER , INTENT(in ) :: nit000 ! first time step index273 INTEGER , INTENT(in ) :: kit000 ! first time step index 274 274 CHARACTER(len=3), INTENT(in ) :: cdtype ! =TRA or TRC (tracer indicator) 275 275 INTEGER , INTENT(in ) :: kjpt ! number of tracers … … 284 284 !!---------------------------------------------------------------------- 285 285 286 IF( kt == nit000 ) THEN286 IF( kt == kit000 ) THEN 287 287 IF(lwp) WRITE(numout,*) 288 288 IF(lwp) WRITE(numout,*) 'tra_nxt_vvl : time stepping', cdtype -
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_exp.F90
r2892 r2910 48 48 CONTAINS 49 49 50 SUBROUTINE tra_zdf_exp( kt, nit000, cdtype, p2dt, kn_zdfexp, &50 SUBROUTINE tra_zdf_exp( kt, kit000, cdtype, p2dt, kn_zdfexp, & 51 51 & ptb , pta , kjpt ) 52 52 !!---------------------------------------------------------------------- … … 77 77 ! 78 78 INTEGER , INTENT(in ) :: kt ! ocean time-step index 79 INTEGER , INTENT(in ) :: nit000 ! first time step index79 INTEGER , INTENT(in ) :: kit000 ! first time step index 80 80 CHARACTER(len=3) , INTENT(in ) :: cdtype ! =TRA or TRC (tracer indicator) 81 81 INTEGER , INTENT(in ) :: kjpt ! number of tracers … … 94 94 ENDIF 95 95 96 IF( kt == nit000 ) THEN96 IF( kt == kit000 ) THEN 97 97 IF(lwp) WRITE(numout,*) 98 98 IF(lwp) WRITE(numout,*) 'tra_zdf_exp : explicit vertical mixing on ', cdtype -
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90
r2892 r2910 55 55 CONTAINS 56 56 57 SUBROUTINE tra_zdf_imp( kt, nit000, cdtype, p2dt, ptb, pta, kjpt )57 SUBROUTINE tra_zdf_imp( kt, kit000, cdtype, p2dt, ptb, pta, kjpt ) 58 58 !!---------------------------------------------------------------------- 59 59 !! *** ROUTINE tra_zdf_imp *** … … 79 79 ! 80 80 INTEGER , INTENT(in ) :: kt ! ocean time-step index 81 INTEGER , INTENT(in ) :: nit000 ! first time step index81 INTEGER , INTENT(in ) :: kit000 ! first time step index 82 82 CHARACTER(len=3) , INTENT(in ) :: cdtype ! =TRA or TRC (tracer indicator) 83 83 INTEGER , INTENT(in ) :: kjpt ! number of tracers … … 94 94 ENDIF 95 95 96 IF( kt == nit000 ) THEN96 IF( kt == kit000 ) THEN 97 97 IF(lwp)WRITE(numout,*) 98 98 IF(lwp)WRITE(numout,*) 'tra_zdf_imp : implicit vertical mixing on ', cdtype
Note: See TracChangeset
for help on using the changeset viewer.