Changeset 3827

Timestamp:

2013-03-06T10:01:26+01:00 (11 years ago)

Author:

cetlod

Message:

v3.5alpha: Add missing IF(lwp) before writing in numout, see ticket #1066

Location:

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO

Files:

• OFF_SRC/dtadyn.F90 (modified) (2 diffs)
• OFF_SRC/nemogcm.F90 (modified) (3 diffs)
• TOP_SRC/trcdta.F90 (modified) (1 diff)

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90

@@ -164 +164 @@
          IF(  kt /= nit000 .AND. ( sf_dyn(jf_tem)%nrec_a(2) - nrecprev_tem ) /= 0 )  iswap_tem = 1
          IF( ( isecsbc > sf_dyn(jf_tem)%nrec_b(2) .AND. iswap_tem == 1 ) .OR. kt == nit000 )  THEN    ! read/update the after data
-            write(numout,*)
-            write(numout,*) ' Compute new slopes at kt = ', kt
+            IF(lwp) WRITE(numout,*) ' Compute new slopes at kt = ', kt
             IF( sf_dyn(jf_tem)%ln_tint ) THEN                 ! time interpolation of data
                IF( kt /= nit000 ) THEN
@@ -214 +213 @@
          IF(  kt /= nit000 .AND. ( sf_dyn(jf_uwd)%nrec_a(2) - nrecprev_uwd ) /= 0 )  iswap_uwd = 1
          IF( ( isecsbc > sf_dyn(jf_uwd)%nrec_b(2) .AND. iswap_uwd == 1 ) .OR. kt == nit000 )  THEN    ! read/update the after data
-            write(numout,*)
-            write(numout,*) ' Compute new vertical velocity at kt = ', kt
-            write(numout,*)
+            IF(lwp) WRITE(numout,*) ' Compute new vertical velocity at kt = ', kt
+            IF(lwp) WRITE(numout,*)
             IF( sf_dyn(jf_uwd)%ln_tint ) THEN                 ! time interpolation of data
                IF( kt /= nit000 )  THEN

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90

@@ -80 +80 @@
       CALL nemo_init  ! Initializations
 
-      IF( lk_mpp )   CALL mpp_max( nstop )
-
       ! check that all process are still there... If some process have an error,
       ! they will never enter in step and other processes will wait until the end of the cpu time!
@@ -90 +88 @@
       !                            !-----------------------!
       istp = nit000
-         !
+      ! 
       CALL iom_init            ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS)
+      ! 
       DO WHILE ( istp <= nitend .AND. nstop == 0 )    ! time stepping
          !
@@ -121 +120 @@
       !
 # if defined key_iomput
-         CALL xios_finalize             ! end mpp communications
+      CALL xios_finalize             ! end mpp communications
 # else
       IF( lk_mpp )   CALL mppstop       ! end mpp communications

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/trcdta.F90

@@ -85 +85 @@
       !
       ntra = MAX( 1, nb_trcdta )   ! To avoid compilation error with bounds checking
-      WRITE(numout,*) ' '
-      WRITE(numout,*) ' number of passive tracers to be initialize by data :', ntra
-      WRITE(numout,*) ' '
+      IF(lwp) THEN
+         WRITE(numout,*) ' '
+         WRITE(numout,*) ' number of passive tracers to be initialize by data :', ntra
+         WRITE(numout,*) ' '
+      ENDIF
       !                         ! allocate the arrays (if necessary)
       !