Changeset 2329 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis4.F90

Timestamp:

2010-10-28T12:21:58+02:00 (13 years ago)

Author:

gm

Message:

v3.3beta: Suppress old keys (key_diaspr, key_flx..., key_vectopt_memory) & phasing of zdfgls interface

File:

• branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis4.F90 (modified) (2 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis4.F90

@@ -154 +154 @@
       IF(lwp) WRITE(numout,*)
      
-#if defined key_flx_bulk_monthly || defined key_flx_bulk_daily || defined key_flx_forced_daily
-
-#if !defined key_oasis4
-! The following is not necessarily a valid peice of checking
-
-      IF(lwp) WRITE(numout,cform_err)
-      IF(lwp) WRITE(numout,*) ' key_coupled and key_flx_bulk_* key_flx_forced_daily are incompatible'
-      nstop = nstop + 1
-
-#endif
-
-#endif
-
       REWIND( numnam )
       READ  ( numnam, nam_mpp )
@@ -308 +295 @@
       IF(lwp) WRITE(numout,*)
      
-#if defined key_flx_bulk_monthly || defined key_flx_bulk_daily || defined key_flx_forced_daily
-
-#if !defined key_oasis4
-! The problem with the following is that it ASSUMES we're only ever coupling to an atmosphere
-! which is not necessarily the case. Prevent this test temporarily for NEMOGAM development.
-
-      IF(lwp) WRITE(numout,cform_err)
-      IF(lwp) WRITE(numout,*) ' key_coupled and key_flx_bulk_... are incompatible'
-      nstop = nstop + 1
-
-#endif
-
-#endif
-
       ! -----------------------------------------------------------------
       ! ... Some initialisation