Changeset 4901 for branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2014-11-27T16:41:22+01:00 (10 years ago)

Author:

cetlod

Message:

2014/dev_CNRS_2014 : merge the 3rd branch onto dev_CNRS_2014, see ticket #1415

File:

• branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (1 diff)

branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -207 +207 @@
       IF( lk_floats  )   CALL flo_stp( kstp )         ! drifting Floats
       IF( lk_diahth  )   CALL dia_hth( kstp )         ! Thermocline depth (20 degres isotherm depth)
-      IF( lk_diafwb  )   CALL dia_fwb( kstp )         ! Fresh water budget diagnostics
+      IF( .NOT. lk_cpl ) CALL dia_fwb( kstp )         ! Fresh water budget diagnostics
       IF( ln_diaptr  )   CALL dia_ptr( kstp )         ! Poleward TRansports diagnostics
       IF( lk_diadct  )   CALL dia_dct( kstp )         ! Transports