Changeset 8868 for branches/2017/dev_METO_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90

Timestamp:

2017-12-01T09:43:23+01:00 (6 years ago)

Author:

timgraham

Message:

Merged dev_r8789_sbc into branch

File:

• branches/2017/dev_METO_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90 (modified) (2 diffs)

branches/2017/dev_METO_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90

@@ -186 +186 @@
       !                             !** initialization of the chosen bulk formulae (+ check)
       !                                   !* select the bulk chosen in the namelist and check the choice
-      ;                                                        ioptio = 0
+                                                               ioptio = 0
       IF( ln_NCAR      ) THEN   ;   nblk =  np_NCAR        ;   ioptio = ioptio + 1   ;   ENDIF
       IF( ln_COARE_3p0 ) THEN   ;   nblk =  np_COARE_3p0   ;   ioptio = ioptio + 1   ;   ENDIF
@@ -219 +219 @@
          ALLOCATE( sf(ifpr)%fnow(jpi,jpj,1) )
          IF( slf_i(ifpr)%ln_tint )   ALLOCATE( sf(ifpr)%fdta(jpi,jpj,1,2) )
+
+           IF( slf_i(ifpr)%nfreqh .GT. 0._wp .AND. MOD( 3600._wp * slf_i(ifpr)%nfreqh , REAL(nn_fsbc, wp) * rdt) .NE. 0._wp  )   &
+            &  CALL ctl_warn( 'sbcmod time step rdt * nn_fsbc is NOT a submultiple of atmospheric forcing frequency' )
+
       END DO
       !                                      !- fill the bulk structure with namelist informations