Changeset 896

Timestamp:

2008-04-22T16:02:23+02:00 (16 years ago)

Author:

rblod

Message:

Update KPP according to step reorganization (nemo_v2) ..., see ticket #101

Location:

trunk/NEMO/OPA_SRC

Files:

• DOM/dommsk.F90 (modified) (1 diff)
• ZDF/zdfkpp.F90 (modified) (7 diffs)

trunk/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -171 +171 @@
 #if defined key_zdfkpp
       IF( cp_cfg == 'orca' )   THEN
-         IF( jp_cfg = 2 )   THEN
+         IF( jp_cfg == 2 )   THEN
             ! land point on Bab el Mandeb zonal section
             ij0 =  87   ;   ij1 =  88

trunk/NEMO/OPA_SRC/ZDF/zdfkpp.F90

@@ -28 +28 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE prtctl          ! Print control
+   USE trdmod          ! momentum/tracers trends 
 
    IMPLICIT NONE
@@ -145 +146 @@
 #  include "domzgr_substitute.h90"
 #  include "vectopt_loop_substitute.h90"
+#  include  "zdfddm_substitute.h90"
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL   (2005)
@@ -1241 +1243 @@
 
 
-   SUBROUTINE tra_kpp
+   SUBROUTINE tra_kpp( kt )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE tra_kpp  ***
@@ -1257 +1259 @@
                          ztrds => va          ! use va as 3D workspace
       !!----------------------------------------------------------------------
+      INTEGER, INTENT(in) :: kt
+      INTEGER :: ji, jj, jk
 
       IF( kt == nit000 ) THEN
@@ -1293 +1297 @@
       ENDIF
 
-      IF(ln_ctl)   CALL prt_ctl( tab3d_1=ta, clinfo1=' kpp  - Ta: ', mask1=tmask,   &
-         &                       tab3d_2=sa, clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' )
+      IF(ln_ctl) THEN  
+         CALL prt_ctl( tab3d_1=ta, clinfo1=' kpp  - Ta: ', mask1=tmask,   &
+         &             tab3d_2=sa, clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' )
       ENDIF
 
@@ -1483 +1488 @@
       CASE DEFAULT
          WRITE(ctmp1,*) '          bad flag value for nave = ', nave
-         CALL ctl_opa( ctmp1 )
+         CALL ctl_stop( ctmp1 )
 
       END SELECT
@@ -1498 +1503 @@
          !   Background profile of avt (fit a theoretical/observational profile (Krauss 1990) 
          avmb(:) = avm0
-         avtb(:) = 1.e-5 + 2.8e-8 * gdepw(:)   ! m2/s
+         avtb(:) = 1.e-5 + 2.8e-8 * gdepw_0(:)   ! m2/s
       ENDIF