Changeset 5038 for branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP/NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90

Timestamp:

2015-01-20T15:26:13+01:00 (9 years ago)

Author:

jamesharle

Message:

Merging branch with HEAD of the trunk

File:

• branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP/NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90 (modified) (4 diffs)

branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP/NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90

@@ -55 +55 @@
       CALL ctl_opn( numnatc_ref, 'namelist_cfc_ref'   ,     'OLD', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. )
       CALL ctl_opn( numnatc_cfg, 'namelist_cfc_cfg'   ,     'OLD', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. )
-      CALL ctl_opn( numonc     , 'output.namelist.cfc', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. )
+      IF(lwm) CALL ctl_opn( numonc, 'output.namelist.cfc', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. )
 
       REWIND( numnatc_ref )              ! Namelist namcfcdate in reference namelist : CFC parameters
@@ -64 +64 @@
       READ  ( numnatc_cfg, namcfcdate, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfcdate in configuration namelist', lwp )
-      WRITE ( numonc, namcfcdate )
+      IF(lwm) WRITE ( numonc, namcfcdate )
 
       IF(lwp) THEN                  ! control print
@@ -88 +88 @@
          READ  ( numnatc_cfg, namcfcdia, IOSTAT = ios, ERR = 904 )
 904      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfcdia in configuration namelist', lwp )
-         WRITE ( numonc, namcfcdia )
+         IF(lwm) WRITE ( numonc, namcfcdia )
 
          DO jl = 1, jp_cfc_2d
@@ -110 +110 @@
       ENDIF
 
-   CALL FLUSH ( numonc )     ! flush output namelist CFC
+   IF(lwm) CALL FLUSH ( numonc )     ! flush output namelist CFC
 
    END SUBROUTINE trc_nam_cfc