Changeset 2777 for trunk/NEMOGCM/NEMO/LIM_SRC_3/limwri.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/limwri.F90 (modified) (5 diffs)

trunk/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90

@@ -49 +49 @@
    REAL(wp)  ::   zzero  = 0._wp
    REAL(wp)  ::   zone   = 1._wp
+
+   REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:,:) ::   zcmo, zcmoa   ! additional fields
       
    !!----------------------------------------------------------------------
@@ -73 +75 @@
       USE wrk_nemo, ONLY:   wrk_not_released, wrk_in_use
       USE wrk_nemo, ONLY:   zfield => wrk_2d_1             ! 2D workspace
-      USE wrk_nemo, ONLY:   wrk_3d_1, wrk_3D_2, wrk_3d_3   ! 3D workspace
+      USE wrk_nemo, ONLY:   wrk_3d_3, wrk_3d_4, wrk_3d_5   ! 3D workspace
       !
       INTEGER, INTENT(in) ::   kindic   ! if kindic < 0 there has been an error somewhere
@@ -81 +83 @@
       REAL(wp),DIMENSION(1) ::   zdept
       REAL(wp) ::  zsto, zjulian, zout, zindh, zinda, zindb
-      REAL(wp), POINTER, DIMENSION(:,:,:) ::   zcmo, zcmoa   ! additional fields
       REAL(wp), POINTER, DIMENSION(:,:,:) ::   zmaskitd, zoi, zei
 
@@ -92 +93 @@
       !!-------------------------------------------------------------------
 
+      IF( wrk_in_use(2, 1) .OR. wrk_in_use(3, 3,4,5) ) THEN
+         CALL ctl_stop( 'lim_wri : requested workspace arrays unavailable' )   ;   RETURN
+      ENDIF
+
       ipl = jpl
 
-      zcmo     => wrk_3d_1(:,:,1:jpnoumax)
-      zcmoa    => wrk_3d_2(:,:,1:jpnoumax)
-      zmaskitd => wrk_3d_2(:,:,1:jpl)
-      zoi      => wrk_3d_2(:,:,1:jpl)
-      zei      => wrk_3d_2(:,:,1:jpl)
+      zmaskitd => wrk_3d_3(:,:,1:jpl)
+      zoi      => wrk_3d_4(:,:,1:jpl)
+      zei      => wrk_3d_5(:,:,1:jpl)
 
 
       IF( numit == nstart ) THEN 
 
-         ALLOCATE( ndex51(jpij) , ndexitd(jpij*jpl) , STAT=ierr )
+         ALLOCATE( ndex51(jpij), ndexitd(jpij*jpl), zcmo(jpi,jpj,jpnoumax), zcmoa(jpi,jpj,jpnoumax), STAT=ierr )
+         IF( lk_mpp    )   CALL mpp_sum ( ierr )
          IF( ierr /= 0 ) THEN
             CALL ctl_stop( 'lim_wri : unable to allocate standard arrays' )   ;   RETURN
@@ -350 +354 @@
       ENDIF
 
+      IF( wrk_not_released(2, 1) .OR. wrk_not_released(3, 3,4,5) )   &
+         CALL ctl_stop( 'lim_wri: failed to release workspace arrays' )
+      
    END SUBROUTINE lim_wri
 #endif