Changeset 2777 for trunk/NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90

Timestamp:

2011-06-07T11:55:02+02:00 (13 years ago)

Author:

smasson

Message:

LIM3 compiling and (partly?) running in v3_3_1, see ticket#817

File:

• trunk/NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90 (modified) (6 diffs)

trunk/NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90

@@ -32 +32 @@
    PUBLIC   lim_trp    ! called by ice_step
 
-   REAL(wp), PUBLIC ::   bound  = 0._wp   !: boundary condit. (0.0 no-slip, 1.0 free-slip)
-
    REAL(wp)  ::   epsi06 = 1.e-06_wp   ! constant values
    REAL(wp)  ::   epsi03 = 1.e-03_wp  
@@ -40 +38 @@
    REAL(wp)  ::   rzero  = 0._wp   
    REAL(wp)  ::   rone   = 1._wp
+
+   REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:,:,:) ::   zs0e
 
    !! * Substitution
@@ -63 +63 @@
       !!---------------------------------------------------------------------
       USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   zs0at => wrk_2d_1 , zsm => wrk_2d_2 , zs0ow  => wrk_2d_3      ! 2D workspace
-      USE wrk_nemo, ONLY:   wrk_3d_1, wrk_3d_2, wrk_3d_3, wrk_3d_4, wrk_3d_5, wrk_3d_6    ! 3D workspace
-      USE wrk_nemo, ONLY:   wrk_4d_1                                                      ! 4D workspace
+      USE wrk_nemo, ONLY:   zs0at => wrk_2d_4 , zsm => wrk_2d_5 , zs0ow  => wrk_2d_6      ! 2D workspace
+      USE wrk_nemo, ONLY:   wrk_3d_3, wrk_3d_4, wrk_3d_5, wrk_3d_6, wrk_3d_7, wrk_3d_8    ! 3D workspace
       !
       INTEGER, INTENT(in) ::   kt   ! number of iteration
@@ -71 +70 @@
       INTEGER  ::   ji, jj, jk, jl, layer   ! dummy loop indices
       INTEGER  ::   initad                  ! number of sub-timestep for the advection
+      INTEGER  ::   ierr                    ! error status
       REAL(wp) ::   zindb  , zindsn , zindic      ! local scalar
       REAL(wp) ::   zusvosn, zusvoic, zbigval     !   -      -
@@ -77 +77 @@
       !
       REAL(wp), POINTER, DIMENSION(:,:,:)   ::   zs0ice, zs0sn, zs0a, zs0c0 , zs0sm , zs0oi   ! 3D pointer
-      REAL(wp), POINTER, DIMENSION(:,:,:,:) ::   zs0e                                         ! 4D pointer
       !!---------------------------------------------------------------------
 
-      IF( wrk_in_use(2, 1,2,3,4,5) ) THEN
+      IF( wrk_in_use(2, 4,5,6) .OR. wrk_in_use(3, 3,4,5,6,7,8) ) THEN
          CALL ctl_stop( 'lim_trp : requested workspace arrays unavailable' )   ;   RETURN
       END IF
 
-      zs0ice => wrk_3d_1(:,:,1:jpl)   ;   zs0a  => wrk_3d_3   ;   zs0sm => wrk_3d_3
-      zs0sn  => wrk_3d_2(:,:,1:jpl)   ;   zs0c0 => wrk_3d_3   ;   zs0oi => wrk_3d_3
-      zs0e   => wrk_4d_1(:,:,1:jkmax,1:jpl)
-
+      zs0ice => wrk_3d_3(:,:,1:jpl)   ;   zs0a  => wrk_3d_5(:,:,1:jpl)   ;   zs0sm => wrk_3d_7(:,:,1:jpl)
+      zs0sn  => wrk_3d_4(:,:,1:jpl)   ;   zs0c0 => wrk_3d_6(:,:,1:jpl)   ;   zs0oi => wrk_3d_8(:,:,1:jpl)
+      IF( kt == nit000 ) THEN 
+         ALLOCATE( zs0e(jpi,jpj,jkmax,jpl), Stat = ierr )
+         IF( lk_mpp    )   CALL mpp_sum ( ierr )
+         IF( ierr /= 0 )   CALL ctl_stop( 'lim_trp : failed to allocate zs0e array' )
+      END IF
 
       IF( numit == nstart .AND. lwp ) THEN
@@ -463 +465 @@
       ENDIF
       !
-      IF( wrk_not_released(2, 1,2,3,4,5) )   CALL ctl_stop('lim_trp_2 : failed to release workspace arrays')
+      IF( wrk_not_released(2, 4,5,6) .OR. wrk_not_released(3, 3,4,5,6,7,8) )   &
+         &   CALL ctl_stop('lim_trp : failed to release workspace arrays')
       !
    END SUBROUTINE lim_trp