Changeset 3072 for branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90

Timestamp:

2011-11-09T18:07:32+01:00 (13 years ago)

Author:

acc

Message:

Branch dev_NOC_2011_MERGE. #874. Step 10. Merge in changes from dev_r2802_NOCL_bfrimp branch (plus some additions and conflicit resolutions)

File:

• branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 (modified) (4 diffs)

branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90

@@ -36 +36 @@
    REAL(wp) ::   rn_bfrien = 30._wp      ! local factor to enhance coefficient bfri
    LOGICAL  ::   ln_bfr2d  = .false.     ! logical switch for 2D enhancement
-   
-   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::  bfrcoef2d   ! 2D bottom drag coefficient
+   LOGICAL , PUBLIC                            ::  ln_bfrimp = .false.  ! logical switch for implicit bottom friction
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::  bfrcoef2d            ! 2D bottom drag coefficient
 
    !! * Substitutions
@@ -142 +142 @@
       REAL(wp) ::  zfru, zfrv         !    -         -
       !!
-      NAMELIST/nambfr/ nn_bfr, rn_bfri1, rn_bfri2, rn_bfeb2, ln_bfr2d, rn_bfrien
+      NAMELIST/nambfr/ nn_bfr, rn_bfri1, rn_bfri2, rn_bfeb2, ln_bfr2d, rn_bfrien, ln_bfrimp
       !!----------------------------------------------------------------------
 
@@ -156 +156 @@
       !                              ! allocate zdfbfr arrays
       IF( zdf_bfr_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'zdf_bfr_init : unable to allocate arrays' )
+
+      !                              ! Make sure ln_zdfexp=.false. when use implicit bfr
+      IF( ln_bfrimp .AND. ln_zdfexp ) THEN
+         IF(lwp) THEN
+            WRITE(numout,*)
+            WRITE(numout,*) 'Implicit bottom friction can only be used when ln_zdfexp=.false.'
+            WRITE(numout,*) '         but you set: ln_bfrimp=.true. and ln_zdfexp=.true.!!!!'
+            WRITE(ctmp1,*)  '         bad ln_bfrimp value = .true.' 
+            CALL ctl_stop( ctmp1 )
+         END IF
+      END IF
 
       SELECT CASE (nn_bfr)
@@ -207 +218 @@
          !
       END SELECT
+      IF(lwp) WRITE(numout,*) '      implicit bottom friction switch                ln_bfrimp  = ', ln_bfrimp
       !
       ! Basic stability check on bottom friction coefficient