Changeset 2446

Timestamp:

2010-11-30T15:50:33+01:00 (14 years ago)

Author:

acc

Message:

nemo_v3_3beta. Added support for ORCA1 when using key_dynldf_c3d. Changes to ldfdyn_c3d.h90 only. See #770

File:

• branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90 (modified) (5 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90

@@ -83 +83 @@
 
 
-         ! Special case for ORCA R2 and R4 configurations (overwrite the value of ahm1 ahm2)
+         ! Special case for ORCA R1, R2 and R4 configurations (overwrite the value of ahm1 ahm2)
          ! ==============================================
-         IF( cp_cfg == "orca" .AND. ( jp_cfg == 2 .OR. jp_cfg == 4 ) ) THEN
+         IF( cp_cfg == "orca" .AND. ( jp_cfg == 1 .OR. jp_cfg == 2 .OR. jp_cfg == 4 ) ) THEN 
             IF(lwp) WRITE(numout,*)
-            IF(lwp) WRITE(numout,*) '              ORCA R2 or R4: overwrite the previous definition of ahm'
-            IF(lwp) WRITE(numout,*) '              ============='
+            IF(lwp) WRITE(numout,*) '              ORCA R1, R2 or R4: overwrite the previous definition of ahm'
+            IF(lwp) WRITE(numout,*) '              ================='
             CALL ldf_dyn_c3d_orca( ld_print )
          ENDIF
@@ -189 +189 @@
       !!                  ***  ROUTINE ldf_dyn_c3d  ***
       !!                   
-      !! ** Purpose :   ORCA R2 an R4 only
+      !! ** Purpose :   ORCA R1, R2 and R4 only
       !!
       !! ** Method  :   blah blah blah ....
@@ -218 +218 @@
       IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~~~'
       IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) '        orca R2 or R4 ocean model'
+      IF(lwp) WRITE(numout,*) '        orca R1, R2 or R4 ocean model'
       IF(lwp) WRITE(numout,*) '  reduced in the surface Eq. strip '
       IF(lwp) WRITE(numout,*)
@@ -308 +308 @@
       ENDIF
 
+      IF( jp_cfg == 1 )   THEN
+         zahmeq     = aht0  ! reduced to aht0 on equator; set to ahm0 if no tropical reduction is required
+         zahmm      = ahm0
+         zahm0(:,:) = ahm0
+      ENDIF
+
       DO jj = 1, jpj
          DO ji = 1, jpi
@@ -353 +359 @@
 
       ! other level: re-increase the coef in the deep ocean
-       DO jk = 1, 21
-         zcoef(jk) = 1._wp
-      END DO
-      zcoef(22) = 2._wp
-      zcoef(23) = 3._wp
-      zcoef(24) = 5._wp
-      zcoef(25) = 7._wp
-      zcoef(26) = 9._wp
-      DO jk = 27, jpk
-         zcoef(jk) = 10._wp
-      END DO
+      !==================================================================
+      ! Prior to v3.3, zcoeff was hardwired according to k-index jk.
       !
+      ! From v3.3 onwards this has been generalised to a function of 
+      ! depth so that it can be used with any number of levels.
+      !
+      ! The function has been chosen to match the original values (shown
+      ! in the following comments) when using the standard 31 ORCA levels.  
+      !     DO jk = 1, 21
+      !        zcoef(jk) = 1._wp
+      !     END DO
+      !     zcoef(22) = 2._wp
+      !     zcoef(23) = 3._wp
+      !     zcoef(24) = 5._wp
+      !     zcoef(25) = 7._wp
+      !     zcoef(26) = 9._wp
+      !     DO jk = 27, jpk
+      !        zcoef(jk) = 10._wp
+      !     END DO
+      !==================================================================
+
+       IF(lwp) THEN
+          WRITE(numout,*)
+          WRITE(numout,*) '         1D zcoef array '
+          WRITE(numout,*) '         ~~~~~~~~~~~~~~ '
+          WRITE(numout,*)
+          WRITE(numout,*) '    jk        zcoef '
+       ENDIF
+
+      DO jk=1, jpk
+         zcoef(jk) = 1.0_wp + NINT(9.0_wp*(gdept_0(jk)-800.0_wp)/(3000.0_wp-800.0_wp))
+         zcoef(jk) = MIN(10.0_wp, MAX(1.0_wp, zcoef(jk)))
+         IF(lwp) WRITE(numout,'(4x,i3,6x,f7.3)') jk,zcoef(jk)
+      END DO
+
       DO jk = 2, jpk
          ahm1(:,:,jk) = MIN( zahm0(:,:), zcoef(jk) * ahm1(:,:,1) )