Changeset 7412 for branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DIA

Timestamp:

2016-12-01T11:30:29+01:00 (8 years ago)

Author:

lovato

Message:

Merge dev_NOC_CMCC_merge_2016 into branch

Location:

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DIA

Files:

• diaharm.F90 (modified) (3 diffs)
• diahsb.F90 (modified) (3 diffs)

branches/2016/dev_merge_2016/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         ! Tidal forcing or not
    !
    USE in_out_manager  ! I/O units
@@ -82 +82 @@
          WRITE(numout,*) '~~~~~~~ '
       ENDIF
+      !
+      IF( .NOT. ln_tide )   CALL ctl_stop( 'dia_harm_init : ln_tide must be true for harmonic analysis')
       !
       CALL tide_init_Wave

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90

@@ -23 +23 @@
    USE trabbc          ! bottom boundary condition 
    USE trabbc          ! bottom boundary condition
-   USE bdy_par         ! (for lk_bdy)
    USE restart         ! ocean restart
+   USE bdy_oce   , ONLY: ln_bdy
    !
    USE iom             ! I/O manager
@@ -372 +372 @@
 
       IF( .NOT. ln_diahsb )   RETURN
-         !      IF( .NOT. lk_mpp_rep ) &
-         !        CALL ctl_stop (' Your global mpp_sum if performed in single precision - 64 bits -', &
-         !             &         ' whereas the global sum to be precise must be done in double precision ',&
-         !             &         ' please add key_mpp_rep')
 
       ! ------------------- !
@@ -399 +395 @@
       surf_tot  = glob_sum( surf(:,:) )                                       ! total ocean surface area
 
-      IF( lk_bdy ) CALL ctl_warn( 'dia_hsb does not take open boundary fluxes into account' )         
+      IF( ln_bdy ) CALL ctl_warn( 'dia_hsb does not take open boundary fluxes into account' )         
       !
       ! ---------------------------------- !