Changeset 1055 for trunk/NEMO

Timestamp:

2008-06-04T18:05:30+02:00 (16 years ago)

Author:

rblod

Message:

Desactived control print (ln_nicep) for LIM3, correct forcing field for tair, supress u_ice and v_ice as argument for buls clior

Location:

trunk/NEMO

Files:

• LIM_SRC_3/iceini.F90 (modified) (2 diffs)
• LIM_SRC_3/limistate.F90 (modified) (1 diff)
• LIM_SRC_3/limthd_dif.F90 (modified) (1 diff)
• LIM_SRC_3/limupdate.F90 (modified) (1 diff)
• LIM_SRC_3/limwri.F90 (modified) (2 diffs)
• OPA_SRC/SBC/sbcice_lim.F90 (modified) (2 diffs)
• OPA_SRC/SBC/sbcice_lim_2.F90 (modified) (2 diffs)

trunk/NEMO/LIM_SRC_3/iceini.F90

@@ -22 +22 @@
    USE par_ice
    USE limvar
+   USE lib_mpp
 
    IMPLICIT NONE
@@ -127 +128 @@
       REWIND ( numnam_ice )
       READ   ( numnam_ice , namicerun )
-      ln_nicep = ln_nicep .AND. lwp
+
+      IF( lk_mpp .AND. ln_nicep ) THEN
+         ln_nicep = .FALSE.
+         CALL ctl_warn( 'ice_run : specific control print for LIM3 desactivated with MPI' )
+      ENDIF       
+
       IF(lwp) THEN
          WRITE(numout,*)

trunk/NEMO/LIM_SRC_3/limistate.F90

@@ -75 +75 @@
 
       REAL(wp) ::       &  ! temporary scalar
-         zs0, ztf,  &
          zeps6, zeps, ztmelts, &
          epsi06

trunk/NEMO/LIM_SRC_3/limthd_dif.F90

@@ -791 +791 @@
       END DO  ! End of the do while iterative procedure
 
-      WRITE(numout,*) ' zerritmax : ', zerritmax
-      WRITE(numout,*) ' nconv     : ', nconv
-
+      IF( ln_nicep ) THEN
+         WRITE(numout,*) ' zerritmax : ', zerritmax
+         WRITE(numout,*) ' nconv     : ', nconv
+      ENDIF
 
       !

trunk/NEMO/LIM_SRC_3/limupdate.F90

@@ -297 +297 @@
          + d_a_i_thd(:,:,:)
       CALL lim_var_glo2eqv ! useless, just for debug
-      DO jk = 1, nlay_i
-         WRITE(numout,*) ' t_i : ', t_i(jiindx, jjindx, jk, 1:jpl)
-      END DO
+      IF( ln_nicep ) THEN 
+         DO jk = 1, nlay_i
+            WRITE(numout,*) ' t_i : ', t_i(jiindx, jjindx, jk, 1:jpl)
+         END DO
+      ENDIF
       e_i(:,:,:,:) = e_i(:,:,:,:) + d_e_i_trp(:,:,:,:)  
       CALL lim_var_glo2eqv ! useless, just for debug
+      IF( ln_nicep) THEN
       WRITE(numout,*) ' After transport update '
-      DO jk = 1, nlay_i
-         WRITE(numout,*) ' t_i : ', t_i(jiindx, jjindx, jk, 1:jpl)
-      END DO
+         DO jk = 1, nlay_i
+            WRITE(numout,*) ' t_i : ', t_i(jiindx, jjindx, jk, 1:jpl)
+         END DO
+      ENDIF
       e_i(:,:,:,:) = e_i(:,:,:,:) + d_e_i_thd(:,:,:,:)  
       CALL lim_var_glo2eqv ! useless, just for debug
-      WRITE(numout,*) ' After thermodyn update '
-      DO jk = 1, nlay_i
-         WRITE(numout,*) ' t_i : ', t_i(jiindx, jjindx, jk, 1:jpl)
-      END DO
+      IF( ln_nicep ) THEN
+         WRITE(numout,*) ' After thermodyn update '
+         DO jk = 1, nlay_i
+            WRITE(numout,*) ' t_i : ', t_i(jiindx, jjindx, jk, 1:jpl)
+         END DO
+      ENDIF
 
       at_i(:,:) = 0.0

trunk/NEMO/LIM_SRC_3/limwri.F90

@@ -204 +204 @@
 
       !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-      IF(lwp) THEN
+      IF( ln_nicep ) THEN
          WRITE(numout,*)
          WRITE(numout,*) 'lim_wri : write ice outputs in NetCDF files at time : ', nyear, nmonth, nday, numit
@@ -306 +306 @@
          ENDIF
 
-         !+++++
-         WRITE(numout,*)
-         WRITE(numout,*) 'nc(jf), nice, nam(jf), niter, ndim'
-         WRITE(numout,*) nc(jf), nice, nam(jf), niter, ndim
-         !+++++
+         IF( ln_nicep ) THEN 
+            WRITE(numout,*)
+            WRITE(numout,*) 'nc(jf), nice, nam(jf), niter, ndim'
+            WRITE(numout,*) nc(jf), nice, nam(jf), niter, ndim
+         ENDIF
          IF ( nc(jf) == 1 ) CALL histwrite( nice, nam(jf), niter, zfield, ndim, ndex51 )
 

trunk/NEMO/OPA_SRC/SBC/sbcice_lim.F90

@@ -21 +21 @@
    USE c1d             ! 1d configuration
    USE dom_oce         ! ocean space and time domain
+   USE lib_mpp
    USE par_ice         ! sea-ice parameters
    USE ice
@@ -236 +237 @@
          !                                           ! Diagnostics and outputs 
                           !                               ! Ice Diagnostics 
-         IF( MOD( kt+nn_fsbc-1, ninfo ) == 0 .OR. ntmoy == 1 )   CALL lim_dia 
+         IF( ( MOD( kt+nn_fsbc-1, ninfo ) == 0 .OR. ntmoy == 1 ) .AND. .NOT. lk_mpp )   &
+            &             CALL lim_dia 
                           CALL lim_wri( 1  )              ! Ice outputs 
          IF( lrst_ice )   CALL lim_rst_write( kt )        ! Ice restart file 

trunk/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90

@@ -18 +18 @@
    USE c1d             ! 1d configuration
    USE dom_oce         ! ocean space and time domain
+   USE lib_mpp
    USE ice_2
    USE iceini_2
@@ -186 +187 @@
                                         CALL lim_thd_2      ( kt )      ! Ice thermodynamics 
                                         CALL lim_sbc_2      ( kt )      ! Ice/Ocean Mass & Heat fluxes 
-         IF( MOD( kt+nn_fsbc-1, ninfo ) == 0 .OR.   &
-            &  ntmoy == 1 )             CALL lim_dia_2      ( kt )      ! Ice Diagnostics 
+         IF( ( MOD( kt+nn_fsbc-1, ninfo ) == 0 .OR. ntmoy == 1 ) .AND. .NOT. lk_mpp )   &
+            &                           CALL lim_dia_2      ( kt )      ! Ice Diagnostics 
                                         CALL lim_wri_2      ( kt )      ! Ice outputs 
          IF( lrst_ice )                 CALL lim_rst_write_2( kt )      ! Ice restart file