Changeset 5930 for trunk/NEMOGCM/NEMO/OPA_SRC/SBC

Timestamp:

2015-11-26T17:07:10+01:00 (8 years ago)

Author:

jchanut

Message:

#1620 Merge free surface simplification into trunk

Location:

trunk/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

• sbcapr.F90 (modified) (2 diffs)
• sbctide.F90 (modified) (1 diff)
• tideini.F90 (modified) (2 diffs)

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

@@ -12 +12 @@
    USE dom_oce         ! ocean space and time domain
    USE sbc_oce         ! surface boundary condition
-   USE dynspg_oce      ! surface pressure gradient variables
    USE phycst          ! physical constants
    USE fldread         ! read input fields
@@ -112 +111 @@
             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' )
+!jc: stop below should rather be a warning 
          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' )

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

@@ -10 +10 @@
    USE phycst
    USE daymod
-   USE dynspg_oce
    USE tideini
    !

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

@@ -10 +10 @@
    USE phycst
    USE daymod
-   USE dynspg_oce
    USE tide_mod
    !
@@ -96 +95 @@
           &   CALL ctl_stop('rdttideramp must be positive')
        !
-       IF( .NOT. lk_dynspg_ts )   CALL ctl_warn( 'sbc_tide : use of time splitting is recommended' )
        !
        ALLOCATE( ntide(nb_harmo) )