Changeset 6864 for branches/2016/dev_r6522_SIMPLIF_3/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90

Timestamp:

2016-08-12T15:16:27+02:00 (8 years ago)

Author:

lovato

Message:

#1729 - trunk: removed key_tide from the code and set usage of ln_tide. Tested with AMM12 and ORCA2_LIM_PISCES.

File:

• branches/2016/dev_r6522_SIMPLIF_3/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 (modified) (3 diffs)

branches/2016/dev_r6522_SIMPLIF_3/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90

@@ -6 +6 @@
    !! History :  3.1  !  2007  (O. Le Galloudec, J. Chanut)  Original code
    !!----------------------------------------------------------------------
-#if defined key_diaharm && defined key_tide
+#if defined key_diaharm
    !!----------------------------------------------------------------------
    !!   'key_diaharm'
-   !!   'key_tide'
    !!----------------------------------------------------------------------
    USE oce             ! ocean dynamics and tracers variables
@@ -16 +15 @@
    USE daymod
    USE tide_mod
+   USE sbctide  , ONLY: ln_tide ! Tidal forcing or not
    !
    USE in_out_manager  ! I/O units
@@ -82 +82 @@
          WRITE(numout,*) '~~~~~~~ '
       ENDIF
+      !
+      IF( .NOT. ln_tyde )   CALL ctl_stop( 'dia_harm_init : ln_tyde must be true for harmonic analysis')
       !
       CALL tide_init_Wave