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

trunk/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90

@@ -50 +50 @@
    USE dom_ice          ! LIM domain
    USE thd_ice          ! LIM thermodynamics
-   USE wrk_nemo         ! workspace manager
    USE in_out_manager   ! I/O manager
    USE lib_mpp         ! MPP library
@@ -298 +297 @@
       !! ** References : Vancoppenolle et al., 2007 (in preparation)
       !!------------------------------------------------------------------
+      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
+      USE wrk_nemo, ONLY:   wrk_3d_3, wrk_3d_4 
       INTEGER  ::   ji, jj, jk, jl   ! dummy loop index
       REAL(wp) ::   dummy_fac0, dummy_fac1, dummy_fac, zsal      ! local scalar
@@ -305 +306 @@
       !!------------------------------------------------------------------
 
-      IF( wrk_in_use( 2, 1,2 ) ) THEN
+      IF( wrk_in_use( 3, 3,4 ) ) THEN
          CALL ctl_stop( 'lim_var_salprof: requested workspace arrays unavailable' )   ;   RETURN
       END IF
 
-      z_slope_s => wrk_3d_1(:,:,1:jpl)   ! slope of the salinity profile
-      zalpha    => wrk_3d_2(:,:,1:jpl)   ! weight factor for s between s_i_0 and s_i_1
+      z_slope_s => wrk_3d_3(:,:,1:jpl)   ! slope of the salinity profile
+      zalpha    => wrk_3d_4(:,:,1:jpl)   ! weight factor for s between s_i_0 and s_i_1
 
       !---------------------------------------
@@ -389 +390 @@
       ENDIF ! num_sal
       !
-      IF( wrk_not_released(2, 1,2) )   CALL ctl_stop('lim_var_salprof: failed to release workspace arrays.')
+      IF( wrk_not_released(3, 3,4) )   CALL ctl_stop('lim_var_salprof: failed to release workspace arrays.')
       !
    END SUBROUTINE lim_var_salprof
@@ -432 +433 @@
       !!                Works with 1d vectors and is used by thermodynamic modules
       !!-------------------------------------------------------------------
+      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
+      USE wrk_nemo, ONLY:   wrk_1d_4
       INTEGER, INTENT(in) ::   kideb, kiut   ! thickness category index
       !
@@ -442 +445 @@
       !!---------------------------------------------------------------------
 
-      IF(  wrk_in_use(1, 1)  ) THEN
+      IF(  wrk_in_use(1, 4)  ) THEN
          CALL ctl_stop('lim_var_salprof1d : requestead workspace arrays unavailable.')   ;   RETURN
       END IF
       ! Set-up pointers to sub-arrays of workspace arrays
-      z_slope_s  =>  wrk_1d_1 (1:jpij)
+      z_slope_s  =>  wrk_1d_4 (1:jpij)
 
       !---------------------------------------
@@ -511 +514 @@
       ENDIF
       !
-      IF( wrk_not_released(1, 1) )   CALL ctl_stop( 'lim_var_salprof1d : failed to release workspace arrays' )
+      IF( wrk_not_released(1, 4) )   CALL ctl_stop( 'lim_var_salprof1d : failed to release workspace arrays' )
       !
    END SUBROUTINE lim_var_salprof1d