Changeset 463 for trunk/NEMO/OPA_SRC/ZDF/zdfmxl.F90

Timestamp:

2006-05-10T19:26:55+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_054:RB: take into account tracers and dynamics reorganization, change atsk to jki

File:

• trunk/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/ZDF/zdfmxl.F90

@@ -4 +4 @@
    !! Ocean physics: mixed layer depth 
    !!======================================================================
-
+   !! History :
+   !!   9.0  !  03-08  (G. Madec)  OpenMP/autotasking optimization
    !!----------------------------------------------------------------------
    !!   zdf_mxl      : Compute the turbocline and mixed layer depths.
@@ -44 +45 @@
 CONTAINS
 
-# if defined key_autotasking
-   !!----------------------------------------------------------------------
-   !!   'key_autotasking'                               j-k-i loop (j-slab)
+# if defined key_mpp_omp
+   !!----------------------------------------------------------------------
+   !!   'key_mpp_omp'                                   j-k-i loop (j-slab)
    !!----------------------------------------------------------------------
 
@@ -63 +64 @@
       !! ** Action  :
       !!
-      !! History :
-      !!   9.0  !  03-08  (G. Madec)  autotasking optimization
       !!----------------------------------------------------------------------
       !! * Arguments
@@ -78 +77 @@
       IF( kt == nit000 ) THEN
          IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) 'zdf_mxl : mixed layer depth'
-         IF(lwp) WRITE(numout,*) '~~~~~~~   auto-tasking case : j-k-i loop'
-         IF(lwp) WRITE(numout,*)
+         IF(lwp) WRITE(numout,*) 'zdf_mxl : mixed layer depth, j-k-i loops'
+         IF(lwp) WRITE(numout,*) '~~~~~~~'
       ENDIF
 
@@ -135 +133 @@
       !                                                ! ===============
 
-      IF(ln_ctl)   THEN
-         CALL prt_ctl(tab2d_1=REAL(nmln,wp), clinfo1=' nmln : ', tab2d_2=hmld, clinfo2=' hmld : ', ovlap=1)
-      ENDIF
-      
+      IF(ln_ctl)   CALL prt_ctl( tab2d_1=REAL(nmln,wp), clinfo1=' nmln : ', tab2d_2=hmld, clinfo2=' hmld : ', ovlap=1 )
 
    END SUBROUTINE zdf_mxl
@@ -239 +234 @@
       END DO
 
-      IF(ln_ctl)   THEN
-         CALL prt_ctl(tab2d_1=REAL(nmln,wp), clinfo1=' nmln : ', tab2d_2=hmld, clinfo2=' hmld : ', ovlap=1)
-      ENDIF
+      IF(ln_ctl)   CALL prt_ctl( tab2d_1=REAL(nmln,wp), clinfo1=' nmln : ', tab2d_2=hmld, clinfo2=' hmld : ', ovlap=1 )
 
    END SUBROUTINE zdf_mxl