Changeset 5038 for branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP/NEMOGCM/NEMO/TOP_SRC/TRP/trcnam_trp.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/TRP/trcnam_trp.F90 (modified) (5 diffs)

branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP/NEMOGCM/NEMO/TOP_SRC/TRP/trcnam_trp.F90

@@ -97 +97 @@
       READ  ( numnat_cfg, namtrc_adv, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtrc_adv in configuration namelist', lwp )
-      WRITE ( numont, namtrc_adv )
+      IF(lwm) WRITE ( numont, namtrc_adv )
 
       IF(lwp) THEN                    ! Namelist print
@@ -119 +119 @@
       READ  ( numnat_cfg, namtrc_ldf, IOSTAT = ios, ERR = 904 )
 904   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtrc_ldf in configuration namelist', lwp )
-      WRITE ( numont, namtrc_ldf )
+      IF(lwm) WRITE ( numont, namtrc_ldf )
 
       IF(lwp) THEN                    ! Namelist print
@@ -144 +144 @@
       READ  ( numnat_cfg, namtrc_zdf, IOSTAT = ios, ERR = 906 )
 906   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtrc_zdf in configuration namelist', lwp )
-      WRITE ( numont, namtrc_zdf )
+      IF(lwm) WRITE ( numont, namtrc_zdf )
 
       IF(lwp) THEN                     !   ! Control print
@@ -161 +161 @@
       READ  ( numnat_cfg, namtrc_rad, IOSTAT = ios, ERR = 908 )
 908   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtrc_rad in configuration namelist', lwp )
-      WRITE ( numont, namtrc_rad )
+      IF(lwm) WRITE ( numont, namtrc_rad )
 
       IF(lwp) THEN                     !   ! Control print
@@ -177 +177 @@
       READ  ( numnat_cfg, namtrc_dmp, IOSTAT = ios, ERR = 910)
 910   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtrc_dmp in configuration namelist', lwp )
-      WRITE ( numont, namtrc_dmp )
+      IF(lwm) WRITE ( numont, namtrc_dmp )
 
       IF(lwp) THEN                       ! Namelist print