Changeset 563
- Timestamp:
- 2006-11-13T14:34:05+01:00 (17 years ago)
- Location:
- trunk/NEMO/OFF_SRC
- Files:
-
- 3 edited
-
LDF/ldfeiv.F90 (modified) (2 diffs)
-
TRA/zpshde.F90 (modified) (7 diffs)
-
ZDF/zdfmxl.F90 (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/OFF_SRC/LDF/ldfeiv.F90
r446 r563 38 38 CONTAINS 39 39 40 # if defined key_ autotasking40 # if defined key_mpp_omp 41 41 !!---------------------------------------------------------------------- 42 !! 'key_ autotasking' :autotasking (j-slab)42 !! 'key_mpp_omp' : OpenMP / NEC autotasking (j-slab) 43 43 !!---------------------------------------------------------------------- 44 44 … … 66 66 IF(lwp) WRITE(numout,*) 67 67 IF(lwp) WRITE(numout,*) 'ldf_eiv : eddy induced velocity coefficients' 68 IF(lwp) WRITE(numout,*) '~~~~~~~ key_autotasking'68 IF(lwp) WRITE(numout,*) '~~~~~~~ NEC autotasking / OpenMP : j-slab' 69 69 ENDIF 70 70 -
trunk/NEMO/OFF_SRC/TRA/zpshde.F90
r343 r563 2 2 !!============================================================================== 3 3 !! *** MODULE zpshde *** 4 !! Ocean active tracers:4 !! z-coordinate - partial step : Horizontal Derivative 5 5 !!============================================================================== 6 #if defined key_partial_steps || defined key_esopa 7 !!---------------------------------------------------------------------- 8 !! 'key_partial_steps' : z-coordinate with partial steps 6 9 7 !!---------------------------------------------------------------------- 10 8 !! zps_hde : Horizontal DErivative of T, S and rd at the last 11 9 !! ocean level (Z-coord. with Partial Steps) 12 !!----------------------------------------------------------------------13 !! OPA 9.0 , LOCEAN-IPSL (2005)14 !! $Header$15 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt16 10 !!---------------------------------------------------------------------- 17 11 !! * Modules used … … 37 31 # include "vectopt_loop_substitute.h90" 38 32 !!---------------------------------------------------------------------- 39 33 !!---------------------------------------------------------------------- 34 !! OPA 9.0 , LOCEAN-IPSL (2005) 35 !! $Header$ 36 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 37 !!---------------------------------------------------------------------- 40 38 CONTAINS 41 39 … … 132 130 133 131 ! Interpolation of T and S at the last ocean level 134 # if defined key_vectopt_loop && ! defined key_ autotasking132 # if defined key_vectopt_loop && ! defined key_mpp_omp 135 133 jj = 1 136 134 DO ji = 1, jpij-jpi ! vector opt. (forced unrolled) … … 195 193 pgsv(ji,jj) = vmask(ji,jj,1) * ( psal(ji,jj+1,ikv) - zsj(ji,jj) ) 196 194 ENDIF 197 # if ! defined key_vectopt_loop || defined key_ autotasking195 # if ! defined key_vectopt_loop || defined key_mpp_omp 198 196 END DO 199 197 # endif … … 207 205 208 206 ! Gradient of density at the last level 209 # if defined key_vectopt_loop && ! defined key_ autotasking207 # if defined key_vectopt_loop && ! defined key_mpp_omp 210 208 jj = 1 211 209 DO ji = 1, jpij-jpi ! vector opt. (forced unrolled) … … 228 226 pgrv(ji,jj) = vmask(ji,jj,1) * ( prd(ji,jj+1,ikv) - zrj(ji,jj) ) 229 227 ENDIF 230 # if ! defined key_vectopt_loop || defined key_ autotasking228 # if ! defined key_vectopt_loop || defined key_mpp_omp 231 229 END DO 232 230 # endif … … 240 238 END SUBROUTINE zps_hde 241 239 242 #else243 !!----------------------------------------------------------------------244 !! Default option Empty module245 !!----------------------------------------------------------------------246 USE par_kind247 CONTAINS248 SUBROUTINE zps_hde ( kt, ptem, psal, prd , & ! Empty routine249 pgtu, pgsu, pgru, &250 pgtv, pgsv, pgrv )251 REAL(wp), DIMENSION(:,:,:) :: ptem, psal, prd252 REAL(wp) :: pgtu, pgsu, pgru, pgtv, pgsv, pgrv253 WRITE(*,*) 'zps_hde: You should not have seen this print! error?', &254 kt, ptem, psal, prd, pgtu, pgsu, pgru, pgtv, pgsv, pgrv255 END SUBROUTINE zps_hde256 #endif257 258 240 !!====================================================================== 259 241 END MODULE zpshde -
trunk/NEMO/OFF_SRC/ZDF/zdfmxl.F90
r343 r563 4 4 !! Ocean physics: mixed layer depth 5 5 !!====================================================================== 6 6 !! History : 7 !! 9.0 ! 03-08 (G. Madec) OpenMP/autotasking optimization 7 8 !!---------------------------------------------------------------------- 8 9 !! zdf_mxl : Compute the turbocline and mixed layer depths. 9 !!----------------------------------------------------------------------10 !! OPA 9.0 , LOCEAN-IPSL (2005)11 !! $Header$12 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt13 10 !!---------------------------------------------------------------------- 14 11 !! * Modules used … … 17 14 USE zdf_oce ! ocean vertical physics 18 15 USE in_out_manager ! I/O manager 16 USE prtctl ! Print control 19 17 20 18 IMPLICIT NONE … … 39 37 !! * Substitutions 40 38 # include "domzgr_substitute.h90" 39 !!---------------------------------------------------------------------- 40 !! OPA 9.0 , LOCEAN-IPSL (2005) 41 !! $Header$ 42 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 43 !!---------------------------------------------------------------------- 41 44 42 45 CONTAINS 43 46 44 # if defined key_ autotasking45 !!---------------------------------------------------------------------- 46 !! 'key_ autotasking'j-k-i loop (j-slab)47 # if defined key_mpp_omp 48 !!---------------------------------------------------------------------- 49 !! 'key_mpp_omp' j-k-i loop (j-slab) 47 50 !!---------------------------------------------------------------------- 48 51 … … 61 64 !! ** Action : 62 65 !! 63 !! History :64 !! 9.0 ! 03-08 (G. Madec) autotasking optimization65 66 !!---------------------------------------------------------------------- 66 67 !! * Arguments … … 76 77 IF( kt == nit000 ) THEN 77 78 IF(lwp) WRITE(numout,*) 78 IF(lwp) WRITE(numout,*) 'zdf_mxl : mixed layer depth' 79 IF(lwp) WRITE(numout,*) '~~~~~~~ auto-tasking case : j-k-i loop' 80 IF(lwp) WRITE(numout,*) 79 IF(lwp) WRITE(numout,*) 'zdf_mxl : mixed layer depth, j-k-i loops' 80 IF(lwp) WRITE(numout,*) '~~~~~~~' 81 81 ENDIF 82 82 … … 132 132 END DO ! End of slab 133 133 ! ! =============== 134 135 IF(ln_ctl) CALL prt_ctl( tab2d_1=REAL(nmln,wp), clinfo1=' nmln : ', tab2d_2=hmld, clinfo2=' hmld : ', ovlap=1 ) 134 136 135 137 END SUBROUTINE zdf_mxl … … 232 234 END DO 233 235 236 IF(ln_ctl) CALL prt_ctl( tab2d_1=REAL(nmln,wp), clinfo1=' nmln : ', tab2d_2=hmld, clinfo2=' hmld : ', ovlap=1 ) 237 234 238 END SUBROUTINE zdf_mxl 235 239 #endif
Note: See TracChangeset
for help on using the changeset viewer.
