Changeset 6020 for branches/UKMO/icebergs_restart_single_file/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc_oce.F90

Timestamp:

2015-12-08T12:39:53+01:00 (8 years ago)

Author:

timgraham

Message:

Merged with head of trunk

File:

• branches/UKMO/icebergs_restart_single_file/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc_oce.F90 (modified) (2 diffs)

branches/UKMO/icebergs_restart_single_file/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc_oce.F90

@@ -4 +4 @@
    !! Ocean trends :   set tracer and momentum trend variables
    !!======================================================================
-#if defined key_top   ||   defined key_esopa
+#if defined key_top
    !!----------------------------------------------------------------------
    !!   'key_top'                                                TOP models
@@ -30 +30 @@
 # endif
 
-# if defined key_trdmxl_trc   ||   defined key_esopa
+# if defined key_trdmxl_trc
    !!----------------------------------------------------------------------
    !!   'key_trdmxl_trc'                     mixed layer trends diagnostics