- Timestamp:
- 2020-09-29T12:40:29+02:00 (4 years ago)
- Location:
- NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE
- Files:
-
- 6 edited
-
TRA/eosbn2.F90 (modified) (6 diffs)
-
TRA/traldf_iso.F90 (modified) (1 diff)
-
TRA/traldf_lap_blp.F90 (modified) (1 diff)
-
TRA/traldf_triad.F90 (modified) (1 diff)
-
TRA/zpshde.F90 (modified) (2 diffs)
-
do_loop_substitute.h90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE/TRA/eosbn2.F90
r13515 r13539 234 234 !!---------------------------------------------------------------------- 235 235 INTEGER , INTENT(in ) :: ktts, ktrd, ktdep 236 REAL(wp), DIMENSION(ST_2DT(ktts) , jpk,jpts), INTENT(in ) :: pts ! 1 : potential temperature [Celsius]236 REAL(wp), DIMENSION(ST_2DT(ktts) ,JPK,JPTS), INTENT(in ) :: pts ! 1 : potential temperature [Celsius] 237 237 ! ! 2 : salinity [psu] 238 REAL(wp), DIMENSION(ST_2DT(ktrd) , jpk), INTENT( out) :: prd ! in situ density [-]239 REAL(wp), DIMENSION(ST_2DT(ktdep), jpk), INTENT(in ) :: pdep ! depth [m]238 REAL(wp), DIMENSION(ST_2DT(ktrd) ,JPK ), INTENT( out) :: prd ! in situ density [-] 239 REAL(wp), DIMENSION(ST_2DT(ktdep),JPK ), INTENT(in ) :: pdep ! depth [m] 240 240 ! 241 241 INTEGER :: ji, jj, jk ! dummy loop indices … … 334 334 !!---------------------------------------------------------------------- 335 335 INTEGER , INTENT(in ) :: ktts, ktrd, ktrhop, ktdep 336 REAL(wp), DIMENSION(ST_2DT(ktts) , jpk,jpts), INTENT(in ) :: pts ! 1 : potential temperature [Celsius]336 REAL(wp), DIMENSION(ST_2DT(ktts) ,JPK,JPTS), INTENT(in ) :: pts ! 1 : potential temperature [Celsius] 337 337 ! ! 2 : salinity [psu] 338 REAL(wp), DIMENSION(ST_2DT(ktrd) , jpk), INTENT( out) :: prd ! in situ density [-]339 REAL(wp), DIMENSION(ST_2DT(ktrhop), jpk), INTENT( out) :: prhop ! potential density (surface referenced)340 REAL(wp), DIMENSION(ST_2DT(ktdep) , jpk), INTENT(in ) :: pdep ! depth [m]338 REAL(wp), DIMENSION(ST_2DT(ktrd) ,JPK ), INTENT( out) :: prd ! in situ density [-] 339 REAL(wp), DIMENSION(ST_2DT(ktrhop),JPK ), INTENT( out) :: prhop ! potential density (surface referenced) 340 REAL(wp), DIMENSION(ST_2DT(ktdep) ,JPK ), INTENT(in ) :: pdep ! depth [m] 341 341 ! 342 342 INTEGER :: ji, jj, jk, jsmp ! dummy loop indices … … 500 500 !!---------------------------------------------------------------------- 501 501 INTEGER , INTENT(in ) :: ktts, ktdep, ktrd 502 REAL(wp), DIMENSION(ST_2DT(ktts), jpts), INTENT(in ) :: pts ! 1 : potential temperature [Celsius]502 REAL(wp), DIMENSION(ST_2DT(ktts),JPTS), INTENT(in ) :: pts ! 1 : potential temperature [Celsius] 503 503 ! ! 2 : salinity [psu] 504 504 REAL(wp), DIMENSION(ST_2DT(ktdep) ), INTENT(in ) :: pdep ! depth [m] … … 598 598 INTEGER , INTENT(in ) :: Kmm ! time level index 599 599 INTEGER , INTENT(in ) :: ktts, ktab 600 REAL(wp), DIMENSION(ST_2DT(ktts), jpk,jpts), INTENT(in ) :: pts ! pot. temperature & salinity601 REAL(wp), DIMENSION(ST_2DT(ktab), jpk,jpts), INTENT( out) :: pab ! thermal/haline expansion ratio600 REAL(wp), DIMENSION(ST_2DT(ktts),JPK,JPTS), INTENT(in ) :: pts ! pot. temperature & salinity 601 REAL(wp), DIMENSION(ST_2DT(ktab),JPK,JPTS), INTENT( out) :: pab ! thermal/haline expansion ratio 602 602 ! 603 603 INTEGER :: ji, jj, jk ! dummy loop indices … … 714 714 INTEGER , INTENT(in ) :: Kmm ! time level index 715 715 INTEGER , INTENT(in ) :: ktts, ktdep, ktab 716 REAL(wp), DIMENSION(ST_2DT(ktts), jpts), INTENT(in ) :: pts ! pot. temperature & salinity716 REAL(wp), DIMENSION(ST_2DT(ktts),JPTS), INTENT(in ) :: pts ! pot. temperature & salinity 717 717 REAL(wp), DIMENSION(ST_2DT(ktdep) ), INTENT(in ) :: pdep ! depth [m] 718 REAL(wp), DIMENSION(ST_2DT(ktab), jpts), INTENT( out) :: pab ! thermal/haline expansion ratio718 REAL(wp), DIMENSION(ST_2DT(ktab),JPTS), INTENT( out) :: pab ! thermal/haline expansion ratio 719 719 ! 720 720 INTEGER :: ji, jj, jk ! dummy loop indices … … 937 937 INTEGER , INTENT(in ) :: ktab, ktn2 938 938 REAL(wp), DIMENSION(jpi,jpj, jpk,jpts), INTENT(in ) :: pts ! pot. temperature and salinity [Celsius,psu] 939 REAL(wp), DIMENSION(ST_2DT(ktab), jpk,jpts), INTENT(in ) :: pab ! thermal/haline expansion coef. [Celsius-1,psu-1]940 REAL(wp), DIMENSION(ST_2DT(ktn2), jpk), INTENT( out) :: pn2 ! Brunt-Vaisala frequency squared [1/s^2]939 REAL(wp), DIMENSION(ST_2DT(ktab),JPK,JPTS), INTENT(in ) :: pab ! thermal/haline expansion coef. [Celsius-1,psu-1] 940 REAL(wp), DIMENSION(ST_2DT(ktn2),JPK ), INTENT( out) :: pn2 ! Brunt-Vaisala frequency squared [1/s^2] 941 941 ! 942 942 INTEGER :: ji, jj, jk ! dummy loop indices -
NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE/TRA/traldf_iso.F90
r13515 r13539 123 123 INTEGER , INTENT(in ) :: Kmm ! ocean time level index 124 124 INTEGER , INTENT(in ) :: ktah, ktg, ktgi, ktt, ktt2, ktt_rhs 125 REAL(wp), DIMENSION(ST_2DT(ktah) , jpk) , INTENT(in ) :: pahu, pahv ! eddy diffusivity at u- and v-points [m2/s]126 REAL(wp), DIMENSION(ST_2DT(ktg) , kjpt), INTENT(in ) :: pgu, pgv ! tracer gradient at pstep levels127 REAL(wp), DIMENSION(ST_2DT(ktgi) , kjpt), INTENT(in ) :: pgui, pgvi ! tracer gradient at top levels128 REAL(wp), DIMENSION(ST_2DT(ktt) , jpk,kjpt), INTENT(in ) :: pt ! tracer (kpass=1) or laplacian of tracer (kpass=2)129 REAL(wp), DIMENSION(ST_2DT(ktt2) , jpk,kjpt), INTENT(in ) :: pt2 ! tracer (only used in kpass=2)130 REAL(wp), DIMENSION(ST_2DT(ktt_rhs), jpk,kjpt), INTENT(inout) :: pt_rhs ! tracer trend125 REAL(wp), DIMENSION(ST_2DT(ktah) ,JPK) , INTENT(in ) :: pahu, pahv ! eddy diffusivity at u- and v-points [m2/s] 126 REAL(wp), DIMENSION(ST_2DT(ktg) ,KJPT), INTENT(in ) :: pgu, pgv ! tracer gradient at pstep levels 127 REAL(wp), DIMENSION(ST_2DT(ktgi) ,KJPT), INTENT(in ) :: pgui, pgvi ! tracer gradient at top levels 128 REAL(wp), DIMENSION(ST_2DT(ktt) ,JPK,KJPT), INTENT(in ) :: pt ! tracer (kpass=1) or laplacian of tracer (kpass=2) 129 REAL(wp), DIMENSION(ST_2DT(ktt2) ,JPK,KJPT), INTENT(in ) :: pt2 ! tracer (only used in kpass=2) 130 REAL(wp), DIMENSION(ST_2DT(ktt_rhs),JPK,KJPT), INTENT(inout) :: pt_rhs ! tracer trend 131 131 ! 132 132 INTEGER :: ji, jj, jk, jn ! dummy loop indices -
NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE/TRA/traldf_lap_blp.F90
r13515 r13539 96 96 INTEGER , INTENT(in ) :: Kmm ! ocean time level index 97 97 INTEGER , INTENT(in ) :: ktah, ktg, ktgi, ktt, ktt_rhs 98 REAL(wp), DIMENSION(ST_2DT(ktah), jpk) , INTENT(in ) :: pahu, pahv ! eddy diffusivity at u- and v-points [m2/s]99 REAL(wp), DIMENSION(ST_2DT(ktg), kjpt), INTENT(in ) :: pgu, pgv ! tracer gradient at pstep levels100 REAL(wp), DIMENSION(ST_2DT(ktgi), kjpt), INTENT(in ) :: pgui, pgvi ! tracer gradient at top levels101 REAL(wp), DIMENSION(ST_2DT(ktt), jpk,kjpt), INTENT(in ) :: pt ! before tracer fields102 REAL(wp), DIMENSION(ST_2DT(ktt_rhs), jpk,kjpt), INTENT(inout) :: pt_rhs ! tracer trend98 REAL(wp), DIMENSION(ST_2DT(ktah), JPK) , INTENT(in ) :: pahu, pahv ! eddy diffusivity at u- and v-points [m2/s] 99 REAL(wp), DIMENSION(ST_2DT(ktg), KJPT), INTENT(in ) :: pgu, pgv ! tracer gradient at pstep levels 100 REAL(wp), DIMENSION(ST_2DT(ktgi), KJPT), INTENT(in ) :: pgui, pgvi ! tracer gradient at top levels 101 REAL(wp), DIMENSION(ST_2DT(ktt), JPK,KJPT), INTENT(in ) :: pt ! before tracer fields 102 REAL(wp), DIMENSION(ST_2DT(ktt_rhs),JPK,KJPT), INTENT(inout) :: pt_rhs ! tracer trend 103 103 ! 104 104 INTEGER :: ji, jj, jk, jn ! dummy loop indices -
NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE/TRA/traldf_triad.F90
r13515 r13539 102 102 INTEGER , INTENT(in) :: Kmm ! ocean time level indices 103 103 INTEGER , INTENT(in ) :: ktah, ktg, ktgi, ktt, ktt2, ktt_rhs 104 REAL(wp), DIMENSION(ST_2DT(ktah), jpk) , INTENT(in ) :: pahu, pahv ! eddy diffusivity at u- and v-points [m2/s]105 REAL(wp), DIMENSION(ST_2DT(ktg), kjpt), INTENT(in ) :: pgu , pgv ! tracer gradient at pstep levels106 REAL(wp), DIMENSION(ST_2DT(ktgi), kjpt), INTENT(in ) :: pgui, pgvi ! tracer gradient at top levels107 REAL(wp), DIMENSION(ST_2DT(ktt), jpk,kjpt), INTENT(in ) :: pt ! tracer (kpass=1) or laplacian of tracer (kpass=2)108 REAL(wp), DIMENSION(ST_2DT(ktt2), jpk,kjpt), INTENT(in ) :: pt2 ! tracer (only used in kpass=2)109 REAL(wp), DIMENSION(ST_2DT(ktt_rhs), jpk,kjpt), INTENT(inout) :: pt_rhs ! tracer trend104 REAL(wp), DIMENSION(ST_2DT(ktah), JPK) , INTENT(in ) :: pahu, pahv ! eddy diffusivity at u- and v-points [m2/s] 105 REAL(wp), DIMENSION(ST_2DT(ktg), KJPT), INTENT(in ) :: pgu , pgv ! tracer gradient at pstep levels 106 REAL(wp), DIMENSION(ST_2DT(ktgi), KJPT), INTENT(in ) :: pgui, pgvi ! tracer gradient at top levels 107 REAL(wp), DIMENSION(ST_2DT(ktt), JPK,KJPT), INTENT(in ) :: pt ! tracer (kpass=1) or laplacian of tracer (kpass=2) 108 REAL(wp), DIMENSION(ST_2DT(ktt2), JPK,KJPT), INTENT(in ) :: pt2 ! tracer (only used in kpass=2) 109 REAL(wp), DIMENSION(ST_2DT(ktt_rhs),JPK,KJPT), INTENT(inout) :: pt_rhs ! tracer trend 110 110 ! 111 111 INTEGER :: ji, jj, jk, jn ! dummy loop indices -
NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE/TRA/zpshde.F90
r13515 r13539 112 112 INTEGER , INTENT(in ) :: kjpt ! number of tracers 113 113 INTEGER , INTENT(in ) :: ktta, ktgt, ktrd, ktgr 114 REAL(wp), DIMENSION(ST_2DT(ktta), jpk,kjpt), INTENT(in ) :: pta ! 4D tracers fields115 REAL(wp), DIMENSION(ST_2DT(ktgt) , kjpt), INTENT( out) :: pgtu, pgtv ! hor. grad. of ptra at u- & v-pts116 REAL(wp), DIMENSION(ST_2DT(ktrd), jpk), INTENT(in ), OPTIONAL :: prd ! 3D density anomaly fields114 REAL(wp), DIMENSION(ST_2DT(ktta),JPK,KJPT), INTENT(in ) :: pta ! 4D tracers fields 115 REAL(wp), DIMENSION(ST_2DT(ktgt) ,KJPT), INTENT( out) :: pgtu, pgtv ! hor. grad. of ptra at u- & v-pts 116 REAL(wp), DIMENSION(ST_2DT(ktrd),JPK ), INTENT(in ), OPTIONAL :: prd ! 3D density anomaly fields 117 117 REAL(wp), DIMENSION(ST_2DT(ktgr) ), INTENT( out), OPTIONAL :: pgru, pgrv ! hor. grad of prd at u- & v-pts (bottom) 118 118 ! … … 289 289 INTEGER , INTENT(in ) :: kjpt ! number of tracers 290 290 INTEGER , INTENT(in ) :: ktta, ktgt, ktgti, ktrd, ktgr, ktgri 291 REAL(wp), DIMENSION(ST_2DT(ktta), jpk,kjpt), INTENT(in ) :: pta ! 4D tracers fields292 REAL(wp), DIMENSION(ST_2DT(ktgt) , kjpt), INTENT( out) :: pgtu, pgtv ! hor. grad. of ptra at u- & v-pts293 REAL(wp), DIMENSION(ST_2DT(ktgti) , kjpt), INTENT( out) :: pgtui, pgtvi ! hor. grad. of stra at u- & v-pts (ISF)294 REAL(wp), DIMENSION(ST_2DT(ktrd), jpk), INTENT(in ), OPTIONAL :: prd ! 3D density anomaly fields291 REAL(wp), DIMENSION(ST_2DT(ktta),JPK,KJPT), INTENT(in ) :: pta ! 4D tracers fields 292 REAL(wp), DIMENSION(ST_2DT(ktgt) ,KJPT), INTENT( out) :: pgtu, pgtv ! hor. grad. of ptra at u- & v-pts 293 REAL(wp), DIMENSION(ST_2DT(ktgti) ,KJPT), INTENT( out) :: pgtui, pgtvi ! hor. grad. of stra at u- & v-pts (ISF) 294 REAL(wp), DIMENSION(ST_2DT(ktrd),JPK ), INTENT(in ), OPTIONAL :: prd ! 3D density anomaly fields 295 295 REAL(wp), DIMENSION(ST_2DT(ktgr) ), INTENT( out), OPTIONAL :: pgru, pgrv ! hor. grad of prd at u- & v-pts (bottom) 296 296 REAL(wp), DIMENSION(ST_2DT(ktgri) ), INTENT( out), OPTIONAL :: pgrui, pgrvi ! hor. grad of prd at u- & v-pts (top) -
NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE/do_loop_substitute.h90
r13514 r13539 63 63 #define ST_1Dj(H) ntsj-H:ntej+H 64 64 #define ST_2D(H) ST_1Di(H),ST_1Dj(H) 65 #define ST_1DTi(T) (ntsi-nn_hls-1)*T+1: (ntei+nn_hls-jpi)*T+jpi66 #define ST_1DTj(T) (ntsj-nn_hls-1)*T+1: (ntej+nn_hls-jpj)*T+jpj65 #define ST_1DTi(T) (ntsi-nn_hls-1)*T+1: 66 #define ST_1DTj(T) (ntsj-nn_hls-1)*T+1: 67 67 #define ST_2DT(T) ST_1DTi(T),ST_1DTj(T) 68 #define JPK : 69 #define JPTS : 70 #define KJPT : 68 71 69 72 #define DO_3D(B, T, L, R, ks, ke) DO jk = ks, ke ; DO_2D(B, T, L, R)
Note: See TracChangeset
for help on using the changeset viewer.
