Changeset 3797 for branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO

Timestamp:

2013-02-11T12:26:15+01:00 (11 years ago)

Author:

cbricaud

Message:

replace rpref by rn_pref and e1t(:,:) * e2t(:,:) by e1e2t in sbcapr and put ln_apr_obc in namelist in CONFIG; see ticket 905

File:

• branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90 (modified) (8 diffs)

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90

@@ -15 +15 @@
    USE dynspg_oce      ! surface pressure gradient variables
    USE phycst          ! physical constants
+   USE restart          ! ocean restart
    USE fldread         ! read input fields
    USE in_out_manager  ! I/O manager
@@ -20 +21 @@
    USE iom             ! IOM library
    USE lib_mpp         ! MPP library
-   USE restart         ! ocean restart
 
    IMPLICIT NONE
@@ -27 +27 @@
    PUBLIC   sbc_apr    ! routine called in sbcmod
    
-   !                                         !!* namsbc_apr namelist (Atmospheric PRessure) *
-   LOGICAL, PUBLIC ::   ln_apr_obc = .FALSE.  !: inverse barometer added to OBC ssh data 
-   LOGICAL, PUBLIC ::   ln_ref_apr = .FALSE.  !: ref. pressure: global mean Patm (F) or a constant (F)
+   !                                              !!* namsbc_apr namelist (Atmospheric PRessure) *
+   LOGICAL, PUBLIC ::   ln_apr_obc = .FALSE.      !: inverse barometer added to OBC ssh data 
+   LOGICAL, PUBLIC ::   ln_ref_apr = .FALSE.      !: ref. pressure: global mean Patm (F) or a constant (F)
+   REAL(wp)        ::   rn_pref    = 101000._wp   !  reference atmospheric pressure   [N/m2]
 
    REAL(wp), ALLOCATABLE, SAVE, PUBLIC, DIMENSION(:,:) ::   ssh_ib    ! Inverse barometer now    sea surface height   [m]
@@ -35 +36 @@
    REAL(wp), ALLOCATABLE, SAVE, PUBLIC, DIMENSION(:,:) ::   apr       ! atmospheric pressure at kt                 [N/m2]
    
-   REAL(wp) ::   rpref = 101000._wp   ! reference atmospheric pressure          [N/m2]
    REAL(wp) ::   tarea                ! whole domain mean masked ocean surface
    REAL(wp) ::   r1_grau              ! = 1.e0 / (grav * rau0)
@@ -66 +66 @@
       !!
       INTEGER            ::   ierror  ! local integer 
-      REAL(wp)           ::   zpref   ! local scalar
       !!
       CHARACTER(len=100) ::  cn_dir   ! Root directory for location of ssr files
       TYPE(FLD_N)        ::  sn_apr   ! informations about the fields to be read
       !!
-      NAMELIST/namsbc_apr/ cn_dir, sn_apr, ln_ref_apr
+      NAMELIST/namsbc_apr/ cn_dir, sn_apr, ln_ref_apr, rn_pref, ln_apr_obc
       !!----------------------------------------------------------------------
       !
@@ -104 +103 @@
          !
          IF( ln_ref_apr ) THEN                        !* Compute whole inner domain mean masked ocean surface
-            tarea = glob_sum( e1t(:,:) * e2t(:,:) )
+            tarea = glob_sum( e1e2t(:,:) )
             IF(lwp) WRITE(numout,*) '         Variable ref. Patm computed over a ocean surface of ', tarea*1e-6, 'km2'
          ELSE
-            IF(lwp) WRITE(numout,*) '         Reference Patm used : ', rpref, ' N/m2'
+            IF(lwp) WRITE(numout,*) '         Reference Patm used : ', rn_pref, ' N/m2'
          ENDIF
          !
@@ -113 +112 @@
          !
          !                                            !* control check
-         IF( ln_apr_obc  )   &
-            CALL ctl_stop( 'sbc_apr: inverse barometer added to OBC ssh data not yet implemented ' )
-         IF( ln_apr_obc .AND. .NOT. lk_obc )   &
-            CALL ctl_stop( 'sbc_apr: add inverse barometer to OBC requires to use key_obc' )
+         IF ( ln_apr_obc  ) THEN
+            IF(lwp) WRITE(numout,*) '         Inverse barometer added to OBC ssh data'
+         ENDIF
          IF( ( ln_apr_obc ) .AND. .NOT. lk_dynspg_ts )   &
             CALL ctl_stop( 'sbc_apr: use inverse barometer ssh at open boundary ONLY possible with time-splitting' )
@@ -132 +130 @@
          !
          !                                                  !* update the reference atmospheric pressure (if necessary)
-         IF( ln_ref_apr )   rpref = glob_sum( sf_apr(1)%fnow(:,:,1) * e1t(:,:) * e2t(:,:) ) / tarea
+         IF( ln_ref_apr )   rn_pref = glob_sum( sf_apr(1)%fnow(:,:,1) * e1e2t(:,:) ) / tarea
          !
          !                                                  !* Patm related forcing at kt
-         ssh_ib(:,:) = - ( sf_apr(1)%fnow(:,:,1) - rpref ) * r1_grau    ! equivalent ssh (inverse barometer)
+         ssh_ib(:,:) = - ( sf_apr(1)%fnow(:,:,1) - rn_pref ) * r1_grau    ! equivalent ssh (inverse barometer)
          apr   (:,:) =     sf_apr(1)%fnow(:,:,1)                        ! atmospheric pressure
          !