Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90 (modified) (3 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90

@@ -10 +10 @@
    !!   sbc_apr        : read atmospheric pressure in netcdf files 
    !!----------------------------------------------------------------------
-   USE bdy_par         ! Unstructured boundary parameters
    USE obc_par         ! open boundary condition parameters
    USE dom_oce         ! ocean space and time domain
@@ -30 +29 @@
    !                                         !!* namsbc_apr namelist (Atmospheric PRessure) *
    LOGICAL, PUBLIC ::   ln_apr_obc = .FALSE.  !: inverse barometer added to OBC ssh data 
-   LOGICAL, PUBLIC ::   ln_apr_bdy = .FALSE.  !: inverse barometer added to BDY ssh data
    LOGICAL, PUBLIC ::   ln_ref_apr = .FALSE.  !: ref. pressure: global mean Patm (F) or a constant (F)
 
@@ -115 +113 @@
          !
          !                                            !* control check
-         IF( ln_apr_obc .OR. ln_apr_bdy   )   &
-            CALL ctl_stop( 'sbc_apr: inverse barometer added to OBC or BDY ssh data not yet implemented ' )
+         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_bdy .AND. .NOT. lk_bdy )   &
-            CALL ctl_stop( 'sbc_apr: add inverse barometer to OBC requires to use key_bdy' )
-         IF( ( ln_apr_obc .OR. ln_apr_bdy ) .AND. .NOT. lk_dynspg_ts )   &
+         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' )
-         IF( ( ln_apr_obc .OR. ln_apr_bdy ) .AND. .NOT. ln_apr_dyn   )   &
+         IF( ( ln_apr_obc ) .AND. .NOT. ln_apr_dyn   )   &
             CALL ctl_stop( 'sbc_apr: use inverse barometer ssh at open boundary ONLY requires ln_apr_dyn=T' )
       ENDIF