Changeset 1953 for branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/CFC/trclsm_cfc.F90

Timestamp:

2010-06-24T17:27:10+02:00 (14 years ago)

Author:

acc

Message:

ticket #684 step 3: Add in changes from the trunk between revisions 1784 and 1821. No conflicts so far

File:

• branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/CFC/trclsm_cfc.F90 (modified) (3 diffs)

branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/CFC/trclsm_cfc.F90

@@ -43 +43 @@
       !!----------------------------------------------------------------------
       INTEGER ::   numnatc
-#if defined key_trc_diaadd
+#if defined key_trc_diaadd && ! defined key_iomput
       ! definition of additional diagnostic as a structure
       INTEGER :: jl, jn
@@ -56 +56 @@
       !!
       NAMELIST/namcfcdate/ ndate_beg, nyear_res
-#if defined key_trc_diaadd
+#if defined key_trc_diaadd && ! defined key_iomput
       NAMELIST/namcfcdia/nwritedia, cfcdia2d     ! additional diagnostics
 #endif
@@ -79 +79 @@
       IF(lwp) WRITE(numout,*) '    initial year (aa)                       nyear_beg = ', nyear_beg
       !
-#if defined key_trc_diaadd
+#if defined key_trc_diaadd && ! defined key_iomput
 
       ! Namelist namcfcdia