Changeset 7299 for branches/2016/dev_CMCC_2016/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90

Timestamp:

2016-11-22T12:19:58+01:00 (8 years ago)

Author:

lovato

Message:

Merge with CMCC changes from dev_r6522_SIMPLIF_3 - ticket #1729 & #1783

File:

• branches/2016/dev_CMCC_2016/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90 (modified) (2 diffs)

branches/2016/dev_CMCC_2016/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90

@@ -5 +5 @@
    !!======================================================================
    !! History :  9.0  !  07  (O. Le Galloudec)  Original code
-   !!----------------------------------------------------------------------
-#if defined key_tide
-   !!----------------------------------------------------------------------
-   !!   'key_tide' :                                        tidal potential
    !!----------------------------------------------------------------------
    !!   upd_tide       : update tidal potential
@@ -81 +77 @@
    END SUBROUTINE upd_tide
 
-#else
-  !!----------------------------------------------------------------------
-  !!   Dummy module :                                        NO TIDE
-  !!----------------------------------------------------------------------
-CONTAINS
-  SUBROUTINE upd_tide( kt, kit, time_offset )  ! Empty routine
-    INTEGER, INTENT(in)           ::   kt      !  integer  arg, dummy routine
-    INTEGER, INTENT(in), OPTIONAL ::   kit     !  optional arg, dummy routine
-    INTEGER, INTENT(in), OPTIONAL ::   time_offset !  optional arg, dummy routine
-    WRITE(*,*) 'upd_tide: You should not have seen this print! error?', kt
-  END SUBROUTINE upd_tide
-
-#endif
-
   !!======================================================================