Changeset 5411 for trunk/NEMOGCM/NEMO

Timestamp:

2015-06-12T19:39:14+02:00 (9 years ago)

Author:

cetlod

Message:

trunk : add missing lwp to avoid printing in the standard output file

Location:

trunk/NEMOGCM/NEMO/TOP_SRC

Files:

• PISCES/P4Z/p4zsbc.F90 (modified) (1 diff)
• trcnam.F90 (modified) (1 diff)

trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsbc.F90

@@ -220 +220 @@
 
       IF ( ( nn_ice_tr >= 0 ) .AND. ln_ironice ) THEN
-         WRITE(numout,*) ' ln_ironice incompatible with nn_ice_tr = ', nn_ice_tr
-         WRITE(numout,*) ' Specify your sea ice iron concentration in nampisice instead '
-         WRITE(numout,*) ' ln_ironice is forced to .FALSE. '
-         ln_ironice = .FALSE.
+         IF(lwp) THEN
+            WRITE(numout,*) ' ln_ironice incompatible with nn_ice_tr = ', nn_ice_tr
+            WRITE(numout,*) ' Specify your sea ice iron concentration in nampisice instead '
+            WRITE(numout,*) ' ln_ironice is forced to .FALSE. '
+            ln_ironice = .FALSE.
+         ENDIF
       ENDIF
 

trunk/NEMOGCM/NEMO/TOP_SRC/trcnam.F90

@@ -254 +254 @@
  902  IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtrc_ice in configuration namelist', lwp )
 
-      WRITE(numout,*) ' '
-      WRITE(numout,*) ' Sea ice tracers option (nn_ice_tr) : ', nn_ice_tr
-      WRITE(numout,*) ' '
+      IF( lwp ) THEN
+         WRITE(numout,*) ' '
+         WRITE(numout,*) ' Sea ice tracers option (nn_ice_tr) : ', nn_ice_tr
+         WRITE(numout,*) ' '
+      ENDIF
 
       ! Assign namelist stuff