Changeset 2660 for branches

Timestamp:

2011-03-05T09:19:54+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; re-Fixed bug in call to mpp_sum instead of ctl_warn in traldf and cla

Location:

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC

Files:

• LBC/cla.F90 (modified) (2 diffs)
• TRA/traldf.F90 (modified) (1 diff)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/LBC/cla.F90

@@ -44 +44 @@
    !                                ! for Bab-el-Mandeb, Gibraltar, and Hormuz straits
    
-   !                                                              !!! profile of hdiv for some straits
-   REAL(wp), ALLOCATABLE, SAVE, DIMENSION (:) ::   hdiv_139_101, hdiv_139_101_kt    ! Gibraltar     strait, fixed & time evolving part (i,j)=(172,101)
-   REAL(wp), ALLOCATABLE, SAVE, DIMENSION (:) ::   hdiv_139_102                     ! Gibraltar     strait, fixed part only            (i,j)=(139,102)
-   REAL(wp), ALLOCATABLE, SAVE, DIMENSION (:) ::   hdiv_141_102, hdiv_141_102_kt    ! Gibraltar     strait, fixed & time evolving part (i,j)=(141,102)
-   REAL(wp), ALLOCATABLE, SAVE, DIMENSION (:) ::   hdiv_161_88 , hdiv_161_88_kt     ! Bab-el-Mandeb strait, fixed & time evolving part (i,j)=(161,88)
-   REAL(wp), ALLOCATABLE, SAVE, DIMENSION (:) ::   hdiv_161_87                      ! Bab-el-Mandeb strait, fixed part only            (i,j)=(161,87)
-   REAL(wp), ALLOCATABLE, SAVE, DIMENSION (:) ::   hdiv_160_89 , hdiv_160_89_kt     ! Bab-el-Mandeb strait, fixed & time evolving part (i,j)=(160,89)
-   REAL(wp), ALLOCATABLE, SAVE, DIMENSION (:) ::   hdiv_172_94                      ! Hormuz        strait, fixed part only            (i,j)=(172, 94)
-
-   REAL(wp), ALLOCATABLE, SAVE, DIMENSION (:) ::   t_171_94_hor, s_171_94_hor       ! Temperature, salinity in the Hormuz strait
+   !                                           !   fixed part  !  time evolving    !!! profile of hdiv for some straits
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION (:) ::   hdiv_139_101, hdiv_139_101_kt    ! Gibraltar     (i,j)=(172,101)
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION (:) ::   hdiv_139_102                     ! Gibraltar     (i,j)=(139,102)
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION (:) ::   hdiv_141_102, hdiv_141_102_kt    ! Gibraltar     (i,j)=(141,102)
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION (:) ::   hdiv_161_88 , hdiv_161_88_kt     ! Bab-el-Mandeb (i,j)=(161,88)
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION (:) ::   hdiv_161_87                      ! Bab-el-Mandeb (i,j)=(161,87)
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION (:) ::   hdiv_160_89 , hdiv_160_89_kt     ! Bab-el-Mandeb (i,j)=(160,89)
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION (:) ::   hdiv_172_94                      ! Hormuz        (i,j)=(172, 94)
+
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION (:) ::   t_171_94_hor, s_171_94_hor       ! Temperature, salinity in Hormuz strait
    
    !! * Substitutions
@@ -187 +187 @@
       !
       !                           ! Allocate arrays for this module
-      ALLOCATE( hdiv_139_101(jpk), hdiv_139_101_kt(jpk), &
-                hdiv_139_102(jpk),                       &
-                hdiv_141_102(jpk), hdiv_141_102_kt(jpk), &
-                hdiv_161_88(jpk) , hdiv_161_88_kt(jpk) , &   
-                hdiv_161_87(jpk) ,                       &                     
-                hdiv_160_89(jpk) , hdiv_160_89_kt(jpk),  &
-                hdiv_172_94(jpk) ,                       &
-                t_171_94_hor(jpk), s_171_94_hor(jpk),    &
-                STAT=ierr )
-      IF( lk_mpp    )   CALL ctl_warn( 'cla_init : unable to allocate arrays' )
-      IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'cla_init : unable to allocate arrays' )
+      ALLOCATE( hdiv_139_101(jpk) , hdiv_139_101_kt(jpk) ,     &    ! Gibraltar
+         &      hdiv_139_102(jpk) ,                            &
+         &      hdiv_141_102(jpk) , hdiv_141_102_kt(jpk) ,     &
+         &      hdiv_161_88 (jpk) , hdiv_161_88_kt (jpk) ,     &    ! Bab-el-Mandeb
+         &      hdiv_161_87 (jpk) ,                            &                     
+         &      hdiv_160_89 (jpk) , hdiv_160_89_kt (jpk) ,     &     ! Hormuz
+         &      hdiv_172_94 (jpk) ,                            &
+         &      t_171_94_hor(jpk) , s_171_94_hor   (jpk) , STAT=ierr )
+      IF( lk_mpp    )   CALL mpp_sum( ierr )
+      IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'cla_init: unable to allocate arrays' )
       !
       IF( .NOT.lk_dynspg_flt )   CALL ctl_stop( 'cla_init: Cross Land Advection works only with lk_dynspg_flt=T ' )
       !
-      IF( lk_vvl    )   CALL ctl_stop( 'cla_init: Cross Land Advection does not work with lk_vvl=T option' )
-      !
-      IF( jpk /= 31 )   CALL ctl_stop( 'cla_init: Cross Land Advection hard coded for ORCA_R2_L31' )
+      IF( lk_vvl             )   CALL ctl_stop( 'cla_init: Cross Land Advection does not work with lk_vvl=T option' )
+      !
+      IF( jpk /= 31          )   CALL ctl_stop( 'cla_init: Cross Land Advection hard coded for ORCA_R2_L31' )
       !
       !                                        _|_______|_______|_

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90

@@ -263 +263 @@
       !                              ! allocate trabbl arrays
       ALLOCATE( t0_ldf(jpi,jpj,jpk) , s0_ldf(jpi,jpj,jpk) , STAT=ierr )
-      IF( lk_mpp    )   CALL ctl_warn( 'ldf_ano : unable to allocate arrays' )
-      IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'ldf_ano : unable to allocate arrays' )
+      IF( lk_mpp    )   CALL mpp_sum( ierr )
+      IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'ldf_ano: unable to allocate arrays' )
 
       ! defined the T & S reference profiles